[Php80] Handle Alias is used as Attribute on AnnotationToAttributeRec…

…tor (#1511) * [Php80] Handle Alias is used as Attribute on AnnotationToAttributeRector * eol * [ci-review] Rector Rectify * Fixed 🎉 * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Dec 17, 2021 · db94f7a · db94f7a
1 parent 4bac761
commit db94f7a
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 9 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php b/packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php
@@ -5,6 +5,7 @@
 namespace Rector\BetterPhpDocParser\PhpDocParser;
 
 use PhpParser\Node;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt\Use_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
@@ -59,6 +60,40 @@ private function resolveFullyQualifiedClass(array $uses, Node $node, string $tag
                 if ($this->reflectionProvider->hasClass($namespacedTag)) {
                     return $namespacedTag;
                 }
+
+                if (! str_contains($tag, '\\')) {
+                    return $this->resolveAsAliased($uses, $tag);
+                }
+            }
+        }
+
+        return $this->useImportNameMatcher->matchNameWithUses($tag, $uses) ?? $tag;
+    }
+
+    /**
+     * @param Use_[] $uses
+     */
+    private function resolveAsAliased(array $uses, string $tag): string
+    {
+        foreach ($uses as $use) {
+            $useUses = $use->uses;
+            // skip group uses or empty
+            if (count($useUses) !== 1) {
+                continue;
+            }
+
+            // uses already removed
+            if (! isset($useUses[0])) {
+                continue;
+            }
+
+            if (! $useUses[0]->alias instanceof Identifier) {
+                continue;
+            }
+
+            $alias = $useUses[0]->alias;
+            if ($alias->toString() === $tag) {
+                return $useUses[0]->name->toString();
             }
         }
 

diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Fixture/alias_used.php.inc b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Fixture/alias_used.php.inc
@@ -0,0 +1,49 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias\TestOther as TestOtherAlias;
+use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias as TestFoo;
+
+final class AliasUsed
+{
+    /**
+    * @TestFoo\TestSmth
+    */
+    private string $foo;
+
+    /**
+    * @TestFoo\TestOther
+    */
+    private string $bar;
+
+    /**
+    * @TestOtherAlias
+    */
+    private string $baz;
+
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture;
+
+use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias\TestOther as TestOtherAlias;
+use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias as TestFoo;
+
+final class AliasUsed
+{
+    #[TestFoo\TestSmth]
+    private string $foo;
+
+    #[TestFoo\TestOther]
+    private string $bar;
+
+    #[TestOtherAlias]
+    private string $baz;
+
+}
+
+?>
diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Source/UseAlias/TestOther.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Source/UseAlias/TestOther.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias;
+
+final class TestOther {
+}
diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Source/UseAlias/TestSmth.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Source/UseAlias/TestSmth.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias;
+
+final class TestSmth {
+}
diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php
@@ -30,5 +30,13 @@
             // validation
             new AnnotationToAttribute('Symfony\Component\Validator\Constraints\All'),
             new AnnotationToAttribute('Symfony\Component\Validator\Constraints\Length'),
+
+            // test for alias used
+            new AnnotationToAttribute(
+                'Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias\TestSmth'
+            ),
+            new AnnotationToAttribute(
+                'Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\UseAlias\TestOther'
+            ),
         ]);
 };
diff --git a/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php b/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php
@@ -54,15 +54,7 @@ public function matchNameWithUses(string $tag, array $uses): ?string
         return null;
     }
 
-    private function isUseMatchingName(string $tag, UseUse $useUse): bool
-    {
-        $shortName = $useUse->alias !== null ? $useUse->alias->name : $useUse->name->getLast();
-        $shortNamePattern = preg_quote($shortName, '#');
-        $pattern = sprintf(self::SHORT_NAME_REGEX, $shortNamePattern);
-        return StringUtils::isMatch($tag, $pattern);
-    }
-
-    private function resolveName(string $tag, UseUse $useUse): string
+    public function resolveName(string $tag, UseUse $useUse): string
     {
         if ($useUse->alias === null) {
             return $useUse->name->toString();
@@ -75,4 +67,12 @@ private function resolveName(string $tag, UseUse $useUse): string
 
         return $useUse->name . '\\' . $unaliasedShortClass;
     }
+
+    private function isUseMatchingName(string $tag, UseUse $useUse): bool
+    {
+        $shortName = $useUse->alias !== null ? $useUse->alias->name : $useUse->name->getLast();
+        $shortNamePattern = preg_quote($shortName, '#');
+        $pattern = sprintf(self::SHORT_NAME_REGEX, $shortNamePattern);
+        return StringUtils::isMatch($tag, $pattern);
+    }
 }