[master] fix more phpstan errors

composer.json

@@ -46,6 +46,7 @@
     "scripts": {
         "check" : [
             "@cs-check",
+            "@phpstan",
             "@test"
         ],
         "cs-check" : "phpcs --parallel=50",

phpstan.neon.dist

@@ -8,7 +8,7 @@ parameters:
   tmpDir: data/phpstan
   cache:
       nodesByStringCountMax: 0
-  level: 6
+  level: 7
   fileExtensions:
   	- php
   paths:

src/Client/Client.php

@@ -34,6 +34,7 @@ public function createRequest(
             $timestamp += $this->localtimeOffset;
         }
 
+        /** @var array{host: string, path?: string, query?: string, scheme: string, port?: int} $parsed */
         $parsed = parse_url($uri);
         $host = $parsed['host'];
         $resource = $parsed['path'] ?? '';
@@ -191,6 +192,7 @@ public function createBewit(
             $timestamp += $this->localtimeOffset;
         }
 
+        /** @var array{host: string, path?: string, query?: string, scheme: string, port?: int} $parsed */
         $parsed = parse_url($uri);
         $host = $parsed['host'];
         $resource = $parsed['path'] ?? '';

src/Header/HeaderFactory.php

@@ -5,7 +5,7 @@
 class HeaderFactory
 {
     /**
-     * @param array<string, string>|null $attributes
+     * @param array<string, mixed>|null $attributes
      */
     public static function create(string $fieldName, array $attributes = null): Header
     {
@@ -39,22 +39,21 @@ public static function createFromString(string $fieldName, string $fieldValue, a
     }
 
     /**
-     * @param callable(): void $onError
+     * @param callable(): never $onError
      * @throws FieldValueParserException
      * @throws NotHawkAuthorizationException
      */
     public static function createFromHeaderObjectOrString(
         string $fieldName,
         mixed $headerObjectOrString,
         callable $onError
-    ): Header|string|null {
+    ): Header {
         if (is_string($headerObjectOrString)) {
             return static::createFromString($fieldName, $headerObjectOrString);
-        } elseif ($headerObjectOrString instanceof Header) {
+        }
+        if ($headerObjectOrString instanceof Header) {
             return $headerObjectOrString;
-        } else {
-            call_user_func($onError);
         }
-        return null;
+        call_user_func($onError);
     }
 }

src/Header/HeaderParser.php

@@ -7,6 +7,7 @@ class HeaderParser
     /**
      * @param string[]|null $requiredKeys
      * @return array<string, string>
+     * @throws FieldValueParserException
      */
     public static function parseFieldValue(string $fieldValue, array $requiredKeys = null): array
     {
@@ -18,6 +19,9 @@ public static function parseFieldValue(string $fieldValue, array $requiredKeys =
         $fieldValue = substr($fieldValue, 5);
         foreach (explode(', ', $fieldValue) as $part) {
             $equalsPos = strpos($part, '=');
+            if ($equalsPos === false) {
+                throw new FieldValueParserException('field did not contain a "="');
+            }
             $key = substr($part, 0, $equalsPos);
             $value = substr($part, $equalsPos + 1);
             $attributes[$key] = trim($value, '"');

src/Server/UnauthorizedException.php

@@ -11,7 +11,7 @@ class UnauthorizedException extends Exception
     private ?Header $header = null;
 
     /**
-     * @param array<string, string> $attributes
+     * @param array<string, mixed> $attributes
      */
     public function __construct(?string $message = null, private array $attributes = [])
     {