Merge pull request #15 from bearsunday/sooorh-sa

Soothe SA

src/Http/CreateResponse.php

@@ -77,7 +77,7 @@ private function getHeaders(array $headers): array
             $keyedHeader[$matched[1]] = $matched[2];
         }
 
-        return $keyedHeader; // @phpstan-ignore-line
+        return $keyedHeader;
     }
 
     /**

src/Http/HttpResource.php

@@ -181,7 +181,7 @@ public function options(string $uri, array $query = []): ResourceObject
     }
 
     /**
-     * @param array<mixed> $query
+     * @param array<string, mixed> $query
      */
     private function safeRequest(string $path, array $query): ResourceObject
     {

src/QueryMerger.php

@@ -13,14 +13,19 @@
 final class QueryMerger
 {
     /**
-     * @param array<mixed> $query
+     * @param array<string, mixed> $query
      */
     public function __invoke(string $uri, array $query): Uri
     {
         $path = (string) parse_url($uri, PHP_URL_PATH);
         $uriQueryString = (string) parse_url($uri, PHP_URL_QUERY);
         parse_str($uriQueryString, $uriQuery);
-        $mergedQuery = $uriQuery + $query;
+        $uriQueryKeyString = [];
+        foreach ($uriQuery as $key => $value) {
+            $uriQueryKeyString[(string) $key] = $value;
+        }
+
+        $mergedQuery = $uriQueryKeyString + $query;
 
         return new Uri($path, $mergedQuery);
     }

src/Uri.php

@@ -9,11 +9,11 @@ final class Uri
     /** @var string  */
     public $path;
 
-    /** @var array<string, string> */
+    /** @var array<string, mixed> */
     public $query;
 
     /**
-     * @param  array<string, string> $query
+     * @param  array<string, mixed> $query
      */
     public function __construct(string $path, array $query)
     {