Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 5a2cd97d8f17 · 2021-06-27T14:43:45.000+02:00
* 5.2:
  -
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1_link.txt b/src/Symfony/Bundle/FrameworkBundle/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/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2_link.txt b/src/Symfony/Bundle/FrameworkBundle/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                                                                                    |
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Command/UserPasswordHashCommandTest.php b/src/Symfony/Component/PasswordHasher/Tests/Command/UserPasswordHashCommandTest.php
@@ -27,17 +27,6 @@ class UserPasswordHashCommandTest extends TestCase
     private $passwordHasherCommandTester;
     private $colSize;
 
-    protected function setUp(): void
-    {
-        $this->colSize = getenv('COLUMNS');
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
-    }
-
-    protected function tearDown(): void
-    {
-        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
-    }
-
     public function testEncodePasswordEmptySalt()
     {
         $this->passwordHasherCommandTester->execute([
@@ -299,6 +288,9 @@ public function testThrowsExceptionOnNoConfiguredHashers()
 
     protected function setUp(): void
     {
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
+
         $hasherFactory = new PasswordHasherFactory([
             InMemoryUser::class => ['algorithm' => 'plaintext'],
             'Custom\Class\Native\User' => ['algorithm' => 'native', 'cost' => 10],
@@ -315,6 +307,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->passwordHasherCommandTester = null;
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     private function setupArgon2i()

-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