improve type safety

Author: filecage

src/Components/Query.php

@@ -15,7 +15,7 @@ final class Query {
         /**
          * @var array<string, QueryParameter>
          */
-        private array $queryParameters;
+        private array $queryParameters = [];
 
         /**
          * @throws InvalidArgumentException
@@ -90,17 +90,17 @@ function __toString () : string {
          * @throws InvalidArgumentException
          * @param string $query
          *
-         * @return Generator & iterable<QueryParameter>
+         * @return iterable<int, QueryParameter>
          */
-        private static function mapKeyValuePairsToQueryParameters (string $query) : Generator {
+        private static function mapKeyValuePairsToQueryParameters (string $query) : iterable {
             foreach (self::collectKeyValuePairs($query) as $key => $value) {
                 yield QueryParameter::create($key, $value);
             }
         }
 
         /**
          * @param string $query
-         * @return array<string, array<int, string|null>|string|null>
+         * @return array<string, non-empty-array<array-key, mixed>|string|null>
          */
         private static function collectKeyValuePairs (string $query) : array {
             $parameters = [];

src/Components/QueryParameters/ArrayQueryParameter.php

@@ -34,7 +34,7 @@ function getValueAsString () : string {
     }
 
     function getValueAsInt () : int {
-        return (int) $this->value;
+        return empty($this->value) ? 0 : 1;
     }
 
     function __toString (): string {

src/Components/QueryParameters/QueryParameter.php

@@ -21,13 +21,19 @@ static function create (string $key, mixed $value) : self {
         if (is_bool($value)) {
             return new BooleanQueryParameter($key, $value);
         } elseif (is_array($value)) {
-            return new ArrayQueryParameter($key, ...$value);
+            return new ArrayQueryParameter($key, ...array_map(function (mixed $value) use ($key) : string|null {
+                if (!is_string($value) && $value !== null) {
+                    throw new InvalidArgumentException("Unsupported query parameter value of type `" . gettype($value) . "` for item of key `{$key}`");
+                }
+
+                return $value;
+            }, $value));
         } elseif ($value instanceof \Stringable) {
             $value = (string) $value;
         }
 
         if ($value !== null && !is_string($value)) {
-            throw new InvalidArgumentException("Unsupported query parameter of type `" . gettype($value) . "`");
+            throw new InvalidArgumentException("Unsupported query parameter value of type `" . gettype($value) . "` for key `{$key}`");
         }
 
         return new StringQueryParameter($key, $value);