Fix remaining Psalm-issues

Author: tvdijen

psalm.xml

@@ -23,18 +23,20 @@
   </projectFiles>
 
   <issueHandlers>
-    <!-- Ignore UnresolvableInclude on CLI-scripts -->
-    <UnresolvableInclude>
-        <errorLevel type="suppress">
-          <file name="tests/bootstrap.php" />
-        </errorLevel>
-    </UnresolvableInclude>
+    <!-- Ignore InvalidClassConstantType -->
     <InvalidClassConstantType>
       <errorLevel type="suppress">
         <file name="src/Forms/Controls/CsrfProtection.php" />
       </errorLevel>
     </InvalidClassConstantType>
 
+    <!-- Ignore PossiblyFalseArgument -->
+    <PossiblyFalseArgument>
+      <errorLevel type="suppress">
+        <file name="src/Server/Validators/BearerTokenValidator.php" />
+      </errorLevel>
+    </PossiblyFalseArgument>
+
     <!-- Ignore errors related to unused classes, methods... -->
     <UnusedClass errorLevel="suppress" />
     <PossiblyUnusedMethod errorLevel="suppress" />

src/Forms/Controls/CsrfProtection.php

@@ -39,6 +39,7 @@ public function __construct(string|Stringable|null $errorMessage, protected Sess
     {
         // Instead of calling CsrfProtection parent class constructor, go to it's parent (HiddenField), and call
         // its constructor. This is to avoid setting a Nette session in CsrfProtection parent, and use the SSP one.
+        /** @psalm-suppress PossiblyFalseArgument */
         $hiddentFieldParent = get_parent_class(get_parent_class($this));
 
         if (!is_string($hiddentFieldParent)) {

src/Helpers/Str.php

@@ -23,6 +23,7 @@ public function convertScopesStringToArray(string $scopes, string $delimiter = '
      */
     public function convertTextToArray(string $text, string $pattern = "/[\t\r\n]+/"): array
     {
+        /** @psalm-suppress PossiblyFalseArgument */
         return array_filter(
             preg_split($pattern, $text),
             fn(string $line): bool => !empty(trim($line)),

src/Server/Validators/BearerTokenValidator.php

@@ -21,6 +21,7 @@
 use SimpleSAML\Module\oidc\Server\Exceptions\OidcServerException;
 use SimpleSAML\Module\oidc\Services\LoggerService;
 
+use function apache_request_headers;
 use function count;
 use function date_default_timezone_get;
 use function is_array;

src/Services/LoggerService.php

@@ -14,42 +14,42 @@ class LoggerService implements LoggerInterface
 {
     public function emergency(string|Stringable $message, array $context = []): void
     {
-        Logger::emergency($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::emergency((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function alert(string|Stringable $message, array $context = []): void
     {
-        Logger::alert($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::alert((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function critical(string|Stringable $message, array $context = []): void
     {
-        Logger::critical($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::critical((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function error(string|Stringable $message, array $context = []): void
     {
-        Logger::error($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::error((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function warning(string|Stringable $message, array $context = []): void
     {
-        Logger::warning($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::warning((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function notice(string|Stringable $message, array $context = []): void
     {
-        Logger::notice($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::notice((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function info(string|Stringable $message, array $context = []): void
     {
-        Logger::info($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::info((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function debug(string|Stringable $message, array $context = []): void
     {
-        Logger::debug($message . ($context ? " " . var_export($context, true) : ""));
+        Logger::debug((string)$message . ($context ? " " . var_export($context, true) : ""));
     }
 
     public function log(mixed $level, string|Stringable $message, array $context = []): void

src/Utils/FingerprintGenerator.php

@@ -21,7 +21,7 @@ public static function forFile(string $path, string $algo = 'md5'): string
     {
         $fingerprint = hash_file($algo, $path);
 
-        if (false === (bool) $fingerprint) {
+        if (false === $fingerprint) {
             throw new InvalidArgumentException(
                 'Could not create a fingerprint for provided file using provided algorithm.',
             );
@@ -41,14 +41,6 @@ public static function forFile(string $path, string $algo = 'md5'): string
      */
     public static function forString(string $content, string $algo = 'md5'): string
     {
-        $fingerprint = hash($algo, $content);
-
-        if (false === (bool) $fingerprint) {
-            throw new InvalidArgumentException(
-                'Could not create a fingerprint for provided content using provided algorithm.',
-            );
-        }
-
-        return $fingerprint;
+        return hash($algo, $content);
     }
 }