fixed CS, simplified code

Author: fabpot

src/Symfony/Component/Console/Application.php

@@ -36,7 +36,7 @@
 use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Terminal\TerminalDimensionsProvider;
+use Symfony\Component\Console\Terminal;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -66,24 +66,19 @@ class Application
     private $definition;
     private $helperSet;
     private $dispatcher;
+    private $terminal;
     private $defaultCommand;
     private $singleCommand;
 
     /**
-     * @var TerminalDimensionsProvider
+     * @param string $name    The name of the application
+     * @param string $version The version of the application
      */
-    private $terminalDimensionsProvider;
-
-    /**
-     * @param string                     $name                       The name of the application
-     * @param string                     $version                    The version of the application
-     * @param TerminalDimensionsProvider $terminalDimensionsProvider
-     */
-    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', TerminalDimensionsProvider $terminalDimensionsProvider = null)
+    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         $this->name = $name;
         $this->version = $version;
-        $this->terminalDimensionsProvider = $terminalDimensionsProvider ?: new TerminalDimensionsProvider();
+        $this->terminal = new Terminal();
         $this->defaultCommand = 'list';
         $this->helperSet = $this->getDefaultHelperSet();
         $this->definition = $this->getDefaultInputDefinition();
@@ -697,7 +692,7 @@ public function renderException(\Exception $e, OutputInterface $output)
      */
     protected function getTerminalWidth()
     {
-        return $this->terminalDimensionsProvider->getTerminalWidth();
+        return $this->terminal->getWidth();
     }
 
     /**
@@ -707,7 +702,7 @@ protected function getTerminalWidth()
      */
     protected function getTerminalHeight()
     {
-        return $this->terminalDimensionsProvider->getTerminalWidth();
+        return $this->terminal->getHeight();
     }
 
     /**
@@ -717,7 +712,7 @@ protected function getTerminalHeight()
      */
     public function getTerminalDimensions()
     {
-        return $this->terminalDimensionsProvider->getTerminalDimensions();
+        return $this->terminal->getDimensions();
     }
 
     /**
@@ -732,7 +727,7 @@ public function getTerminalDimensions()
      */
     public function setTerminalDimensions($width, $height)
     {
-        $this->terminalDimensionsProvider->setTerminalDimensions($width, $height);
+        $this->terminal->setDimensions($width, $height);
 
         return $this;
     }

src/Symfony/Component/Console/Helper/ProgressBar.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Terminal\TerminalDimensionsProvider;
+use Symfony\Component\Console\Terminal;
 
 /**
  * The ProgressBar provides helpers to display progress output.
@@ -45,29 +45,24 @@ class ProgressBar
     private $formatLineCount;
     private $messages = array();
     private $overwrite = true;
+    private $terminal;
 
     private static $formatters;
     private static $formats;
 
     /**
-     * @var TerminalDimensionsProvider
+     * @param OutputInterface $output An OutputInterface instance
+     * @param int             $max    Maximum steps (0 if unknown)
      */
-    private $terminalDimensionsProvider;
-
-    /**
-     * @param OutputInterface            $output                     An OutputInterface instance
-     * @param int                        $max                        Maximum steps (0 if unknown)
-     * @param TerminalDimensionsProvider $terminalDimensionsProvider
-     */
-    public function __construct(OutputInterface $output, $max = 0, TerminalDimensionsProvider $terminalDimensionsProvider = null)
+    public function __construct(OutputInterface $output, $max = 0)
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
         }
 
         $this->output = $output;
         $this->setMaxSteps($max);
-        $this->terminalDimensionsProvider = $terminalDimensionsProvider ?: new TerminalDimensionsProvider();
+        $this->terminal = new Terminal();
 
         if (!$this->output->isDecorated()) {
             // disable overwrite when output does not support ANSI codes.
@@ -443,6 +438,20 @@ public function clear()
         $this->overwrite('');
     }
 
