Merge branch '2.0' into 2.1

fabpot · fabpot · commit 5699a342edbd · 2013-01-05T21:32:41.000+01:00
* 2.0: Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -846,7 +846,7 @@ public function renderException($e, $output)
      *
      * @return int|null
      */
-    public function getTerminalWidth()
+    protected function getTerminalWidth()
     {
         $dimensions = $this->getTerminalDimensions();
 
@@ -858,7 +858,7 @@ public function getTerminalWidth()
      *
      * @return int|null
      */
-    public function getTerminalHeight()
+    protected function getTerminalHeight()
     {
         $dimensions = $this->getTerminalDimensions();
 

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ public function renderException($e, $output)`
`846`	`846`	`*`
`847`	`847`	`* @return int\|null`
`848`	`848`	`*/`
`849`		`- public function getTerminalWidth()`
	`849`	`+ protected function getTerminalWidth()`
`850`	`850`	`{`
`851`	`851`	`$dimensions = $this->getTerminalDimensions();`
`852`	`852`
`@@ -858,7 +858,7 @@ public function getTerminalWidth()`
`858`	`858`	`*`
`859`	`859`	`* @return int\|null`
`860`	`860`	`*/`
`861`		`- public function getTerminalHeight()`
	`861`	`+ protected function getTerminalHeight()`
`862`	`862`	`{`
`863`	`863`	`$dimensions = $this->getTerminalDimensions();`
`864`	`864`