Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit e578c17bc457 · 2021-06-27T14:43:45.000+02:00
* 5.2:
  -
diff --git a/Tests/Fixtures/Descriptor/route_1_link.txt b/Tests/Fixtures/Descriptor/route_1_link.txt
@@ -10,7 +10,7 @@
 | Method       | GET|HEAD                                                                                      |
 | Requirements | name: [a-z]+                                                                                  |
 | Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub                             |
-[39;49m| Defaults     | _controller: [39;49m]8;;myeditor://open?file=[:file:]&line=68\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\[39;49m |[39;49m
+[39;49m| Defaults     | _controller: [39;49m]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\[39;49m |[39;49m
 [39;49m|              | [39;49mname: Joseph                                                                                  |
 [39;49m| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler[39;49m[39;49m                                       |[39;49m
 [39;49m|              | [39;49m[39;49mopt1: val1[39;49m[39;49m                                                                                    |[39;49m
diff --git a/Tests/Fixtures/Descriptor/route_2_link.txt b/Tests/Fixtures/Descriptor/route_2_link.txt
@@ -10,7 +10,7 @@
 | Method       | PUT|POST                                                                                      |
 | Requirements | NO CUSTOM                                                                                     |
 | Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub                             |
-| Defaults     | _controller: ]8;;myeditor://open?file=[:file:]&line=68\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\ |
+| Defaults     | _controller: ]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\ |
 [39;49m| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler[39;49m[39;49m                                       |[39;49m
 [39;49m|              | [39;49m[39;49mopt1: val1[39;49m[39;49m                                                                                    |[39;49m
 [39;49m|              | [39;49mopt2: val2                                                                                    |

-Original file line number
+Diff line change
 | Method       | GET|HEAD                                                                                      |
 | Requirements | name: [a-z]+                                                                                  |
 | Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub                             |
 -[39;49m| Defaults     | _controller: [39;49m]8;;myeditor://open?file=[:file:]&line=68\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\[39;49m |[39;49m
 +[39;49m| Defaults     | _controller: [39;49m]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\[39;49m |[39;49m
 [39;49m|              | [39;49mname: Joseph                                                                                  |
 [39;49m| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler[39;49m[39;49m                                       |[39;49m
 [39;49m|              | [39;49m[39;49mopt1: val1[39;49m[39;49m                                                                                    |[39;49m