remove attribute comments support as comments require standalone line before any doctrine annotation

Author: TomasVotruba

build/target-repository/docs/rector_rules_overview.md

@@ -4788,9 +4788,9 @@ Change annotation to attribute
  class SymfonyRoute
  {
 -    /**
--     * @Route("/path", name="action") api route
+-     * @Route("/path", name="action")
 -     */
-+    #[Route(path: '/path', name: 'action')] // api route
++    #[Route(path: '/path', name: 'action')]
      public function action()
      {
      }

rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/Fixture/with_comment.php.inc

@@ -80,7 +80,7 @@ public function getRuleDefinition(): RuleDefinition
 class SymfonyRoute
 {
     /**
-     * @Route("/path", name="action") api route
+     * @Route("/path", name="action")
      */
     public function action()
     {
@@ -93,7 +93,7 @@ public function action()
 
 class SymfonyRoute
 {
-    #[Route(path: '/path', name: 'action')] // api route
+    #[Route(path: '/path', name: 'action')]
     public function action()
     {
     }

rules/Php80/Rector/Class_/AnnotationToAttributeRector.php

@@ -7,7 +7,6 @@
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\AbstractValuesAwareNode;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Stringable;
 
 final class DoctrineAnnotationTagValueNode extends AbstractValuesAwareNode implements Stringable
@@ -19,16 +18,11 @@ public function __construct(
         public IdentifierTypeNode $identifierTypeNode,
         ?string $originalContent = null,
         array $values = [],
-        ?string $silentKey = null,
-        ?string $comment = null
+        ?string $silentKey = null
     ) {
         $this->hasChanged = true;
 
         parent::__construct($values, $originalContent, $silentKey);
-
-        if (! in_array($comment, ['', null], true)) {
-            $this->setAttribute(AttributeKey::ATTRIBUTE_COMMENT, $comment);
-        }
     }
 
     public function __toString(): string

src/BetterPhpDocParser/PhpDoc/DoctrineAnnotationTagValueNode.php

@@ -496,11 +496,6 @@ private function createDoctrineSpacelessPhpDocTagNode(
             $currentPhpNode
         );
 
-        $comment = $this->staticDoctrineAnnotationParser->getCommentFromRestOfAnnotation(
-            $nestedTokenIterator,
-            $annotationContent
-        );
-
         $identifierTypeNode = new IdentifierTypeNode($tagName);
         $identifierTypeNode->setAttribute(PhpDocAttributeKey::RESOLVED_CLASS, $fullyQualifiedAnnotationClass);
 
@@ -509,7 +504,6 @@ private function createDoctrineSpacelessPhpDocTagNode(
             $annotationContent,
             $values,
             SilentKeyMap::CLASS_NAMES_TO_SILENT_KEYS[$fullyQualifiedAnnotationClass] ?? null,
-            $comment
         );
 
         $doctrineAnnotationTagValueNode->setAttribute(PhpDocAttributeKey::START_AND_END, $startAndEnd);

src/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php

@@ -14,20 +14,13 @@
 use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\PlainValueParser;
 use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
 use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
-use Rector\Util\NewLineSplitter;
 
 /**
  * Better version of doctrine/annotation - with phpdoc-parser and  static reflection
  * @see \Rector\Tests\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\StaticDoctrineAnnotationParserTest
  */
 final readonly class StaticDoctrineAnnotationParser
 {
-    /**
-     * @var string
-     * @see https://regex101.com/r/Pthg5d/1
-     */
-    private const END_OF_VALUE_CHARACTERS_REGEX = '/^[)} \r\n"\']+$/i';
-
     public function __construct(
         private PlainValueParser $plainValueParser,
         private ArrayParser $arrayParser
@@ -87,24 +80,6 @@ public function resolveAnnotationValue(
         ];
     }
 
-    public function getCommentFromRestOfAnnotation(
-        BetterTokenIterator $tokenIterator,
-        string $annotationContent
-    ): string {
-        // we skip all the remaining tokens from the end of the declaration of values
-        while (
-            preg_match(self::END_OF_VALUE_CHARACTERS_REGEX, $tokenIterator->currentTokenValue())
-        ) {
-            $tokenIterator->next();
-        }
-
-        // the remaining of the annotation content is the comment
-        $comment = substr($annotationContent, $tokenIterator->currentTokenOffset());
-        // we only keep the first line as this will be added as a line comment at the end of the attribute
-        $commentLines = NewLineSplitter::split($comment);
-        return $commentLines[0];
-    }
-
     /**
      * @see https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L1051-L1079
      *

src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php

@@ -97,13 +97,7 @@ public function create(
         $attributeName->setAttribute(AttributeKey::PHP_ATTRIBUTE_NAME, $annotationToAttribute->getAttributeClass());
 
         $attribute = new Attribute($attributeName, $args);
-        $attributeGroup = new AttributeGroup([$attribute]);
-        $comment = $doctrineAnnotationTagValueNode->getAttribute(AttributeKey::ATTRIBUTE_COMMENT);
-        if ($comment) {
-            $attributeGroup->setAttribute(AttributeKey::ATTRIBUTE_COMMENT, $comment);
-        }
-
-        return $attributeGroup;
+        return new AttributeGroup([$attribute]);
     }
 
     /**