Merge pull request #309 from stof/clean_settings

Remove dead code in the setting management

Author: pitbulk

src/Saml2/Auth.php

@@ -153,11 +153,11 @@ class Auth
     /**
      * Initializes the SP SAML instance.
      *
-     * @param array|object|null $oldSettings Setting data (You can provide a OneLogin\Saml\Settings, the settings object of the Saml folder implementation)
+     * @param array|null $settings Setting data
      */
-    public function __construct($oldSettings = null)
+    public function __construct(array $settings = null)
     {
-        $this->_settings = new Settings($oldSettings);
+        $this->_settings = new Settings($settings);
     }
 
     /**

src/Saml2/Settings.php

@@ -116,13 +116,13 @@ class Settings
      * - Sets the paths of the different folders
      * - Loads settings info from settings file or array/object provided
      *
-     * @param array|object|null $settings         SAML Toolkit Settings
-     * @param bool              $spValidationOnly Validate or not the IdP data
+     * @param array|null $settings         SAML Toolkit Settings
+     * @param bool       $spValidationOnly Validate or not the IdP data
      *
      * @throws Error If any settings parameter is invalid
      * @throws Exception If Settings is incorrectly supplied
      */
-    public function __construct($settings = null, $spValidationOnly = false)
+    public function __construct(array $settings = null, $spValidationOnly = false)
     {
         $this->_spValidationOnly = $spValidationOnly;
         $this->_loadPaths();
@@ -136,26 +136,14 @@ public function __construct($settings = null, $spValidationOnly = false)
                 );
             }
             $this->_addDefaultValues();
-        } else if (is_array($settings)) {
+        } else {
             if (!$this->_loadSettingsFromArray($settings)) {
                 throw new Error(
                     'Invalid array settings: %s',
                     Error::SETTINGS_INVALID,
                     array(implode(', ', $this->_errors))
                 );
             }
-        } else if ($settings instanceof \Settings) {
-            throw new Error(
-                'Only OneLogin\Saml\Settings objects are supported.',
-                Error::UNSUPPORTED_SETTINGS_OBJECT,
-                array(implode(', ', $this->_errors))
-            );
-        } else {
-            throw new Error(
-                'Invalid array settings: %s',
-                Error::SETTINGS_INVALID,
-                array(implode(', ', $this->_errors))
-            );
         }
 
         $this->formatIdPCert();