Replace psalm with phpstan

Author: tvdijen

phpstan-dev.neon

@@ -2,6 +2,3 @@ parameters:
   level: 5
   paths:
     - tests
-
-includes:
-  - phpstan-dev-baseline.neon

phpstan.neon

@@ -2,6 +2,3 @@ parameters:
   level: 6
   paths:
     - src
-
-includes:
-  - phpstan-baseline.neon

src/Auth/Process/Consent.php

@@ -57,14 +57,14 @@ class Consent extends Auth\ProcessingFilter
     /**
      * Attributes where the value should be hidden
      *
-     * @var array
+     * @var array<mixed>
      */
     private array $hiddenAttributes = [];
 
     /**
      * Attributes which should not require consent
      *
-     * @var array
+     * @var array<mixed>
      */
     private array $noconsentattributes = [];
 
@@ -88,12 +88,12 @@ class Consent extends Auth\ProcessingFilter
      *
      * Validates and parses the configuration.
      *
-     * @param array $config Configuration information.
+     * @param array<mixed> $config Configuration information.
      * @param mixed $reserved For future use.
      *
      * @throws \SimpleSAML\Error\Exception if the configuration is not valid.
      */
-    public function __construct(array $config, $reserved)
+    public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
@@ -181,7 +181,7 @@ public function __construct(array $config, $reserved)
     /**
      * Helper function to check whether consent is disabled.
      *
-     * @param mixed  $option The consent.disable option. Either an array of array, an array or a boolean.
+     * @param mixed $option The consent.disable option. Either an array of array, an array or a boolean.
      * @param string $entityId The entityID of the SP/IdP.
      *
      * @return boolean True if disabled, false if not.
@@ -241,8 +241,7 @@ private static function checkDisable($option, string $entityId): bool
      * This function saves the state, and redirects the user to the page where the user can authorize the release of
      * the attributes. If storage is used and the consent has already been given the user is passed on.
      *
-     * @param array &$state The state of the response.
-     *
+     * @param array<mixed> &$state The state of the response.
      *
      * @throws \SimpleSAML\Module\saml\Error\NoPassive if the request was passive and consent is needed.
      */
@@ -282,6 +281,7 @@ public function process(array &$state): void
             Stats::log('consent:disabled', $statsData);
             return;
         }
+
         if (
             isset($state['Destination']['consent.disable']) &&
             self::checkDisable($state['Destination']['consent.disable'], $idpEntityId)
@@ -416,7 +416,7 @@ public static function getTargetedID(string $userid, string $source, string $des
      * Create a hash value for the attributes that changes when attributes are added or removed. If the attribute
      * values are included in the hash, the hash will change if the values change.
      *
-     * @param array  $attributes The attributes.
+     * @param array<mixed>  $attributes The attributes.
      * @param bool   $includeValues Whether or not to include the attribute value in the generation of the hash.
      *
      * @return string SHA1 of the user id, source id, destination id and salt.

src/Consent/Store/Cookie.php

@@ -34,39 +34,40 @@ class Cookie extends \SimpleSAML\Module\consent\Store
     /**
      * @var string Cookie name prefix
      */
-    private $name;
+    private string $name;
 
     /**
      * @var int Cookie lifetime
      */
-    private $lifetime;
+    private int $lifetime;
 
     /**
      * @var string Cookie path
      */
-    private $path;
+    private string $path;
 
     /**
      * @var string Cookie domain
      */
-    private $domain = '';
+    private string $domain = '';
 
     /**
      * @var bool Cookie secure flag
      */
-    private $secure;
+    private bool $secure;
 
     /**
      * @var string|null Cookie samesite flag
      */
-    private $samesite = null;
+    private ?string $samesite = null;
+
 
     /**
      * Parse configuration.
      *
      * This constructor parses the configuration.
      *
-     * @param array $config Configuration for database consent store.
+     * @param array<mixed> $config Configuration for database consent store.
      *
      * @throws \Exception in case of a configuration error.
      */
@@ -109,6 +110,7 @@ public function __construct(array $config)
         }
     }
 
+
     /**
      * Check for consent.
      *
@@ -224,7 +226,7 @@ public function deleteAllConsents(string $userId): void
      *
      * @param string $userId The hash identifying the user at an IdP.
      *
-     * @return array Array of all destination ids the user has given consent for.
+     * @return array<mixed> Array of all destination ids the user has given consent for.
      */
     public function getConsents(string $userId): array
     {
@@ -343,7 +345,7 @@ private function setConsentCookie(string $name, ?string $value): bool
             'path' => $this->path,
             'domain' => $this->domain,
             'httponly' => true,
-            'secure' => $httpUtils->isHTTPS(),
+            'secure' => $this->secure,
             'samesite' => $this->samesite,
         ];
 

