Fix several issues reported by Scrutinizer

tvdijen · tvdijen · commit 675e5ec9405e · 2023-09-26T10:18:48.000+02:00
diff --git a/modules/core/src/Auth/Process/StatisticsWithAttribute.php b/modules/core/src/Auth/Process/StatisticsWithAttribute.php
@@ -47,17 +47,17 @@ public function __construct(array &$config, $reserved)
         parent::__construct($config, $reserved);
 
         if (array_key_exists('attributename', $config)) {
-            $this->attribute = $config['attributename'];
             if (!is_string($this->attribute)) {
                 throw new Exception('Invalid attribute name given to core:StatisticsWithAttribute filter.');
             }
+            $this->attribute = $config['attributename'];
         }
 
         if (array_key_exists('type', $config)) {
-            $this->typeTag = $config['type'];
             if (!is_string($this->typeTag)) {
                 throw new Exception('Invalid typeTag given to core:StatisticsWithAttribute filter.');
             }
+            $this->typeTag = $config['type'];
         }
 
         if (array_key_exists('skipPassive', $config)) {
diff --git a/modules/core/src/Auth/Process/TargetedID.php b/modules/core/src/Auth/Process/TargetedID.php
@@ -76,10 +76,10 @@ public function __construct(array &$config, $reserved)
         $this->identifyingAttribute = $config['identifyingAttribute'];
 
         if (array_key_exists('nameId', $config)) {
-            $this->generateNameId = $config['nameId'];
             if (!is_bool($this->generateNameId)) {
                 throw new Exception('Invalid value of \'nameId\'-option to core:TargetedID filter.');
             }
+            $this->generateNameId = $config['nameId'];
         }
 
         $this->configUtils = new Utils\Config();
diff --git a/modules/core/src/Controller/ErrorReport.php b/modules/core/src/Controller/ErrorReport.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Module\core\Controller;
 
-use Exception;
+use Exception as BuiltinException;
 use FILTER_REQUIRE_SCALAR;
 use FILTER_VALIDATE_EMAIL;
 use SimpleSAML\{Configuration, Error, Logger, Session, Utils};
@@ -64,7 +64,7 @@ public function main(Request $request): RedirectResponse|Template
 
         try {
             $data = $this->session->getData('core:errorreport', $reportId);
-        } catch (Exception $e) {
+        } catch (BuiltinException $e) {
             $data = null;
             Logger::error('Error loading error report data: ' . var_export($e->getMessage(), true));
         }
diff --git a/modules/core/src/Controller/Exception.php b/modules/core/src/Controller/Exception.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Module\core\Controller;
 
-use DATE_W3C;
+use DateTimeInterface;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\{Auth, Configuration, Error, Logger, Module, Session, Utils};
 use SimpleSAML\XHTML\Template;
@@ -66,7 +66,7 @@ public function error(Request $request, string $code): Response
 
         if ($ts !== 'ERRORURL_TS') {
             Assert::integerish($ts);
-            $ts = date(DATE_W3C, intval($ts));
+            $ts = date(DateTimeInterface::W3C, intval($ts));
         } else {
             $ts = null;
         }
diff --git a/modules/core/src/Controller/Login.php b/modules/core/src/Controller/Login.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Module\core\Controller;
 
-use Exception;
+use Exception as BuiltinException;
 use SimpleSAML\{Auth, Configuration, Error, Module, Utils};
 use SimpleSAML\Module\core\Auth\{UserPassBase, UserPassOrgBase};
 use SimpleSAML\XHTML\Template;
@@ -106,7 +106,7 @@ public function loginuserpass(Request $request): Response
         /** @var \SimpleSAML\Module\core\Auth\UserPassBase|null $source */
         $source = $this->authSource::getById($state[UserPassBase::AUTHID]);
         if ($source === null) {
-            throw new Exception(
+            throw new BuiltinException(
                 'Could not find authentication source with id ' . $state[UserPassBase::AUTHID]
             );
         }
@@ -324,7 +324,7 @@ public function loginuserpassorg(Request $request): Response
         /** @var \SimpleSAML\Module\core\Auth\UserPassOrgBase $source */
         $source = $this->authSource::getById($state[UserPassOrgBase::AUTHID]);
         if ($source === null) {
-            throw new Exception(
+            throw new BuiltinException(
                 'Could not find authentication source with id ' . $state[UserPassOrgBase::AUTHID]
             );
         }
diff --git a/modules/core/src/Controller/Logout.php b/modules/core/src/Controller/Logout.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Module\core\Controller;
 
-use Exception;
+use Exception as BuiltinException;
 use SimpleSAML\{Auth, Configuration, Error, IdP, Logger, Stats, Utils};
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Module\saml\Message;
@@ -319,7 +319,7 @@ public function logoutIframe(Request $request): Template
                 $assocIdP = IdP::getByState($this->config, $sp);
                 $url = call_user_func([$sp['Handler'], 'getLogoutURL'], $assocIdP, $sp, null);
                 $sp['core:Logout-IFrame:URL'] = $url;
-            } catch (Exception $e) {
+            } catch (BuiltinException $e) {
                 $sp['core:Logout-IFrame:State'] = 'failed';
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -47,17 +47,17 @@ public function __construct(array &$config, $reserved)`
`47`	`47`	`parent::__construct($config, $reserved);`
`48`	`48`
`49`	`49`	`if (array_key_exists('attributename', $config)) {`
`50`		`- $this->attribute = $config['attributename'];`
`51`	`50`	`if (!is_string($this->attribute)) {`
`52`	`51`	`throw new Exception('Invalid attribute name given to core:StatisticsWithAttribute filter.');`
`53`	`52`	`}`
	`53`	`+ $this->attribute = $config['attributename'];`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (array_key_exists('type', $config)) {`
`57`		`- $this->typeTag = $config['type'];`
`58`	`57`	`if (!is_string($this->typeTag)) {`
`59`	`58`	`throw new Exception('Invalid typeTag given to core:StatisticsWithAttribute filter.');`
`60`	`59`	`}`
	`60`	`+ $this->typeTag = $config['type'];`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if (array_key_exists('skipPassive', $config)) {`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,10 @@ public function __construct(array &$config, $reserved)`
`76`	`76`	`$this->identifyingAttribute = $config['identifyingAttribute'];`
`77`	`77`
`78`	`78`	`if (array_key_exists('nameId', $config)) {`
`79`		`- $this->generateNameId = $config['nameId'];`
`80`	`79`	`if (!is_bool($this->generateNameId)) {`
`81`	`80`	`throw new Exception('Invalid value of \'nameId\'-option to core:TargetedID filter.');`
`82`	`81`	`}`
	`82`	`+ $this->generateNameId = $config['nameId'];`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$this->configUtils = new Utils\Config();`