Merge branch '2.0' into 2.1

* 2.0: Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
2013-01-05 21:32:41 +01:00 · 2013-01-05 21:32:41 +01:00 · 5699a342ed
parent 24534ce00c 151f2c17bf
commit 5699a342ed
1 changed files with 2 additions and 2 deletions
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@ -846,7 +846,7 @@ class Application
     *
     * @return int|null
     */
-    public function getTerminalWidth()
+    protected function getTerminalWidth()
    {
        $dimensions = $this->getTerminalDimensions();

@ -858,7 +858,7 @@ class Application
     *
     * @return int|null
     */
-    public function getTerminalHeight()
+    protected function getTerminalHeight()
    {
        $dimensions = $this->getTerminalDimensions();