bug #44430 [PropertyInfo] Fix aliased namespace matching (Korbeil)

nicolas-grekas · nicolas-grekas · commit 4d9f1aab353f · 2021-12-14T14:58:41.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [PropertyInfo] Fix aliased namespace matching | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #44417 | License | MIT | Doc PR | N/A When you have an aliased namespace that you use in your code it was erroring because we didn't stored the first part of the namespace that should be replaced. Commits ------- 432b1a1 Fix aliased namespaces matching
diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScope.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScope.php
@@ -41,13 +41,14 @@ public function resolveStringName(string $name): string
         }
 
         $nameParts = explode('\\', $name);
-        if (isset($this->uses[$nameParts[0]])) {
+        $firstNamePart = $nameParts[0];
+        if (isset($this->uses[$firstNamePart])) {
             if (1 === \count($nameParts)) {
-                return $this->uses[$nameParts[0]];
+                return $this->uses[$firstNamePart];
             }
             array_shift($nameParts);
 
-            return sprintf('%s\\%s', $this->uses[$nameParts[0]], implode('\\', $nameParts));
+            return sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));
         }
 
         if (null !== $this->namespace) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -370,6 +370,14 @@ public function unionTypesProvider(): array
             ['e', [new Type(Type::BUILTIN_TYPE_OBJECT, true, Dummy::class, true, [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING)])], [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], [new Type(Type::BUILTIN_TYPE_STRING, false, null, true, [], [new Type(Type::BUILTIN_TYPE_OBJECT, false, DefaultValue::class)])])]), new Type(Type::BUILTIN_TYPE_OBJECT, false, ParentDummy::class)]],
         ];
     }
+
+    public function testDummyNamespace()
+    {
+        $this->assertEquals(
+            [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')],
+            $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DummyNamespace', 'dummy')
+        );
+    }
 }
 
 class PhpStanOmittedParamTagTypeDocBlock
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyNamespace.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyNamespace.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+use Symfony\Component\PropertyInfo\Tests as TestNamespace;
+
+/**
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class DummyNamespace
+{
+    /** @var TestNamespace\Fixtures\Dummy */
+    private $dummy;
+}

Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,14 @@ public function resolveStringName(string $name): string`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`$nameParts = explode('\\', $name);`
`44`		`- if (isset($this->uses[$nameParts[0]])) {`
	`44`	`+ $firstNamePart = $nameParts[0];`
	`45`	`+ if (isset($this->uses[$firstNamePart])) {`
`45`	`46`	`if (1 === \count($nameParts)) {`
`46`		`- return $this->uses[$nameParts[0]];`
	`47`	`+ return $this->uses[$firstNamePart];`
`47`	`48`	`}`
`48`	`49`	`array_shift($nameParts);`
`49`	`50`
`50`		`- return sprintf('%s\\%s', $this->uses[$nameParts[0]], implode('\\', $nameParts));`
	`51`	`+ return sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`if (null !== $this->namespace) {`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,14 @@ public function unionTypesProvider(): array`
`370`	`370`	`['e', [new Type(Type::BUILTIN_TYPE_OBJECT, true, Dummy::class, true, [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [], [new Type(Type::BUILTIN_TYPE_STRING)])], [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], [new Type(Type::BUILTIN_TYPE_STRING, false, null, true, [], [new Type(Type::BUILTIN_TYPE_OBJECT, false, DefaultValue::class)])])]), new Type(Type::BUILTIN_TYPE_OBJECT, false, ParentDummy::class)]],`
`371`	`371`	`];`
`372`	`372`	`}`
	`373`	`+`
	`374`	`+ public function testDummyNamespace()`
	`375`	`+ {`
	`376`	`+ $this->assertEquals(`
	`377`	`+ [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')],`
	`378`	`+ $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DummyNamespace', 'dummy')`
	`379`	`+ );`
	`380`	`+ }`
`373`	`381`	`}`
`374`	`382`
`375`	`383`	`class PhpStanOmittedParamTagTypeDocBlock`