add test case for #2158

packages/BetterPhpDocParser/src/PhpDocNode/Symfony/SymfonyRouteTagValueNode.php

@@ -4,6 +4,7 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Symfony;
 
+use Nette\Utils\Strings;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -34,6 +35,11 @@ final class SymfonyRouteTagValueNode extends AbstractTagValueNode
      */
     private $methods = [];
 
+    /**
+     * @var bool
+     */
+    private $isPathExplicit = true;
+
     /**
      * @param string[] $methods
      */
@@ -48,19 +54,22 @@ public function __construct(
         $this->methods = $methods;
 
         if ($originalContent !== null) {
+            $this->isPathExplicit = (bool) Strings::contains($originalContent, 'path=');
+
             $this->resolveOriginalContentSpacingAndOrder($originalContent);
 
             // default value without key
             if ($this->path && ! in_array('path', (array) $this->orderedVisibleItems, true)) {
-                $this->orderedVisibleItems[] = 'path';
+                // add path as first item
+                $this->orderedVisibleItems = array_merge(['path'], (array) $this->orderedVisibleItems);
             }
         }
     }
 
     public function __toString(): string
     {
         $contentItems = [
-            'path' => sprintf('path="%s"', $this->path),
+            'path' => $this->createPath(),
         ];
 
         if ($this->name) {
@@ -82,4 +91,13 @@ public function changeMethods(array $methods): void
         $this->orderedVisibleItems[] = 'methods';
         $this->methods = $methods;
     }
+
+    private function createPath(): string
+    {
+        if ($this->isPathExplicit) {
+            return sprintf('path="%s"', $this->path);
+        }
+
+        return sprintf('"%s"', $this->path);
+    }
 }

packages/BetterPhpDocParser/src/PhpDocParser/BetterPhpDocParser.php

@@ -177,6 +177,9 @@ private function parseChildAndStoreItsPositions(TokenIterator $tokenIterator): N
         $tokenStart = $this->getTokenIteratorIndex($tokenIterator);
         $phpDocNode = $this->privatesCaller->callPrivateMethod($this, 'parseChild', $tokenIterator);
         $tokenEnd = $this->getTokenIteratorIndex($tokenIterator);
+
+        $tokenEnd = $this->adjustTokenEndToFitClassAnnotation($tokenIterator, $tokenEnd);
+
         $startEndValueObject = new StartEndValueObject($tokenStart, $tokenEnd);
 
         $attributeAwareNode = $this->attributeAwareNodeFactory->createFromNode($phpDocNode);
@@ -303,4 +306,30 @@ private function isTagMatchingPhpDocNodeFactory(
 
         return false;
     }
+
+    /**
+     * @see https://github.com/rectorphp/rector/issues/2158
+     *
+     * Need to find end of this bracket first, because the parseChild() skips class annotatinos
+     */
+    private function adjustTokenEndToFitClassAnnotation(TokenIterator $tokenIterator, int $tokenEnd): int
+    {
+        $tokens = $this->privatesAccessor->getPrivateProperty($tokenIterator, 'tokens');
+        if ($tokens[$tokenEnd][0] !== '(') {
+            return $tokenEnd;
+        }
+
+        while ($tokens[$tokenEnd][0] !== ')') {
+            ++$tokenEnd;
+
+            // to prevent missing index error
+            if (! isset($tokens[$tokenEnd])) {
+                return --$tokenEnd;
+            }
+        }
+
+        ++$tokenEnd;
+
+        return $tokenEnd;
+    }
 }

packages/BetterPhpDocParser/src/Printer/PhpDocInfoPrinter.php

