bug #61004 [TypeInfo] Fix imported-only alias resolving (mtarld)

nicolas-grekas · nicolas-grekas · commit 777e91a1028d · 2025-07-07T09:46:14.000+02:00
This PR was merged into the 7.3 branch. Discussion ---------- [TypeInfo] Fix imported-only alias resolving | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60997 | License | MIT Fix type alias resolving when aliases are only coming from imports. Commits ------- d19800f [TypeInfo] Fix imported-only alias resolving
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithTypeAliases.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithTypeAliases.php
@@ -57,6 +57,17 @@ final class DummyWithTypeAliases
     public mixed $psalmOtherAliasedExternalAlias;
 }
 
+/**
+ * @phpstan-import-type CustomInt from DummyWithPhpDoc
+ */
+final class DummyWithImportedOnlyTypeAliases
+{
+    /**
+     * @var CustomInt
+     */
+    public mixed $externalAlias;
+}
+
 /**
  * @phpstan-type Foo = array{0: Bar}
  * @phpstan-type Bar = array{0: Foo}
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\TypeInfo\Exception\LogicException;
 use Symfony\Component\TypeInfo\Tests\Fixtures\AbstractDummy;
 use Symfony\Component\TypeInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithImportedOnlyTypeAliases;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithInvalidTypeAlias;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithInvalidTypeAliasImport;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithRecursiveTypeAliases;
@@ -179,6 +180,10 @@ public function testCollectTypeAliases()
             'PsalmCustomArray' => Type::arrayShape([0 => Type::int(), 1 => Type::string(), 2 => Type::bool()]),
             'PsalmAliasedCustomInt' => Type::int(),
         ], $this->typeContextFactory->createFromReflection(new \ReflectionProperty(DummyWithTypeAliases::class, 'localAlias'))->typeAliases);
+
+        $this->assertEquals([
+            'CustomInt' => Type::int(),
+        ], $this->typeContextFactory->createFromReflection(new \ReflectionClass(DummyWithImportedOnlyTypeAliases::class))->typeAliases);
     }
 
     public function testDoNotCollectTypeAliasesWhenToStringTypeResolver()
diff --git a/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php b/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php
@@ -241,7 +241,7 @@ private function collectTypeAliases(\ReflectionClass $reflection, TypeContext $t
     private function resolveTypeAliases(array $toResolve, array $resolved, TypeContext $typeContext): array
     {
         if (!$toResolve) {
-            return [];
+            return $resolved;
         }
 
         $typeContext = new TypeContext(

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private function collectTypeAliases(\ReflectionClass $reflection, TypeContext $t`
`241`	`241`	`private function resolveTypeAliases(array $toResolve, array $resolved, TypeContext $typeContext): array`
`242`	`242`	`{`
`243`	`243`	`if (!$toResolve) {`
`244`		`- return [];`
	`244`	`+ return $resolved;`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`$typeContext = new TypeContext(`