Support for array type in ParamConverter.

ray-di · Nov 9, 2023 · dfb9078 · dfb9078
1 parent 02ad56d
commit dfb9078
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/ToScalarInterface.php b/src/ToScalarInterface.php
@@ -6,5 +6,6 @@
 
 interface ToScalarInterface
 {
-    public function toScalar(): bool|string|int|float;
+    /** @return scalar|array<int,scalar> */
+    public function toScalar(): bool|string|int|float|array;
 }
diff --git a/tests/Fake/FakeArray.php b/tests/Fake/FakeArray.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Ray\MediaQuery;
+
+class FakeArray implements ToScalarInterface
+{
+    /** @return array<int,int> */
+    public function toScalar(): array
+    {
+        return [0, 1];
+    }
+}
diff --git a/tests/ParamConverterTest.php b/tests/ParamConverterTest.php
@@ -12,9 +12,19 @@ class ParamConverterTest extends TestCase
 {
     public function testInvoke(): void
     {
-        $values = ['date_val' => new UnixEpocTime(), 'bool_val' => new FakeBool(), 'string_val' => new FakeString()];
+        $values = [
+            'date_val' => new UnixEpocTime(),
+            'bool_val' => new FakeBool(),
+            'string_val' => new FakeString(),
+            'array_val' => new FakeArray(),
+        ];
         (new ParamConverter())($values);
-        $this->assertSame(['date_val' => UnixEpocTime::TEXT, 'bool_val' => true, 'string_val' => 'a'], $values);
+        $this->assertSame([
+            'date_val' => UnixEpocTime::TEXT,
+            'bool_val' => true,
+            'string_val' => 'a',
+            'array_val' => [0, 1],
+        ], $values);
     }
 
     public function testInvalidParam(): void