fix: properly handle class sharing class name and namespace group name

src/Type/Parser/Factory/Specifications/AliasSpecification.php

@@ -12,6 +12,10 @@
 use ReflectionFunction;
 use Reflector;
 
+use function array_shift;
+use function explode;
+use function strtolower;
+
 /** @internal */
 final class AliasSpecification implements TypeParserSpecification
 {
@@ -49,32 +53,27 @@ public function manipulateToken(TraversingToken $token): TraversingToken
 
     private function resolveAlias(string $symbol): string
     {
-        $alias = $symbol;
+        $aliases = PhpParser::parseUseStatements($this->reflection);
 
         $namespaceParts = explode('\\', $symbol);
-        $lastPart = array_shift($namespaceParts);
 
-        if ($lastPart) {
-            $alias = strtolower($lastPart);
+        $lastPart = strtolower(end($namespaceParts));
+
+        if (isset($aliases[$lastPart])) {
+            return $aliases[$lastPart];
         }
 
-        $aliases = PhpParser::parseUseStatements($this->reflection);
+        $alias = strtolower(array_shift($namespaceParts));
 
         if (! isset($aliases[$alias])) {
             return $symbol;
         }
 
-        if ($aliases[$alias] === $symbol) {
-            return $symbol;
-        }
-
-        $full = $aliases[$alias];
-
-        if (! empty($namespaceParts)) {
-            $full .= '\\' . implode('\\', $namespaceParts);
+        if ($namespaceParts === []) {
+            return $aliases[$alias];
         }
 
-        return $full;
+        return $aliases[$alias] . '\\' . implode('\\', $namespaceParts);
     }
 
     private function resolveNamespaced(string $symbol): string

tests/Integration/Mapping/Namespace/SameClassNameAsNamespaceGroupMappingTest.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CuyZ\Valinor\Tests\Integration\Mapping\Namespace;
+
+use CuyZ\Valinor\Mapper\MappingError;
+use CuyZ\Valinor\Tests\Integration\IntegrationTestCase;
+use SomeNamespace\SomeClass;
+use SomeNamespace\SomeNamespace;
+
+final class SameClassNameAsNamespaceGroupMappingTest extends IntegrationTestCase
+{
+    // @see https://github.com/CuyZ/Valinor/issues/554
+    public function test_class_name_has_same_name_as_namespace_group_dot_not_block_type_resolution(): void
+    {
+        require_once 'class-name-with-same-name-as-namespace-group.php';
+
+        try {
+            $result = $this->mapperBuilder()->mapper()->map(ClassContainingNamespacedClasses::class, [
+                'objectA' => ['stringValue' => 'foo'],
+                'objectB' => ['integerValue' => 42],
+            ]);
+        } catch (MappingError $error) {
+            $this->mappingFail($error);
+        }
+
+        self::assertSame('foo', $result->objectA->stringValue);
+        self::assertSame(42, $result->objectB->integerValue);
+    }
+}
+
+final class ClassContainingNamespacedClasses
+{
+    public SomeNamespace $objectA;
+    public SomeClass $objectB;
+}

tests/Integration/Mapping/Namespace/class-name-with-same-name-as-namespace-group.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace SomeNamespace;
+
+final class SomeNamespace
+{
+    public string $stringValue;
+}
+
+final class SomeClass
+{
+    public int $integerValue;
+}