Add error message for bad OneLogin_Saml2_Settings argument

jeffturcotte · jeffturcotte · commit 279404f58f61 · 2016-11-15T11:35:29.000-05:00
diff --git a/lib/Saml2/Settings.php b/lib/Saml2/Settings.php
@@ -100,6 +100,7 @@ class OneLogin_Saml2_Settings
      * @param array|object|null $settings SAML Toolkit Settings
      *
      * @throws OneLogin_Saml2_Error If any settings parameter is invalid
+     * @throws Exception If OneLogin_Saml2_Settings is incorrectly supplied
      */
     public function __construct($settings = null, $spValidationOnly = false)
     {
@@ -123,6 +124,8 @@ public function __construct($settings = null, $spValidationOnly = false)
                     array(implode(', ', $this->_errors))
                 );
             }
+        } else if ($settings instanceof OneLogin_Saml2_Settings) {
+            throw new Exception('Only instances of OneLogin_Saml_Settings are supported.');
         } else {
             if (!$this->_loadSettingsFromArray($settings->getValues())) {
                 throw new OneLogin_Saml2_Error(

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ class OneLogin_Saml2_Settings`
`100`	`100`	`* @param array\|object\|null $settings SAML Toolkit Settings`
`101`	`101`	`*`
`102`	`102`	`* @throws OneLogin_Saml2_Error If any settings parameter is invalid`
	`103`	`+ * @throws Exception If OneLogin_Saml2_Settings is incorrectly supplied`
`103`	`104`	`*/`
`104`	`105`	`public function __construct($settings = null, $spValidationOnly = false)`
`105`	`106`	`{`
`@@ -123,6 +124,8 @@ public function __construct($settings = null, $spValidationOnly = false)`
`123`	`124`	`array(implode(', ', $this->_errors))`
`124`	`125`	`);`
`125`	`126`	`}`
	`127`	`+ } else if ($settings instanceof OneLogin_Saml2_Settings) {`
	`128`	`+ throw new Exception('Only instances of OneLogin_Saml_Settings are supported.');`
`126`	`129`	`} else {`
`127`	`130`	`if (!$this->_loadSettingsFromArray($settings->getValues())) {`
`128`	`131`	`throw new OneLogin_Saml2_Error(`