Merge branch '5.2' into 5.3

* 5.2:
  -

Author: nicolas-grekas

Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -25,6 +25,19 @@
 
 abstract class AbstractDescriptorTest extends TestCase
 {
+    private $colSize;
+
+    protected function setUp(): void
+    {
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS=121');
+    }
+
+    protected function tearDown(): void
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+    }
+
     /** @dataProvider getDescribeRouteCollectionTestData */
     public function testDescribeRouteCollection(RouteCollection $routes, $expectedDescription)
     {

Tests/Console/Descriptor/TextDescriptorTest.php

@@ -18,18 +18,6 @@
 class TextDescriptorTest extends AbstractDescriptorTest
 {
     private $fileLinkFormatter = null;
-    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');
-    }
 
     protected function getDescriptor()
     {