diff options
| author | Jaime Perez Crespo <jaime.perez@uninett.no> | 2015-10-21 14:31:06 +0200 |
|---|---|---|
| committer | Jaime Perez Crespo <jaime.perez@uninett.no> | 2015-10-21 14:31:06 +0200 |
| commit | 08fa312ccea06c258ec91013973303b7d53c4d1e (patch) | |
| tree | 2744c058f426388425e365e2cc7ad66200d3d392 /lib/SimpleSAML | |
| parent | b083f6d38596632553d7b67f6a8e806dc8f1ebff (diff) | |
| download | simplesamlphp-08fa312ccea06c258ec91013973303b7d53c4d1e.zip simplesamlphp-08fa312ccea06c258ec91013973303b7d53c4d1e.tar.gz simplesamlphp-08fa312ccea06c258ec91013973303b7d53c4d1e.tar.bz2 | |
Deprecate the 'userid.attribute' option. We should define specific options for each module using it, in order to avoid confussions.
Diffstat (limited to 'lib/SimpleSAML')
| -rw-r--r-- | lib/SimpleSAML/Auth/ProcessingChain.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php index b034220..fdf1ba9 100644 --- a/lib/SimpleSAML/Auth/ProcessingChain.php +++ b/lib/SimpleSAML/Auth/ProcessingChain.php @@ -184,6 +184,7 @@ class SimpleSAML_Auth_ProcessingChain { try { + // TODO: remove this in SSP 2.0 if (!array_key_exists('UserID', $state)) { /* No unique user ID present. Attempt to add one. */ self::addUserID($state); @@ -283,6 +284,7 @@ class SimpleSAML_Auth_ProcessingChain { $state[self::FILTERS_INDEX] = $this->filters; + // TODO: remove this in SSP 2.0 if (!array_key_exists('UserID', $state)) { /* No unique user ID present. Attempt to add one. */ self::addUserID($state); @@ -313,11 +315,7 @@ class SimpleSAML_Auth_ProcessingChain { /** - * Add unique user ID. - * - * This function attempts to add an unique user ID to the state. - * - * @param array &$state The state we should update. + * @deprecated This method will be removed in SSP 2.0. */ private static function addUserID(&$state) { assert('is_array($state)'); @@ -325,8 +323,10 @@ class SimpleSAML_Auth_ProcessingChain { if (isset($state['Destination']['userid.attribute'])) { $attributeName = $state['Destination']['userid.attribute']; + SimpleSAML_Logger::warning("The 'userid.attribute' option has been deprecated."); } elseif (isset($state['Source']['userid.attribute'])) { $attributeName = $state['Source']['userid.attribute']; + SimpleSAML_Logger::warning("The 'userid.attribute' option has been deprecated."); } else { /* Default attribute. */ $attributeName = 'eduPersonPrincipalName'; |