minor symfony#31001 [Console] fix resetting the COLUMN environment variable (xabbuh)

fabpot · fabpot · commit d3eae71aa9fb · 2019-04-08T12:06:32.000+02:00
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
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');

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,14 @@ protected function setUp()`
`48`	`48`	`$this->colSize = getenv('COLUMNS');`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ protected function tearDown()`
	`52`	`+ {`
	`53`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
	`54`	`+ putenv('SHELL_VERBOSITY');`
	`55`	`+ unset($_ENV['SHELL_VERBOSITY']);`
	`56`	`+ unset($_SERVER['SHELL_VERBOSITY']);`
	`57`	`+ }`
	`58`	`+`
`51`	`59`	`public static function setUpBeforeClass()`
`52`	`60`	`{`
`53`	`61`	`self::$fixturesPath = realpath(__DIR__.'/Fixtures/');`
`@@ -1698,14 +1706,6 @@ public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEn`
`1698`	`1706`	`$this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');`
`1699`	`1707`	`}`
`1700`	`1708`	`}`
`1701`		`-`
`1702`		`- protected function tearDown()`
`1703`		`- {`
`1704`		`- putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);`
`1705`		`- putenv('SHELL_VERBOSITY');`
`1706`		`- unset($_ENV['SHELL_VERBOSITY']);`
`1707`		`- unset($_SERVER['SHELL_VERBOSITY']);`
`1708`		`- }`
`1709`	`1709`	`}`
`1710`	`1710`
`1711`	`1711`	`class CustomApplication extends Application`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function setUp()`
`31`	`31`
`32`	`32`	`protected function tearDown()`
`33`	`33`	`{`
`34`		`- putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);`
	`34`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testMultipleStart()`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function setUp()`
`38`	`38`
`39`	`39`	`protected function tearDown()`
`40`	`40`	`{`
`41`		`- putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);`
	`41`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
`42`	`42`	`$this->command = null;`
`43`	`43`	`$this->tester = null;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,12 @@ protected function setUp()`
`25`	`25`	`$this->lineSize = getenv('LINES');`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ protected function tearDown()`
	`29`	`+ {`
	`30`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
	`31`	`+ putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`public function test()`
`29`	`35`	`{`
`30`	`36`	`putenv('COLUMNS=100');`
`@@ -40,12 +46,6 @@ public function test()`
`40`	`46`	`$this->assertSame(60, $terminal->getHeight());`
`41`	`47`	`}`
`42`	`48`
`43`		`- protected function tearDown()`
`44`		`- {`
`45`		`- putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);`
`46`		`- putenv($this->lineSize ? 'LINES' : 'LINES='.$this->lineSize);`
`47`		`- }`
`48`		`-`
`49`	`49`	`public function test_zero_values()`
`50`	`50`	`{`
`51`	`51`	`putenv('COLUMNS=0');`