[Php80] Handle trailing comma on AnnotationToAttributeRector on Doctr…

…ine JoinColumn (#2766)
rectorphp · Aug 15, 2022 · 1f6cea3 · 1f6cea3
1 parent 2977d09
commit 1f6cea3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php
@@ -102,6 +102,10 @@ private function resolveAnnotationValues(BetterTokenIterator $tokenIterator): ar
             if (is_array($nestedValues)) {
                 $values = array_merge($values, $nestedValues);
             } else {
+                if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_END)) {
+                    break;
+                }
+
                 $values[] = $nestedValues;
             }
         }

diff --git a/...s/Php80/Rector/Class_/AnnotationToAttributeRector/Fixture/Doctrine/trailing_comma.php.inc b/...s/Php80/Rector/Class_/AnnotationToAttributeRector/Fixture/Doctrine/trailing_comma.php.inc
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Doctrine;
+
+use Doctrine\ORM\Mapping as ORM;
+
+final class TrailingComma
+{
+    /**
+     * @ORM\JoinColumn(name="parent_id", referencedColumnName="id", nullable=true, )
+     **/
+    protected $someColumn;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Doctrine;
+
+use Doctrine\ORM\Mapping as ORM;
+
+final class TrailingComma
+{
+    #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'id', nullable: true)]
+    protected $someColumn;
+}
+
+?>