bug #22377 [Console] Allow terminal dimensions to be set to 0 (unbounded) (duncan3dc)

This PR was merged into the 3.2 branch.

Discussion
----------

[Console] Allow terminal dimensions to be set to 0 (unbounded)

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #21513
| License       | MIT

A previous PR (#20328) changed the behavior of terminals with undefined widths from unbounded to 80 characters. And due to the way the existing code worked it become impossible to set a terminal to be unbounded again. This PR provides a way to restore the previous behavior:
```php
putenv('COLUMNS=0');
```

Commits
-------

4c1b001891 Allow terminal dimensions to be set to 0 (unbounded)
This commit is contained in:
Fabien Potencier 2017-04-11 08:47:22 -07:00
commit ed1e8fbb76
2 changed files with 17 additions and 4 deletions

View File

@ -23,8 +23,9 @@ class Terminal
*/
public function getWidth()
{
if ($width = trim(getenv('COLUMNS'))) {
return (int) $width;
$width = getenv('COLUMNS');
if (false !== $width) {
return (int) trim($width);
}
if (null === self::$width) {
@ -41,8 +42,9 @@ class Terminal
*/
public function getHeight()
{
if ($height = trim(getenv('LINES'))) {
return (int) $height;
$height = getenv('LINES');
if (false !== $height) {
return (int) trim($height);
}
if (null === self::$height) {

View File

@ -30,4 +30,15 @@ class TerminalTest extends TestCase
$this->assertSame(120, $terminal->getWidth());
$this->assertSame(60, $terminal->getHeight());
}
public function test_zero_values()
{
putenv('COLUMNS=0');
putenv('LINES=0');
$terminal = new Terminal();
$this->assertSame(0, $terminal->getWidth());
$this->assertSame(0, $terminal->getHeight());
}
}