src/Consent/Store/Database.php

@@ -49,6 +49,8 @@ class Database extends \SimpleSAML\Module\consent\Store
 
     /**
      * Options for the database;
+     *
+     * @var array<mixed>
      */
     private array $options = [];
 
@@ -77,7 +79,7 @@ class Database extends \SimpleSAML\Module\consent\Store
      *
      * This constructor parses the configuration.
      *
-     * @param array $config Configuration for database consent store.
+     * @param array<mixed> $config Configuration for database consent store.
      *
      * @throws \Exception in case of a configuration error.
      */
@@ -139,7 +141,7 @@ public function __construct(array $config)
     /**
      * Called before serialization.
      *
-     * @return array The variables which should be serialized.
+     * @return string[] The variables which should be serialized.
      */
     public function __sleep(): array
     {
@@ -303,7 +305,7 @@ public function deleteAllConsents(string $userId): int
      *
      * @param string $userId The hash identifying the user at an IdP.
      *
-     * @return array Array of all destination ids the user has given consent for.
+     * @return string[] Array of all destination ids the user has given consent for.
      */
     public function getConsents(string $userId): array
     {
@@ -334,16 +336,13 @@ public function getConsents(string $userId): array
      * returned.
      *
      * @param string $statement  The statement which should be executed.
-     * @param array  $parameters Parameters for the statement.
+     * @param array<mixed>  $parameters Parameters for the statement.
      *
      * @return \PDOStatement|false  The statement, or false if execution failed.
      */
     private function execute(string $statement, array $parameters)
     {
         $db = $this->getDB();
-        if ($db === false) {
-            return false;
-        }
 
         $st = $db->prepare($statement);
         if ($st === false) {
@@ -374,7 +373,7 @@ private function execute(string $statement, array $parameters)
      * - users: Total number of uses that have given consent
      * ' services: Total number of services that has been given consent to
      *
-     * @return array Array containing the statistics
+     * @return array<mixed> Array containing the statistics
      */
     public function getStatistics(): array
     {
@@ -427,9 +426,9 @@ public function getStatistics(): array
     /**
      * Get database handle.
      *
-     * @return \PDO|false Database handle, or false if we fail to connect.
+     * @return \PDO Database handle, or false if we fail to connect.
      */
-    private function getDB()
+    private function getDB(): PDO
     {
         if ($this->db !== null) {
             return $this->db;
@@ -439,6 +438,7 @@ private function getDB()
         if (isset($this->timeout)) {
             $driver_options[PDO::ATTR_TIMEOUT] = $this->timeout;
         }
+
         if (!empty($this->options)) {
             $this->options = array_merge($driver_options, $this->options);
         } else {
@@ -456,7 +456,7 @@ private function getDB()
      *
      * This function formats a PDO error, as returned from errorInfo.
      *
-     * @param array $error The error information.
+     * @param string[] $error The error information.
      *
      * @return string Error text.
      */

src/Logout.php

@@ -18,7 +18,7 @@ class Logout
 {
     /**
      * @param \SimpleSAML\IdP $idp
-     * @param array $state
+     * @param array<mixed> $state
      */
     public static function postLogout(IdP $idp, array $state): void
     {

src/Store.php

@@ -20,10 +20,10 @@ abstract class Store
      *
      * This constructor should always be called first in any class which implements this class.
      *
-     * @param array &$config The configuration for this storage handler.
+     * @param array<mixed> &$config The configuration for this storage handler.
      */
-    protected function __construct(array &$config)
-    {
+    protected function __construct(
+        protected array &$config) {
     }
 
 
@@ -108,7 +108,7 @@ public function getStatistics()
      *
      * @param string $userId The hash identifying the user at an IdP.
      *
-     * @return array Array of all destination ids the user has given consent for.
+     * @return array<mixed> Array of all destination ids the user has given consent for.
      */
     abstract public function getConsents(string $userId): array;
 

tests/src/Controller/ConsentControllerTest.php

@@ -91,7 +91,7 @@ public static function loadState(string $id, string $stage, bool $allowMissing =
                     'consent:store.destination' => 'urn:some:sp',
                     'consent:store.attributeSet' => 'some hash',
                     'consent:store' => new class () extends Cookie {
-                        public function __construct(array &$config = [])
+                        public function __construct()
                         {
                         }