bug #20328 [Console] Fix empty COLUMNS/LINES env vars (nicolas-grekas)

fabpot · fabpot · commit b0e94f19aa33 · 2016-10-27T08:08:16.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [Console] Fix empty COLUMNS/LINES env vars | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Here is a python app that fails otherwise: test.py: ```python import os int(os.environ.get('COLUMNS', 80)) ``` test.php: ```php <?php putenv('COLUMNS='); passthru('python test.py'); ``` result: ``` $ php test.php Traceback (most recent call last): File "test.py", line 3, in <module> int(os.environ.get('COLUMNS', 80)) ValueError: invalid literal for int() with base 10: '' ``` Commits ------- 8ad991e [Console] Fix empty COLUMNS/LINES env vars
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -31,7 +31,7 @@ public function getWidth()
             self::initDimensions();
         }
 
-        return self::$width;
+        return self::$width ?: 80;
     }
 
     /**
@@ -49,7 +49,7 @@ public function getHeight()
             self::initDimensions();
         }
 
-        return self::$height;
+        return self::$height ?: 50;
     }
 
     private static function initDimensions()

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getWidth()`
`31`	`31`	`self::initDimensions();`
`32`	`32`	`}`
`33`	`33`
`34`		`- return self::$width;`
	`34`	`+ return self::$width ?: 80;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`@@ -49,7 +49,7 @@ public function getHeight()`
`49`	`49`	`self::initDimensions();`
`50`	`50`	`}`
`51`	`51`
`52`		`- return self::$height;`
	`52`	`+ return self::$height ?: 50;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private static function initDimensions()`