Closes #5725 Fixes #5724

rectorphp · Mar 3, 2021 · 6ef2e08 · 6ef2e08
1 parent 2e31059
commit 6ef2e08
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/rules/privatization/src/Rector/ClassMethod/PrivatizeLocalOnlyMethodRector.php b/rules/privatization/src/Rector/ClassMethod/PrivatizeLocalOnlyMethodRector.php
@@ -6,6 +6,7 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Type\ObjectType;
@@ -20,6 +21,7 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Privatization\NodeAnalyzer\ClassMethodExternalCallNodeAnalyzer;
 use Rector\VendorLocker\NodeVendorLocker\ClassMethodVisibilityVendorLockResolver;
+use Symfony\Component\Routing\Annotation\Route;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -236,6 +238,28 @@ private function shouldSkipClassMethod(ClassMethod $classMethod, PhpDocInfo $php
             return true;
         }
 
-        return $phpDocInfo->hasByType(SymfonyRouteTagValueNode::class);
+        $hasSymfonyRoutePhpDoc = $phpDocInfo->hasByType(SymfonyRouteTagValueNode::class);
+        if ($hasSymfonyRoutePhpDoc) {
+            return true;
+        }
+
+        return $this->hasSymfonyRouteAttrGroup($classMethod);
+    }
+
+    private function hasSymfonyRouteAttrGroup(ClassMethod $classMethod): bool
+    {
+        foreach ($classMethod->attrGroups as $attrGroup) {
+            if ($attrGroup->attrs === []) {
+                continue;
+            }
+
+            foreach ($attrGroup->attrs as $attr) {
+                if ($attr->name instanceof Name && $attr->name->toString() === Route::class) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 }
diff --git a/...r/ClassMethod/PrivatizeLocalOnlyMethodRector/Fixture/skip_symfony_route_attribute.php.inc b/...r/ClassMethod/PrivatizeLocalOnlyMethodRector/Fixture/skip_symfony_route_attribute.php.inc
@@ -4,7 +4,7 @@ namespace Rector\Privatization\Tests\Rector\ClassMethod\PrivatizeLocalOnlyMethod
 
 use Symfony\Component\Routing\Annotation\Route;
 
-final class FrontController
+final class SkipSymfonyRouteAttribute
 {
     #[Route(path: '', name: 'homepage')]
     public function homeAction() : Response