From 8fb2074972b720c5b5f64845870bfb475fe9fef3 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 8 Apr 2019 11:27:09 +0200
Subject: [PATCH] fix resetting the COLUMN environment variable

---
 .../Component/Console/Tests/ApplicationTest.php  | 16 ++++++++--------
 .../Console/Tests/Helper/ProgressBarTest.php     |  2 +-
 .../Console/Tests/Style/SymfonyStyleTest.php     |  2 +-
 .../Component/Console/Tests/TerminalTest.php     | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 85484b5c5a7b..200568f0701d 100644
--- 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
index 214e943d7319..a0be9b8a6d94 100644
--- 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
index a6feb122a12a..88d00c8a9926 100644
--- 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
index ca3b874374b6..93b8c44a7815 100644
--- 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');