Fix few minor mistakes

tvdijen · tvdijen · commit 0aeec2aeac0f · 2018-06-01T15:26:36.000+02:00
diff --git a/docs/simplesamlphp-authsource.md b/docs/simplesamlphp-authsource.md
@@ -42,7 +42,7 @@ The only function you need to implement is the `login($username, $password)`-fun
 This function receives the username and password the user entered, and is expected to return the attributes of that user.
 If the username or password is incorrect, it should throw an error saying so:
 
-    throw new SimpleSAML_Error_Error('WRONGUSERPASS');
+    throw new \impleSAML\Error\Error('WRONGUSERPASS');
 
 "[Implementing custom username/password authentication](./simplesamlphp-customauth)" describes how to implement username/password authentication using that base class.
 
diff --git a/docs/simplesamlphp-customauth.md b/docs/simplesamlphp-customauth.md
@@ -43,7 +43,7 @@ Create the file `modules/mymodule/lib/Auth/Source/MyAuth.php` with the following
     class sspmod_mymodule_Auth_Source_MyAuth extends sspmod_core_Auth_UserPassBase {
         protected function login($username, $password) {
             if ($username !== 'theusername' || $password !== 'thepassword') {
-                throw new SimpleSAML_Error_Error('WRONGUSERPASS');
+                throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
             return array(
                 'uid' => array('theusername'),
@@ -64,7 +64,7 @@ Some things to note:
   - The `login` function receives the username and password the user enters.
     It is expected to authenticate the user.
     If the username or password is correct, it must return a set of attributes for the user.
-    Otherwise, it must throw the `SimpleSAML_Error_Error('WRONGUSERPASS');` exception.
+    Otherwise, it must throw the `\SimpleSAML\Error\Error('WRONGUSERPASS');` exception.
 
   - Attributes are returned as an associative array of `name => values` pairs.
     All attributes can have multiple values, so the values are always stored in an array.
@@ -187,7 +187,7 @@ The complete class file should look like this:
 
         protected function login($username, $password) {
             if ($username !== $this->username || $password !== $this->password) {
-                throw new SimpleSAML_Error_Error('WRONGUSERPASS');
+                throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
             return array(
                 'uid' => array($this->username),
@@ -323,14 +323,14 @@ The class follows:
             if (!$row) {
                 /* User not found. */
                 SimpleSAML\Logger::warning('MyAuth: Could not find user ' . var_export($username, TRUE) . '.');
-                throw new SimpleSAML_Error_Error('WRONGUSERPASS');
+                throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
 
             /* Check the password. */
             if (!$this->checkPassword($row['password_hash'], $password)) {
                 /* Invalid password. */
                 SimpleSAML\Logger::warning('MyAuth: Wrong password for user ' . var_export($username, TRUE) . '.');
-                throw new SimpleSAML_Error_Error('WRONGUSERPASS');
+                throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
 
             /* Create the attribute array of the user. */
diff --git a/docs/simplesamlphp-errorhandling.md b/docs/simplesamlphp-errorhandling.md
@@ -78,7 +78,7 @@ If it is unable to convert the exception, it will return a generic SAML 2 error
 
 To return a specific SAML 2 error, you should:
 
-* Create a new exception class for your error. This exception class must subclass `SimpleSAML_Error_Exception`.
+* Create a new exception class for your error. This exception class must subclass `\SimpleSAML\Error\Exception`.
 * Add that exception to the list in `fromException()`.
 * Consider adding the exception to `toException()` in the same file. (See the next section.)
 
diff --git a/docs/simplesamlphp-maintenance.md b/docs/simplesamlphp-maintenance.md
@@ -178,7 +178,7 @@ example configuration of different metadata sources in use at the same time:
 ```
 
 You may also implement your own metadata storage handler, in a very similar way to how you would implement
-your own session handler. Your class **must** extend the `SimpleSAML_Metadata_MetaDataStorageSource` class
+your own session handler. Your class **must** extend the `\SimpleSAML\Metadata\MetaDataStorageSource` class
 and override the methods needed to change the backend used. This class **must** also be located in the
 `lib/MetadataStore/` directory of your custom module.
 
@@ -190,7 +190,7 @@ module is named _mymodule_ and your class is named _MyMetadataHandler_, you shou
 <?php
 namespace SimpleSAML\Module\mymodule\MetadataStore;
 
-class MyMetadataHandler extends SimpleSAML_Metadata_MetaDataStorageSource
+class MyMetadataHandler extends \SimpleSAML\Metadata\MetaDataStorageSource
 {
     ...
 ```
diff --git a/docs/simplesamlphp-nostate.md b/docs/simplesamlphp-nostate.md
@@ -1,7 +1,7 @@
 Debugging "State Information Lost" errors
 =========================================
 
-**"State Information Lost"** (`SimpleSAML_Error_NoState: NOSTATE`)
+**"State Information Lost"** (`\SimpleSAML\Error\NoState: NOSTATE`)
 
 This is one of the most common errors that you can encounter when configuring
 SimpleSAMLphp. Unfortunately, it is also a generic error that can have many
diff --git a/docs/simplesamlphp-sp-migration.md b/docs/simplesamlphp-sp-migration.md
@@ -155,7 +155,7 @@ This is a quick overview of the API:
 Generally, if you have:
 
     $config = \SimpleSAML\Configuration::getInstance();
-    $session = \SimpleSAML_Session::getSessionFromRequest();
+    $session = \SimpleSAML\Session::getSessionFromRequest();
 
 you should replace it with this single line:
 
diff --git a/docs/simplesamlphp-theming.md b/docs/simplesamlphp-theming.md
@@ -128,7 +128,7 @@ If you need to make more extensive customizations to the base template, you shou
 
 	cp templates/base.twig modules/mymodule/themes/fancytheme/default/
 
-Any references to `$this->data['baseurlpath']` in old-style templates can be replaced with `{{baseurlpath}}` in Twig templates. Likewise, references to `SimpleSAML_Module::getModuleURL()` can be replaced with `{{baseurlpath}}module.php/mymodule/...`
+Any references to `$this->data['baseurlpath']` in old-style templates can be replaced with `{{baseurlpath}}` in Twig templates. Likewise, references to `\SimpleSAML\Module::getModuleURL()` can be replaced with `{{baseurlpath}}module.php/mymodule/...`
 
 See the [Twig documentation](https://twig.symfony.com/doc/1.x/templates.html) for more information on using variables and expressions in Twig templates, and the SimpleSAMLphp wiki for [our conventions](https://github.com/simplesamlphp/simplesamlphp/wiki/Twig-conventions).
 
diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
@@ -151,7 +151,7 @@ private static function parseFilter($config, $priority)
             throw new \Exception('Authentication processing filter without name given.');
         }
 
-        $className = \SimpleSAML\Module::resolveClass($config['class'], 'Auth\Process', '\SimpleSAML\Auth\ProcessingFilter');
+        $className = \SimpleSAML\Module::resolveClass($config['class'], 'Auth_Process', '\SimpleSAML\Auth\ProcessingFilter');
         $config['%priority'] = $priority;
         unset($config['class']);
         return new $className($config, null);
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
@@ -303,14 +303,14 @@ private static function parseAuthSource($authId, $config)
 
         try {
             // Check whether or not there's a factory responsible for instantiating our Auth Source instance
-            $factoryClass = \SimpleSAML\Module::resolveClass($id, 'Auth\Source\Factory', '\SimpleSAML\Auth\SourceFactory');
+            $factoryClass = \SimpleSAML\Module::resolveClass($id, 'Auth_Source_Factory', '\SimpleSAML\Auth\SourceFactory');
 
             /** @var SourceFactory $factory */
             $factory = new $factoryClass;
             $authSource = $factory->create($info, $config);
         } catch (\Exception $e) {
             // If not, instantiate the Auth Source here
-            $className = \SimpleSAML\Module::resolveClass($id, 'Auth\Source', '\SimpleSAML\Auth\Source');
+            $className = \SimpleSAML\Module::resolveClass($id, 'Auth_Source', '\SimpleSAML\Auth\Source');
             $authSource = new $className($info, $config);
         }
 
diff --git a/lib/SimpleSAML/Error/Exception.php b/lib/SimpleSAML/Error/Exception.php
@@ -40,9 +40,9 @@ class Exception extends \Exception
      *
      * @param string         $message Exception message
      * @param int            $code Error code
-     * @param Exception|null $cause The cause of this exception.
+     * @param \Exception|null $cause The cause of this exception.
      */
-    public function __construct($message, $code = 0, Exception $cause = null)
+    public function __construct($message, $code = 0, \Exception $cause = null)
     {
         assert(is_string($message));
         assert(is_int($code));
@@ -60,11 +60,11 @@ public function __construct($message, $code = 0, Exception $cause = null)
     /**
      * Convert any exception into a \SimpleSAML\Error\Exception.
      *
-     * @param Exception $e The exception.
+     * @param \Exception $e The exception.
      *
      * @return Exception The new exception.
      */
-    public static function fromException(Exception $e)
+    public static function fromException(\Exception $e)
     {
         if ($e instanceof Exception) {
             return $e;
@@ -76,9 +76,9 @@ public static function fromException(Exception $e)
     /**
      * Load the backtrace from the given exception.
      *
-     * @param Exception $exception The exception we should fetch the backtrace from.
+     * @param \Exception $exception The exception we should fetch the backtrace from.
      */
-    protected function initBacktrace(Exception $exception)
+    protected function initBacktrace(\Exception $exception)
     {
         $this->backtrace = array();
 
diff --git a/lib/SimpleSAML/Error/UnserializableException.php b/lib/SimpleSAML/Error/UnserializableException.php
@@ -28,9 +28,9 @@ class UnserializableException extends Exception
     /**
      * Create a serializable exception representing an unserializable exception.
      *
-     * @param Exception $original  The original exception.
+     * @param \Exception $original  The original exception.
      */
-    public function __construct(Exception $original)
+    public function __construct(\Exception $original)
     {
 
         $this->class = get_class($original);
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
@@ -207,7 +207,7 @@ public static function delete($key)
      *    The timeout for contacting this server, in seconds.
      *    The default value is 3 seconds.
      *
-     * @param Memcache $memcache The Memcache object we should add this server to.
+     * @param \Memcache $memcache The Memcache object we should add this server to.
      * @param array    $server An associative array with the configuration options for the server to add.
      *
      * @throws \Exception If any configuration option for the server is invalid.
@@ -304,19 +304,19 @@ private static function addMemcacheServer($memcache, $server)
      *
      * @param array $group Array of servers which should be created as a group.
      *
-     * @return Memcache A Memcache object of the servers in the group
+     * @return \Memcache A Memcache object of the servers in the group
      *
      * @throws \Exception If the servers configuration is invalid.
      */
     private static function loadMemcacheServerGroup(array $group)
     {
-        $class = class_exists('Memcache') ? 'Memcache' : (class_exists('Memcached') ? 'Memcached' : false);
+        $class = class_exists('\Memcache') ? '\Memcache' : (class_exists('\Memcached') ? '\Memcached' : false);
         if (!$class) {
             throw new \Exception('Missing Memcached implementation. You must install either the Memcache or Memcached extension.');
         }
         self::$extension = strtolower($class);
 
-        // create the Memcache object
+        // create the \Memcache object
         $memcache = new $class();
 
         // iterate over all the servers in the group and add them to the Memcache object
@@ -350,7 +350,7 @@ private static function loadMemcacheServerGroup(array $group)
      * This function gets a list of all configured memcache servers. This list is initialized based
      * on the content of 'memcache_store.servers' in the configuration.
      *
-     * @return Memcache[] Array with Memcache objects.
+     * @return \Memcache[] Array with Memcache objects.
      *
      * @throws \Exception If the servers configuration is invalid.
      */
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -169,20 +169,20 @@ public function getMetaData($entityId, $set)
 
             while ($d = $stmt->fetch()) {
                 if (++$rowCount > 1) {
-                    SimpleSAML\Logger::warning("Duplicate match for $entityId in set $set");
+                    \SimpleSAML\Logger::warning("Duplicate match for $entityId in set $set");
                     break;
                 }
                 $data = json_decode($d['entity_data'], true);
                 if ($data === null) {
-                    throw new SimpleSAML_Error_Exception("Cannot decode metadata for entity '${d['entity_id']}'");
+                    throw new \SimpleSAML\Error\Exception("Cannot decode metadata for entity '${d['entity_id']}'");
                 }
                 if (!array_key_exists('entityid', $data)) {
                     $data['entityid'] = $d['entity_id'];
                 }
             }
             return $data;
         } else {
-            throw new Exception('PDO metadata handler: Database error: '.var_export($this->db->getLastError(), true));
+            throw new \Exception('PDO metadata handler: Database error: '.var_export($this->db->getLastError(), true));
         }
     }
 
diff --git a/lib/SimpleSAML/Stats.php b/lib/SimpleSAML/Stats.php
@@ -38,7 +38,7 @@ class Stats
     private static function createOutput(\SimpleSAML\Configuration $config)
     {
         $cls = $config->getString('class');
-        $cls = SimpleSAML\Module::resolveClass($cls, 'Stats\Output', '\SimpleSAML\Stats\Output');
+        $cls = \SimpleSAML\Module::resolveClass($cls, 'Stats_Output', '\SimpleSAML\Stats\Output');
 
         $output = new $cls($config);
         return $output;
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
@@ -176,7 +176,7 @@ public static function parseDuration($duration, $timestamp = null)
     /**
      * @deprecated This method will be removed in SSP 2.0. Please raise a SimpleSAML\Error\Error exception instead.
      */
-    public static function fatalError($trackId = 'na', $errorCode = null, Exception $e = null)
+    public static function fatalError($trackId = 'na', $errorCode = null, \Exception $e = null)
     {
         throw new \SimpleSAML\Error\Error($errorCode, $e);
     }
@@ -301,7 +301,7 @@ public static function transposeArray($in)
      * @deprecated This method will be removed in SSP 2.0. Please use SimpleSAML\Utils\XML::isDOMNodeOfType()
      *     instead.
      */
-    public static function isDOMElementOfType(DOMNode $element, $name, $nsURI)
+    public static function isDOMElementOfType(\DOMNode $element, $name, $nsURI)
     {
         return \SimpleSAML\Utils\XML::isDOMNodeOfType($element, $name, $nsURI);
     }
@@ -310,7 +310,7 @@ public static function isDOMElementOfType(DOMNode $element, $name, $nsURI)
     /**
      * @deprecated This method will be removed in SSP 2.0. Please use SimpleSAML\Utils\XML::getDOMChildren() instead.
      */
-    public static function getDOMChildren(DOMElement $element, $localName, $namespaceURI)
+    public static function getDOMChildren(\DOMElement $element, $localName, $namespaceURI)
     {
         return \SimpleSAML\Utils\XML::getDOMChildren($element, $localName, $namespaceURI);
     }
@@ -570,7 +570,7 @@ public static function createHttpPostRedirectLink($destination, $post)
         $session = \SimpleSAML\Session::getSessionFromRequest();
         $session->setData('core_postdatalink', $postId, $postData);
 
-        $redirInfo = base64_encode(SimpleSAML\Utils\Crypto::aesEncrypt($session->getSessionId().':'.$postId));
+        $redirInfo = base64_encode(\SimpleSAML\Utils\Crypto::aesEncrypt($session->getSessionId().':'.$postId));
 
         $url = \SimpleSAML\Module::getModuleURL('core/postredirect.php', array('RedirInfo' => $redirInfo));
         $url = preg_replace("#^https:#", "http:", $url);
@@ -694,7 +694,7 @@ public static function aesDecrypt($encData)
      */
     public static function isWindowsOS()
     {
-        return \SimpleSAML\Utils\System::getOS() === SimpleSAML\Utils\System::WINDOWS;
+        return \SimpleSAML\Utils\System::getOS() === \SimpleSAML\Utils\System::WINDOWS;
     }
 
 
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -129,7 +129,7 @@ public function __construct(array $metadataSets, $instance)
 
         // standard discovery service parameters
         if (!array_key_exists('entityID', $_GET)) {
-            throw new Exception('Missing parameter: entityID');
+            throw new \Exception('Missing parameter: entityID');
         } else {
             $this->spEntityId = $_GET['entityID'];
         }
@@ -176,7 +176,7 @@ public function __construct(array $metadataSets, $instance)
      */
     protected function log($message)
     {
-        SimpleSAML\Logger::info('idpDisco.'.$this->instance.': '.$message);
+        \SimpleSAML\Logger::info('idpDisco.'.$this->instance.': '.$message);
     }
 
 
diff --git a/modules/consent/lib/Auth/Process/Consent.php b/modules/consent/lib/Auth/Process/Consent.php
diff --git a/modules/ldap/lib/ConfigHelper.php b/modules/ldap/lib/ConfigHelper.php
diff --git a/modules/saml/www/disco.php b/modules/saml/www/disco.php
diff --git a/www/_include.php b/www/_include.php

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private static function parseFilter($config, $priority)`
`151`	`151`	`throw new \Exception('Authentication processing filter without name given.');`
`152`	`152`	`}`
`153`	`153`
`154`		`- $className = \SimpleSAML\Module::resolveClass($config['class'], 'Auth\Process', '\SimpleSAML\Auth\ProcessingFilter');`
	`154`	`+ $className = \SimpleSAML\Module::resolveClass($config['class'], 'Auth_Process', '\SimpleSAML\Auth\ProcessingFilter');`
`155`	`155`	`$config['%priority'] = $priority;`
`156`	`156`	`unset($config['class']);`
`157`	`157`	`return new $className($config, null);`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ class Exception extends \Exception`
`40`	`40`	`*`
`41`	`41`	`* @param string $message Exception message`
`42`	`42`	`* @param int $code Error code`
`43`		`- * @param Exception\|null $cause The cause of this exception.`
	`43`	`+ * @param \Exception\|null $cause The cause of this exception.`
`44`	`44`	`*/`
`45`		`- public function __construct($message, $code = 0, Exception $cause = null)`
	`45`	`+ public function __construct($message, $code = 0, \Exception $cause = null)`
`46`	`46`	`{`
`47`	`47`	`assert(is_string($message));`
`48`	`48`	`assert(is_int($code));`
`@@ -60,11 +60,11 @@ public function __construct($message, $code = 0, Exception $cause = null)`
`60`	`60`	`/**`
`61`	`61`	`* Convert any exception into a \SimpleSAML\Error\Exception.`
`62`	`62`	`*`
`63`		`- * @param Exception $e The exception.`
	`63`	`+ * @param \Exception $e The exception.`
`64`	`64`	`*`
`65`	`65`	`* @return Exception The new exception.`
`66`	`66`	`*/`
`67`		`- public static function fromException(Exception $e)`
	`67`	`+ public static function fromException(\Exception $e)`
`68`	`68`	`{`
`69`	`69`	`if ($e instanceof Exception) {`
`70`	`70`	`return $e;`
`@@ -76,9 +76,9 @@ public static function fromException(Exception $e)`
`76`	`76`	`/**`
`77`	`77`	`* Load the backtrace from the given exception.`
`78`	`78`	`*`
`79`		`- * @param Exception $exception The exception we should fetch the backtrace from.`
	`79`	`+ * @param \Exception $exception The exception we should fetch the backtrace from.`
`80`	`80`	`*/`
`81`		`- protected function initBacktrace(Exception $exception)`
	`81`	`+ protected function initBacktrace(\Exception $exception)`
`82`	`82`	`{`
`83`	`83`	`$this->backtrace = array();`
`84`	`84`