Array field mapping in property doc blocks (#24)

Author: jerodev

src/Objects/DocBlockParser.php

@@ -54,14 +54,14 @@ private function parseType(string $contents, int &$i): string
                 continue;
             }
 
-            if (\in_array($char, ['|', ','])) {
+            if (\in_array($char, ['|', ',', ':'])) {
                 $type .= $char;
                 $lastChar = $char;
                 $sawSpace = false;
                 continue;
             }
 
-            if ($sawSpace && ! \in_array($lastChar, ['|', ','])) {
+            if ($sawSpace && ! \in_array($lastChar, ['|', ',', ':'])) {
                 break;
             }
 

tests/MapperTest.php

@@ -7,6 +7,7 @@
 use Jerodev\DataMapper\Mapper;
 use Jerodev\DataMapper\MapperConfig;
 use Jerodev\DataMapper\Tests\_Mocks\Aliases;
+use Jerodev\DataMapper\Tests\_Mocks\ArrayProperties;
 use Jerodev\DataMapper\Tests\_Mocks\Constructor;
 use Jerodev\DataMapper\Tests\_Mocks\Nullable;
 use Jerodev\DataMapper\Tests\_Mocks\SelfMapped;
@@ -209,5 +210,20 @@ public static function objectValuesDataProvider(): Generator
             ],
             $dto,
         ];
+
+        // Special array cases
+        $dto = new ArrayProperties();
+        $dto->ints = [2, 5, 8];
+        $dto->fieldsWithKeys = [
+            3 => [
+                'foo' => 'bar',
+                'bar' => 8,
+            ],
+        ];
+        yield [
+            ArrayProperties::class,
+            (array)$dto,
+            $dto,
+        ];
     }
 }

tests/_Mocks/ArrayProperties.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Jerodev\DataMapper\Tests\_Mocks;
+
+class ArrayProperties
+{
+    /** @var array<int> */
+    public array $ints;
+
+    /** @var array<int, array{foo: string, bar: int}> */
+    public array $fieldsWithKeys;
+}