Fix phpstan-issues

Author: tvdijen

composer.json

@@ -22,9 +22,6 @@
         }
     },
     "require": {
-        "php": "^8.3"
-    },
-    "require-dev": {
         "php": "^8.3",
         "ext-curl": "*",
 

src/ArrayLogger.php

@@ -7,12 +7,14 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger\LoggingHandlerInterface;
 
+use function array_merge;
+
 /**
  */
 class ArrayLogger implements LoggingHandlerInterface
 {
     /**
-     * @var array List of log entries by level
+     * @var array<int, array<string>> List of log entries by level
      */
     public array $logs = [];
 
@@ -24,9 +26,9 @@ public function __construct(Configuration $config)
     }
 
 
-    public function log(int $level, string $string): void
+    public function log(int $level, string $str): void
     {
-        $this->logs[$level][] = $string;
+        $this->logs[$level] = array_merge($this->logs[$level], [$str]);
     }
 
 

src/BuiltInServer.php

@@ -206,10 +206,10 @@ public function setRouter(string $router): void
      * This function performs an HTTP GET request to the built-in server.
      *
      * @param string $query The query to perform.
-     * @param array $parameters An array (can be empty) with parameters for the requested URI.
-     * @param array $curlopts An array (can be empty) with options for cURL.
+     * @param array<mixed> $parameters An array (can be empty) with parameters for the requested URI.
+     * @param array<mixed> $curlopts An array (can be empty) with options for cURL.
      *
-     * @return array The response obtained from the built-in server.
+     * @return array<mixed> The response obtained from the built-in server.
      */
     public function get(string $query, array $parameters, array $curlopts = []): array
     {
@@ -218,12 +218,12 @@ public function get(string $query, array $parameters, array $curlopts = []): arr
         $url .= (!empty($parameters)) ? '?' . http_build_query($parameters) : '';
         curl_setopt_array($ch, [
             CURLOPT_URL => $url,
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HEADER => 1,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
         ]);
         curl_setopt_array($ch, $curlopts);
 
-        /** @var mixed $resp */
+        /** @var string|bool $resp */
         $resp = curl_exec($ch);
         $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         list($header, $body) = explode("\r\n\r\n", $resp, 2);

src/InMemoryStore.php

@@ -16,6 +16,7 @@
  */
 class InMemoryStore implements ClearableState, StoreInterface
 {
+    /** @var array<mixed> */
     private static array $store = [];
 
 

src/SigningTestCase.php

@@ -44,20 +44,7 @@ class SigningTestCase extends TestCase
 
 
     /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->root_directory = dirname(dirname(__FILE__));
-        $base = $this->root_directory . DIRECTORY_SEPARATOR . $this->cert_directory;
-        $this->ca_private_key = file_get_contents($base . DIRECTORY_SEPARATOR . $this->ca_private_key_file);
-        $this->ca_certificate = file_get_contents($base . DIRECTORY_SEPARATOR . $this->ca_certificate_file);
-        $this->good_private_key = file_get_contents($base . DIRECTORY_SEPARATOR . $this->good_private_key_file);
-        $this->good_certificate = file_get_contents($base . DIRECTORY_SEPARATOR . $this->good_certificate_file);
-    }
-
-
-    /**
+     * @return array<mixed>
      */
     public function getCertDirContent(): array
     {
@@ -74,6 +61,13 @@ public function getCertDirContent(): array
      */
     public function setUp(): void
     {
+        $this->root_directory = dirname(dirname(__FILE__));
+        $base = $this->root_directory . DIRECTORY_SEPARATOR . $this->cert_directory;
+        $this->ca_private_key = file_get_contents($base . DIRECTORY_SEPARATOR . $this->ca_private_key_file);
+        $this->ca_certificate = file_get_contents($base . DIRECTORY_SEPARATOR . $this->ca_certificate_file);
+        $this->good_private_key = file_get_contents($base . DIRECTORY_SEPARATOR . $this->good_private_key_file);
+        $this->good_certificate = file_get_contents($base . DIRECTORY_SEPARATOR . $this->good_certificate_file);
+
         $this->config = Configuration::loadFromArray([
             'certdir' => $this->cert_directory,
         ], '[ARRAY]', 'simplesaml');

src/SimpleTestLogger.php

@@ -18,6 +18,7 @@
 final class SimpleTestLogger extends AbstractLogger
 {
     /**
+     * @var array<string>
      */
     private array $messages = [];
 
@@ -41,10 +42,12 @@ public function log($level, string|Stringable $message, array $context = []): vo
      * Get all the messages logged at the specified level
      *
      * @param mixed $level
+     * @return array<mixed> $level
      */
     public function getMessagesForLevel($level): array
     {
-        return array_filter($this->messages, function (string $message) use ($level) {
+        // @phpstan-ignore argument.type
+        return array_filter($this->messages, function (array $message) use ($level) {
             return $message['level'] === $level;
         });
     }
@@ -57,7 +60,8 @@ public function getMessagesForLevel($level): array
      */
     public function hasMessage(string|Stringable $messageToFind): bool
     {
-        $count = array_filter($this->messages, function ($message) use ($messageToFind) {
+        // @phpstan-ignore argument.type
+        $count = array_filter($this->messages, function (array $message) use ($messageToFind) {
             return $message['message'] === $messageToFind;
         });
 

src/StateClearer.php

@@ -16,11 +16,15 @@ class StateClearer
 {
     /**
      * Global state to restore between test runs
+     *
+     * @var array<mixed>
      */
     private array $backups = [];
 
     /**
      * Class that implement \SimpleSAML\Utils\ClearableState and should have clearInternalState called between tests
+     *
+     * @var array<mixed>
      */
     private array $clearableState = [
         Configuration::class,
@@ -31,6 +35,8 @@ class StateClearer
 
     /**
      * Environmental variables to unset
+     *
+     * @var array<mixed>
      */
     private array $vars_to_unset = ['SIMPLESAMLPHP_CONFIG_DIR'];