minor #31001 [Console] fix resetting the COLUMN environment variable …

…(xabbuh) This PR was merged into the 3.4 branch. Discussion ---------- [Console] fix resetting the COLUMN environment variable | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 8fb2074 fix resetting the COLUMN environment variable
symfony · Apr 8, 2019 · d3eae71 · d3eae71
2 parents d7a8b3d + 8fb2074
commit d3eae71
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -48,6 +48,14 @@ protected function setUp()
         $this->colSize = getenv('COLUMNS');
     }
 
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv('SHELL_VERBOSITY');
+        unset($_ENV['SHELL_VERBOSITY']);
+        unset($_SERVER['SHELL_VERBOSITY']);
+    }
+
     public static function setUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/Fixtures/');
@@ -1698,14 +1706,6 @@ public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEn
             $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
         }
     }
-
-    protected function tearDown()
-    {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
-        putenv('SHELL_VERBOSITY');
-        unset($_ENV['SHELL_VERBOSITY']);
-        unset($_SERVER['SHELL_VERBOSITY']);
-    }
 }
 
 class CustomApplication extends Application

diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -31,7 +31,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     public function testMultipleStart()

diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -38,7 +38,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
         $this->command = null;
         $this->tester = null;
     }

diff --git a/src/Symfony/Component/Console/Tests/TerminalTest.php b/src/Symfony/Component/Console/Tests/TerminalTest.php
@@ -25,6 +25,12 @@ protected function setUp()
         $this->lineSize = getenv('LINES');
     }
 
+    protected function tearDown()
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+        putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);
+    }
+
     public function test()
     {
         putenv('COLUMNS=100');
@@ -40,12 +46,6 @@ public function test()
         $this->assertSame(60, $terminal->getHeight());
     }
 
-    protected function tearDown()
-    {
-        putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
-        putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);
-    }
-
     public function test_zero_values()
     {
         putenv('COLUMNS=0');