Fix single-line doc end

packages/better-php-doc-parser/src/AnnotationReader/NodeAnnotationReader.php

@@ -58,12 +58,14 @@ public function readMethodAnnotation(ClassMethod $classMethod, string $annotatio
 
             /** @var object[] $methodAnnotations */
             $methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
+
             foreach ($methodAnnotations as $methodAnnotation) {
                 if (! is_a($methodAnnotation, $annotationClassName, true)) {
                     continue;
                 }
 
                 $objectHash = md5(spl_object_hash($classMethod) . serialize($methodAnnotation));
+
                 if (in_array($objectHash, $this->alreadyProvidedAnnotations, true)) {
                     continue;
                 }

packages/better-php-doc-parser/src/PhpDocNodeFactory/Symfony/SymfonyRoutePhpDocNodeFactory.php

@@ -38,7 +38,7 @@ public function createFromNodeAndTokens(Node $node, TokenIterator $tokenIterator
 
         return new SymfonyRouteTagValueNode(
             $route->getPath(),
-            method_exists($route, 'getLocalizedPaths') ? $route->getLocalizedPaths() : [],
+            $this->getLocalizedPaths($route),
             $route->getName(),
             $route->getMethods(),
             $route->getOptions(),
@@ -49,4 +49,13 @@ public function createFromNodeAndTokens(Node $node, TokenIterator $tokenIterator
             $annotationContent
         );
     }
+
+    private function getLocalizedPaths(Route $route): array
+    {
+        if (method_exists($route, 'getLocalizedPaths')) {
+            return $route->getLocalizedPaths();
+        }
+
+        return [];
+    }
 }

packages/better-php-doc-parser/src/Printer/PhpDocInfoPrinter.php

@@ -145,6 +145,11 @@ private function printPhpDocNode(AttributeAwarePhpDocNode $attributeAwarePhpDocN
             $output = '/**' . $output;
         }
 
+        // fix missing end
+        if (Strings::match($output, '#^(/\*\*)#') && $output && ! Strings::match($output, '#\s\*\/(\s+)?$#')) {
+            $output .= ' */';
+        }
+
         return $output;
     }
 

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/DoctrineTest.php

@@ -11,6 +11,7 @@
 use Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter\Source\Doctrine\CaseSensitive;
 use Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter\Source\Doctrine\IndexInTable;
 use Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter\Source\Doctrine\Short;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class DoctrineTest extends AbstractPhpDocInfoPrinterTest
 {
@@ -22,11 +23,10 @@ public function testClass(string $docFilePath, Node $node): void
         $docComment = FileSystem::read($docFilePath);
         $phpDocInfo = $this->createPhpDocInfoFromDocCommentAndNode($docComment, $node);
 
-        $this->assertSame(
-            $docComment,
-            $this->phpDocInfoPrinter->printFormatPreserving($phpDocInfo),
-            'Caused in ' . $docFilePath
-        );
+        $fileInfo = new SmartFileInfo($docFilePath);
+        $message = $fileInfo->getRelativeFilePathFromCwd();
+
+        $this->assertSame($docComment, $this->phpDocInfoPrinter->printFormatPreserving($phpDocInfo), $message);
     }
 
     public function provideDataClass(): Iterator

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/MultilineTest.php

@@ -20,6 +20,7 @@
 use Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter\Source\SinglePropertyClass;
 use Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfoPrinter\Source\TableClass;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class MultilineTest extends AbstractPhpDocInfoPrinterTest
 {
@@ -33,7 +34,10 @@ public function test(string $docFilePath, Node $node): void
         $docComment = FileSystem::read($docFilePath);
         $phpDocInfo = $this->createPhpDocInfoFromDocCommentAndNode($docComment, $node);
 
-        $this->assertSame($docComment, $this->phpDocInfoPrinter->printFormatPreserving($phpDocInfo));
+        $fileInfo = new SmartFileInfo($docFilePath);
+        $message = $fileInfo->getRelativeFilePathFromCwd();
+
+        $this->assertSame($docComment, $this->phpDocInfoPrinter->printFormatPreserving($phpDocInfo), $message);
     }
 
     public function provideData(): Iterator

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Doctrine/case_sensitive.txt

@@ -6,3 +6,4 @@
  *     @Orm\Index(name="dateTo_idx", columns={"dateTo"}),
  *   }
  * )
+ */

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Doctrine/short.txt

@@ -4,3 +4,4 @@
  *      @UniqueConstraint(name="content_status_unique", columns={"content_id", "site_id", "lang"})
  *     }
  * )
+ */

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Multiline/assert_serialize.txt

@@ -6,4 +6,3 @@
  * @Serializer\Type("boolean")
  * @var bool
  */
-public $anotherProperty;

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Multiline/assert_serialize_single_line.txt

@@ -3,4 +3,3 @@
  *     "bool"
  * )
  */
-public $anotherSerializeSingleLine;

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Multiline/many_to.txt

@@ -10,4 +10,3 @@
  *     protocols = {"https"}
  * )
  */
-private $manyTo;

packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/Source/Multiline/multiline6.txt

@@ -5,4 +5,3 @@
  *      @ORM\JoinColumn(referencedColumnName="id")
  *  })
  */
-protected $someProperty;

packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/InlinedColumn.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineColumn;
+
+use Doctrine\ORM\Mapping as ORM;
+
+final class InlinedColumn
+{
+    /** @ORM\Column(name="url", type="string") */
+    private $loginCount;
+}

packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/MultiRoute.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+final class MultiRoute
+{
+    /**
+     * @Route("/new", name="route_1", methods={"GET", "POST"})
+     * @Route("/{id}", name="route_2", methods={"GET", "POST"})
+     */
+    public function run()
+    {
+    }
+}