[Next] Resolve classes in same namespace as caller (#14)

Author: jerodev

src/Objects/ClassBluePrinter.php

@@ -53,7 +53,10 @@ private function printConstructor(ReflectionClass $reflection, ClassBluePrint $b
 
             $arg = [
                 'name' => $param->getName(),
-                'type' => $this->resolveType($this->dataTypeFactory->fromString($type), $reflection->getName()),
+                'type' => $this->resolveType(
+                    $this->dataTypeFactory->fromString($type),
+                    $reflection->getName(),
+                ),
             ];
             if ($param->isDefaultValueAvailable()) {
                 $arg['default'] = $param->getDefaultValue();

src/Objects/ClassResolver.php

@@ -71,6 +71,20 @@ private function findClassNameInFile(string $name, string $sourceFile): string
                 continue;
             }
 
+            // Find the class in the same namespace as the caller
+            if ($newline && $char === 'n' && \substr($file, $i, 10) === 'namespace ') {
+                $i += 10;
+                $namespace = '';
+                while (($char = $file[$i++]) !== ';') {
+                    $namespace .= $char;
+                }
+
+                $classInNamespace = $namespace . '\\' . $lastPart;
+                if (\class_exists($classInNamespace)) {
+                    return $classInNamespace;
+                }
+            }
+
             // If we are after a newline and find a use statement, parse it!
             if ($newline && $char === 'u' && \substr($file, $i, 4) === 'use ') {
                 $i += 4;

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\Constructor;
 use Jerodev\DataMapper\Tests\_Mocks\SelfMapped;
 use Jerodev\DataMapper\Tests\_Mocks\SuitEnum;
 use Jerodev\DataMapper\Tests\_Mocks\SuperUserDto;
@@ -158,5 +159,21 @@ public static function objectValuesDataProvider(): Generator
             [],
             $dto,
         ];
+
+        // Array in constructor
+        $dto = new Constructor([
+            new UserDto('Jerodev'),
+        ]);
+        yield [
+            Constructor::class,
+            [
+                'users' => [
+                    [
+                        'name' => 'Jerodev',
+                    ],
+                ],
+            ],
+            $dto,
+        ];
     }
 }

tests/_Mocks/Constructor.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Jerodev\DataMapper\Tests\_Mocks;
+
+final class Constructor
+{
+    /**
+     * @param UserDto[] $users
+     */
+    public function __construct(
+        public readonly array $users,
+    ) {
+    }
+}