[Php80] Handle mix still annotation and already attribute on AnnotationToAttributeRector (#7639)

* test: Prove bug in AnnotationToAttributeRector with mixed content

If a file already contains a mix of annotations and attributes, the
current AnnotationToAttributeRector implementation drops the annotation
value when generating the new Attribute tag.

This could happen, for example, with a Behat context in a legacy project
that has a mix of old and new step definitions.

* fix: AttributeValueResolver should not drop values of annotations

If the file being parsed has already imported a class matching the name
of the annotation tag, then the annotation tag will have been parsed
as a DoctrineAnnotationTagValueNode.

For some tags - e.g. Behat steps - the `$phpDocTagNode->value` will
cast to an empty string (because the annotation text does not actually
contain valid Doctrine annotation values). In this case, the actual
annotation value needs to be retrieved from
`$phpDocTagNode->value->getOriginalContent()`.

This was causing AnnotationToAttributeRector to drop the attribute
values when converting from annotations to attributes in a file that
already contained some attributes.

This was previously implemented, but was reverted more recently as part
of dropping support for comments on these nodes.

Author: acoulton

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Behat;
+
+use Behat\Step\When;
+
+final class WithMixedAttributeAndAnnotations
+{
+    /**
+     * @When /^I have a step using annotations$/
+     */
+    public function hadAnnotations(): void
+    {
+    }
+
+    #[When('/^I have a step using attributes$/')]
+    public function hadAttributes(): void
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Behat;
+
+use Behat\Step\When;
+
+final class WithMixedAttributeAndAnnotations
+{
+    #[\Behat\Step\When('/^I have a step using annotations$/')]
+    public function hadAnnotations(): void
+    {
+    }
+
+    #[When('/^I have a step using attributes$/')]
+    public function hadAttributes(): void
+    {
+    }
+}
+
+?>

rules/Php80/Rector/Class_/AttributeValueResolver.php

@@ -32,7 +32,9 @@ public function resolve(
         if ($phpDocTagNode->value instanceof DoctrineAnnotationTagValueNode) {
             $originalContent = (string) $phpDocTagNode->value->getOriginalContent();
 
-            if ($docValue !== '') {
+            if ($docValue === '') {
+                $docValue = $originalContent;
+            } else {
                 $attributeComment = ltrim($originalContent, $docValue);
                 if ($attributeComment !== '') {
                     $docValue .= "\n" . $attributeComment;