[PHP 8.0] Attributes - add support for single target (#216)

rectorphp · Jun 13, 2021 · 5e57bb6 · 5e57bb6
1 parent 3157491
commit 5e57bb6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/...Rector/Class_/DoctrineAnnotationClassToAttributeRector/Fixture/target_method_only.php.inc b/...Rector/Class_/DoctrineAnnotationClassToAttributeRector/Fixture/target_method_only.php.inc
@@ -0,0 +1,28 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
+final class TargetMethodOnly
+{
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+#[\Attribute(\Attribute::TARGET_METHOD)]
+final class TargetMethodOnly
+{
+}
+
+?>
diff --git a/rules/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector.php b/rules/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector.php
@@ -139,6 +139,7 @@ public function refactor(Node $node): ?Node
             $requiredDoctrineAnnotationTagValueNode = $propertyPhpDocInfo->getByAnnotationClass(
                 'Doctrine\Common\Annotations\Annotation\Required'
             );
+
             if (! $requiredDoctrineAnnotationTagValueNode instanceof DoctrineAnnotationTagValueNode) {
                 continue;
             }
@@ -207,12 +208,14 @@ private function decorateTarget(PhpDocInfo $phpDocInfo, AttributeGroup $attribut
         }
 
         $targets = $targetDoctrineAnnotationTagValueNode->getSilentValue();
-        if (! $targets instanceof CurlyListNode) {
+        if ($targets instanceof CurlyListNode) {
+            $targetValues = $targets->getValuesWithExplicitSilentAndWithoutQuotes();
+        } elseif (is_string($targets)) {
+            $targetValues = [$targets];
+        } else {
             return;
         }
 
-        $targetValues = $targets->getValuesWithExplicitSilentAndWithoutQuotes();
-
         $flags = $this->resolveFlags($targetValues);
         $flagCollection = $this->attributeFlagFactory->createFlagCollection($flags);
         if ($flagCollection === null) {