diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
-------

8fb2074972 fix resetting the COLUMN environment variable
This commit is contained in:
Fabien Potencier 2019-04-08 12:06:32 +02:00
parent d7a8b3d5e1 8fb2074972
commit d3eae71aa9
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/Console/Tests/ApplicationTest.php
View File

@ -48,6 +48,14 @@ class ApplicationTest extends TestCase
$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 @@ class ApplicationTest extends TestCase
$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

2
src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
View File

@ -31,7 +31,7 @@ class ProgressBarTest extends TestCase
protected function tearDown()
{
putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
}
public function testMultipleStart()

2
src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
View File

@ -38,7 +38,7 @@ class SymfonyStyleTest extends TestCase
protected function tearDown()
{
putenv($this->colSize ? 'COLUMNS' : 'COLUMNS='.$this->colSize);
putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
$this->command = null;
$this->tester = null;
}

12
src/Symfony/Component/Console/Tests/TerminalTest.php
View File

@ -25,6 +25,12 @@ class TerminalTest extends TestCase
$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 @@ class TerminalTest extends TestCase
$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');