+    /**
+     * Gets the terminal.
+     *
+     * Can be useful to force terminal dimensions for functional tests.
+     *
+     * @return Terminal
+     *
+     * @internal
+     */
+    public function getTerminal()
+    {
+        return $this->terminal;
+    }
+
     /**
      * Sets the progress bar format.
      *
@@ -617,7 +626,7 @@ private function buildLine()
     private function adjustLineWidthToTerminalWidth($line)
     {
         $lineLength = Helper::strlenWithoutDecoration($this->output->getFormatter(), $line);
-        $terminalWidth = $this->terminalDimensionsProvider->getTerminalWidth();
+        $terminalWidth = $this->terminal->getWidth();
         if ($lineLength > $terminalWidth) {
             $newBarWidth = $this->barWidth - $lineLength + $terminalWidth;
             $this->setBarWidth($newBarWidth);

src/Symfony/Component/Console/Terminal/TerminalDimensionsProvider.php renamed to src/Symfony/Component/Console/Terminal.php

@@ -9,88 +9,103 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Console\Terminal;
+namespace Symfony\Component\Console;
 
-class TerminalDimensionsProvider
+class Terminal
 {
-    /**
-     * @var int[]
-     */
-    private $terminalDimensions = array();
+    private $width;
+    private $height;
 
     /**
-     * Tries to figure out the terminal dimensions based on the current environment.
+     * Tries to figure out the terminal width in which this application runs.
      *
-     * @return int[] Array containing width and height
+     * @return int|null
      */
-    public function getTerminalDimensions()
+    public function getWidth()
     {
-        if ($this->terminalDimensions) {
-            return $this->terminalDimensions;
-        }
-
-        if ($this->isWindowsEnvironment()) {
-            // extract [w, H] from "wxh (WxH)"
-            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
-                return array((int) $matches[1], (int) $matches[2]);
-            }
-            // extract [w, h] from "wxh"
-            if (preg_match('/^(\d+)x(\d+)$/', $this->getConsoleMode(), $matches)) {
-                return array((int) $matches[1], (int) $matches[2]);
-            }
+        if (null === $this->width) {
+            $this->initDimensions();
         }
 
-        if ($sttyString = $this->getSttyColumns()) {
-            // extract [w, h] from "rows h; columns w;"
-            if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
-                return array((int) $matches[2], (int) $matches[1]);
-            }
-            // extract [w, h] from "; h rows; w columns"
-            if (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
-                return array((int) $matches[2], (int) $matches[1]);
-            }
-        }
-
-        return array(null, null);
+        return $this->width;
     }
 
     /**
-     * Tries to figure out the terminal width in which this application runs.
+     * Sets the terminal width.
      *
-     * @return int|null
+     * @param int
      */
-    public function getTerminalWidth()
+    public function setWidth($width)
     {
-        return $this->getTerminalDimensions()[0];
+        $this->width = $width;
     }
 
     /**
      * Tries to figure out the terminal height in which this application runs.
      *
      * @return int|null
      */
-    public function getTerminalHeight()
+    public function getHeight()
     {
-        return $this->getTerminalDimensions()[1];
+        if (null === $this->height) {
+            $this->initDimensions();
+        }
+
+        return $this->height;
     }
 
     /**
-     * Sets terminal dimensions.
-     *
-     * Can be useful to force terminal dimensions for functional tests.
+     * Sets the terminal height.
      *
-     * @param int $width
-     * @param int $height
+     * @param int
      */
-    public function setTerminalDimensions($width, $height)
+    public function setHeight($height)
     {
-        $this->terminalDimensions = array($width, $height);
+        $this->height = $height;
+    }
+
+    private function initDimensions()
+    {
+        if (null !== $this->width && null !== $this->height) {
+            return;
+        }
+
+        $width = $height = null;
+        if ($this->isWindowsEnvironment()) {
+            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
+                // extract [w, H] from "wxh (WxH)"
+                $width = (int) $matches[1];
+                $height = (int) $matches[2];
+            } elseif (null != $dimensions = $this->getConsoleMode()) {
+                // extract [w, h] from "wxh"
+                $width = $dimensions[0];
+                $height = $dimensions[1];
+            }
+        } elseif ($sttyString = $this->getSttyColumns()) {
+            if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
+                // extract [w, h] from "rows h; columns w;"
+                $width = (int) $matches[1];
+                $height = (int) $matches[2];
+            } elseif (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
+                // extract [w, h] from "; h rows; w columns"
+                $width = (int) $matches[2];
+                $heighth = (int) $matches[1];
+            }
+        }
+
+        if (null === $this->width) {
+            $this->width = $width;
+        }
+
+        if (null === $this->height) {
+            $this->height = $height;
+        }
     }
 
     /**
      * Runs and parses mode CON if it's available, suppressing any error output.
      *
-     * @return string <width>x<height> or null if it could not be parsed
+     * @return array|null An array composed of the width and the height or null if it could not be parsed
      */
     private function getConsoleMode()
     {
@@ -110,7 +125,7 @@ private function getConsoleMode()
             proc_close($process);
 
             if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return $matches[2].'x'.$matches[1];
+                return array((int) $matches[2], (int) $matches[1]);
             }
         }
     }