@@ -108,6 +108,7 @@ private function printPhpDocNode(
 
         // node output
         $nodeCount = count($attributeAwarePhpDocNode->children);
+
         foreach ($attributeAwarePhpDocNode->children as $i => $phpDocChildNode) {
             $output .= $this->printNode($phpDocChildNode, null, $i + 1, $nodeCount, $shouldSkipEmptyLinesAbove);
         }

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService13Controller extends SymfonyController
+class ClassWithNamedService13Controller
 {
     /**
      * @Template
@@ -38,10 +37,9 @@ class ClassWithNamedService13Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService13Controller extends SymfonyController
+class ClassWithNamedService13Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture2.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService23Controller extends SymfonyController
+class ClassWithNamedService23Controller
 {
     /**
      * @Template()
@@ -32,10 +31,9 @@ class ClassWithNamedService23Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService23Controller extends SymfonyController
+class ClassWithNamedService23Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture3.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService33Controller extends SymfonyController
+class ClassWithNamedService33Controller
 {
     /**
      * @Template()
@@ -38,10 +37,9 @@ class ClassWithNamedService33Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService33Controller extends SymfonyController
+class ClassWithNamedService33Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/fixture4.php.inc

@@ -1,9 +1,8 @@
 <?php declare (strict_types=1);
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService43 extends SymfonyController
+class ClassWithNamedService43
 {
     /**
      * @Template("AdminBundle:Payment:create.html.twig")
@@ -20,10 +19,9 @@ class ClassWithNamedService43 extends SymfonyController
 -----
 <?php declare (strict_types=1);
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService43 extends SymfonyController
+class ClassWithNamedService43
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version3/skip_just_template.php.inc

@@ -2,9 +2,7 @@
 
 namespace Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Fixture;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
-
-class SkipJustTemplateController extends SymfonyController
+class SkipJustTemplateController
 {
     /**
      * @Template

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService15Controller extends SymfonyController
+class ClassWithNamedService15Controller
 {
     /**
      * @Template
@@ -38,10 +37,9 @@ class ClassWithNamedService15Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService15Controller extends SymfonyController
+class ClassWithNamedService15Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture2.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService25Controller extends SymfonyController
+class ClassWithNamedService25Controller
 {
     /**
      * @Template()
@@ -32,10 +31,9 @@ class ClassWithNamedService25Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService25Controller extends SymfonyController
+class ClassWithNamedService25Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture3.php.inc

@@ -2,10 +2,9 @@
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService35Controller extends SymfonyController
+class ClassWithNamedService35Controller
 {
     /**
      * @Template()
@@ -38,10 +37,9 @@ class ClassWithNamedService35Controller extends SymfonyController
 
 namespace AppBundle\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService35Controller extends SymfonyController
+class ClassWithNamedService35Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture4.php.inc

@@ -2,10 +2,9 @@
 
 namespace App\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService45Controller extends SymfonyController
+class ClassWithNamedService45Controller
 {
     /**
      * @Template("AdminBundle:Payment:create.html.twig")
@@ -24,10 +23,9 @@ class ClassWithNamedService45Controller extends SymfonyController
 
 namespace App\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService45Controller extends SymfonyController
+class ClassWithNamedService45Controller
 {
     public function indexAction()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/fixture5.php.inc

@@ -2,10 +2,9 @@
 
 namespace App\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService55Controller extends SymfonyController
+class ClassWithNamedService55Controller
 {
     /**
      * @Template()
@@ -22,10 +21,9 @@ class ClassWithNamedService55Controller extends SymfonyController
 
 namespace App\Controller;
 
-use Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\Source\SymfonyController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-class ClassWithNamedService55Controller extends SymfonyController
+class ClassWithNamedService55Controller
 {
     public function index()
     {

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Fixture/Version5/with_route_too.php.inc

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\Routing\Annotation\Route;
+
+class WithRouteToo
+{
+    /**
+     * @Route("/change", name="facility_change")
+     * @Template("PAPPUserBundle:Facility:facility.html.twig")
+     */
+    public function index()
+    {
+        return [];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace App\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\Routing\Annotation\Route;
+
+class WithRouteToo
+{
+    /**
+     * @Route("/change", name="facility_change")
+     */
+    public function index()
+    {
+        return $this->render('PAPPUserBundle:Facility:facility.html.twig');
+    }
+}
+
+?>

packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/TemplateAnnotationVersion5RectorTest.php

@@ -25,6 +25,7 @@ public function provideDataForTest(): Iterator
         yield [__DIR__ . '/Fixture/Version5/fixture3.php.inc'];
         yield [__DIR__ . '/Fixture/Version5/fixture4.php.inc'];
         yield [__DIR__ . '/Fixture/Version5/fixture5.php.inc'];
+        yield [__DIR__ . '/Fixture/Version5/with_route_too.php.inc'];
     }
 
     /**