merged branch egeloen/f-2.0-terminal-width (PR #6571)

fabpot · fabpot · commit 515769385a00 · 2013-01-05T14:38:35.000+01:00
This PR was merged into the 2.0 branch. Commits ------- f299bd0 [Console] Make getTerminalWith & getTerminalHeight public Discussion ---------- [Console] Make getTerminalWith & getTerminalHeight public Bug fix: yes Feature addition: yes Backwards compatibility break: no Fixes the following tickets: ~ Todo: - License of the code: MIT Documentation PR: ~ After demand in #6567, I open an other one on the 2.0 branch.
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -794,7 +794,7 @@ public function renderException($e, $output)
      *
      * @return int|null
      */
-    protected function getTerminalWidth()
+    public function getTerminalWidth()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
             return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
@@ -810,7 +810,7 @@ protected function getTerminalWidth()
      *
      * @return int|null
      */
-    protected function getTerminalHeight()
+    public function getTerminalHeight()
     {
         if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
             return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ public function renderException($e, $output)`
`794`	`794`	`*`
`795`	`795`	`* @return int\|null`
`796`	`796`	`*/`
`797`		`- protected function getTerminalWidth()`
	`797`	`+ public function getTerminalWidth()`
`798`	`798`	`{`
`799`	`799`	`if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {`
`800`	`800`	`return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);`
`@@ -810,7 +810,7 @@ protected function getTerminalWidth()`
`810`	`810`	`*`
`811`	`811`	`* @return int\|null`
`812`	`812`	`*/`
`813`		`- protected function getTerminalHeight()`
	`813`	`+ public function getTerminalHeight()`
`814`	`814`	`{`
`815`	`815`	`if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {`
`816`	`816`	`return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));`