Refactor createArrayOfInputs to enforce array type for item data and improve error handling

Author: koriym

src/InputQuery.php

@@ -21,6 +21,7 @@
 use function array_key_exists;
 use function assert;
 use function class_exists;
+use function gettype;
 use function is_array;
 use function is_bool;
 use function is_float;
@@ -335,7 +336,7 @@ private function toCamelCase(string $string): string
      * @param array<string, mixed> $query
      * @param class-string<T>      $itemClass
      *
-     * @return array<mixed>
+     * @return array<array-key, T>
      */
     private function createArrayOfInputs(string $paramName, array $query, string $itemClass): array
     {
@@ -353,12 +354,20 @@ private function createArrayOfInputs(string $paramName, array $query, string $it
         $result = [];
         /** @var mixed $itemData */
         foreach ($arrayData as $key => $itemData) {
-            if (is_array($itemData)) {
-                // Query parameters from HTTP requests have string keys
-                /** @psalm-var array<string, mixed> $itemData */
-                /** @phpstan-var array<string, mixed> $itemData */
-                $result[$key] = $this->create($itemClass, $itemData);
+            if (! is_array($itemData)) {
+                throw new InvalidArgumentException(
+                    sprintf(
+                        'Expected array for item at key "%s", got %s.',
+                        $key,
+                        gettype($itemData),
+                    ),
+                );
             }
+
+            // Query parameters from HTTP requests have string keys
+            /** @psalm-var array<string, mixed> $itemData */
+            /** @phpstan-var array<string, mixed> $itemData */
+            $result[$key] = $this->create($itemClass, $itemData);
         }
 
         return $result;

tests/ArrayInputTest.php

@@ -5,6 +5,7 @@
 namespace Ray\InputQuery;
 
 use ArrayObject;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Ray\Di\Injector;
 use Ray\InputQuery\Attribute\Input;
@@ -152,11 +153,8 @@ public function testArrayWithNonArrayElements(): void
     {
         $query = [
             'users' => [
-                'string-value',
-                123,
+                'string-value', // Non-array element at index 0
                 ['id' => '1', 'name' => 'valid'],
-                null,
-                true,
             ],
         ];
 
@@ -170,13 +168,11 @@ public function listUsers(
         };
 
         $method = new ReflectionMethod($controller, 'listUsers');
-        $args = $this->inputQuery->getArguments($method, $query);
 
-        $this->assertIsArray($args[0]);
-        $this->assertCount(1, $args[0]); // Only the valid array element
-        $this->assertInstanceOf(UserInputWithAttribute::class, $args[0][2]);
-        $this->assertSame('1', $args[0][2]->id);
-        $this->assertSame('valid', $args[0][2]->name);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected array for item at key "0", got string.');
+
+        $this->inputQuery->getArguments($method, $query);
     }
 
     public function testCustomArrayObjectOfInputObjects(): void
@@ -216,4 +212,28 @@ public function listUsers(
         $this->assertInstanceOf(UserInputWithAttribute::class, $firstUser);
         $this->assertSame('5', $firstUser->id);
     }
+
+    public function testArrayObjectWithoutItemAttribute(): void
+    {
+        $query = [
+            'users' => [
+                ['id' => '1', 'name' => 'test'],
+            ],
+        ];
+
+        $controller = new class {
+            public function listUsers(
+                #[Input] // No item parameter specified
+                ArrayObject $users,
+            ): ArrayObject {
+                return $users;
+            }
+        };
+
+        $method = new ReflectionMethod($controller, 'listUsers');
+        $args = $this->inputQuery->getArguments($method, $query);
+
+        // Should create a regular ArrayObject with the nested query data
+        $this->assertInstanceOf(ArrayObject::class, $args[0]);
+    }
 }