Fix mistake in 675e5ec

tvdijen · tvdijen · commit 95a1064fff6c · 2023-10-20T21:40:36.000+02:00
diff --git a/modules/core/src/Auth/Process/StatisticsWithAttribute.php b/modules/core/src/Auth/Process/StatisticsWithAttribute.php
@@ -9,6 +9,7 @@
 use SimpleSAML\Assert\Assert;
 
 use function array_key_exists;
+use function boolval;
 use function is_null;
 use function is_string;
 
@@ -47,21 +48,21 @@ public function __construct(array &$config, $reserved)
         parent::__construct($config, $reserved);
 
         if (array_key_exists('attributename', $config)) {
-            if (!is_string($this->attribute)) {
+            if (!is_string($config['attributename'])) {
                 throw new Exception('Invalid attribute name given to core:StatisticsWithAttribute filter.');
             }
             $this->attribute = $config['attributename'];
         }
 
         if (array_key_exists('type', $config)) {
-            if (!is_string($this->typeTag)) {
+            if (!is_string($config['type'])) {
                 throw new Exception('Invalid typeTag given to core:StatisticsWithAttribute filter.');
             }
             $this->typeTag = $config['type'];
         }
 
         if (array_key_exists('skipPassive', $config)) {
-            $this->skipPassive = (bool) $config['skipPassive'];
+            $this->skipPassive = boolval($config['skipPassive']);
         }
     }
 
diff --git a/modules/core/src/Auth/Process/TargetedID.php b/modules/core/src/Auth/Process/TargetedID.php
@@ -76,7 +76,7 @@ public function __construct(array &$config, $reserved)
         $this->identifyingAttribute = $config['identifyingAttribute'];
 
         if (array_key_exists('nameId', $config)) {
-            if (!is_bool($this->generateNameId)) {
+            if (!is_bool($config['nameId'])) {
                 throw new Exception('Invalid value of \'nameId\'-option to core:TargetedID filter.');
             }
             $this->generateNameId = $config['nameId'];

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use SimpleSAML\Assert\Assert;`
`10`	`10`
`11`	`11`	`use function array_key_exists;`
	`12`	`+use function boolval;`
`12`	`13`	`use function is_null;`
`13`	`14`	`use function is_string;`
`14`	`15`
`@@ -47,21 +48,21 @@ public function __construct(array &$config, $reserved)`
`47`	`48`	`parent::__construct($config, $reserved);`
`48`	`49`
`49`	`50`	`if (array_key_exists('attributename', $config)) {`
`50`		`- if (!is_string($this->attribute)) {`
	`51`	`+ if (!is_string($config['attributename'])) {`
`51`	`52`	`throw new Exception('Invalid attribute name given to core:StatisticsWithAttribute filter.');`
`52`	`53`	`}`
`53`	`54`	`$this->attribute = $config['attributename'];`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`if (array_key_exists('type', $config)) {`
`57`		`- if (!is_string($this->typeTag)) {`
	`58`	`+ if (!is_string($config['type'])) {`
`58`	`59`	`throw new Exception('Invalid typeTag given to core:StatisticsWithAttribute filter.');`
`59`	`60`	`}`
`60`	`61`	`$this->typeTag = $config['type'];`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`if (array_key_exists('skipPassive', $config)) {`
`64`		`- $this->skipPassive = (bool) $config['skipPassive'];`
	`65`	`+ $this->skipPassive = boolval($config['skipPassive']);`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function __construct(array &$config, $reserved)`
`76`	`76`	`$this->identifyingAttribute = $config['identifyingAttribute'];`
`77`	`77`
`78`	`78`	`if (array_key_exists('nameId', $config)) {`
`79`		`- if (!is_bool($this->generateNameId)) {`
	`79`	`+ if (!is_bool($config['nameId'])) {`
`80`	`80`	`throw new Exception('Invalid value of \'nameId\'-option to core:TargetedID filter.');`
`81`	`81`	`}`
`82`	`82`	`$this->generateNameId = $config['nameId'];`