[Console] drop TerminalDimensionsProviderInterface

symfony · TomasVotruba · Nov 6, 2015 · Nov 14, 2015 · Nov 14, 2015 · Nov 14, 2015
commit eb8a58d43e3a4963085f84abe723597315476983
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -36,7 +36,6 @@
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Terminal\TerminalDimensionsProvider;
-use Symfony\Component\Console\Terminal\TerminalDimensionsProviderInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;

 /**
@@ -69,16 +68,16 @@ class Application
    private $defaultCommand;

    /**
-     * @var TerminalDimensionsProviderInterface
+     * @var TerminalDimensionsProvider
     */
    private $terminalDimensionsProvider;

    /**
-     * @param string                              $name                       The name of the application
-     * @param string                              $version                    The version of the application
-     * @param TerminalDimensionsProviderInterface $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', TerminalDimensionsProviderInterface $terminalDimensionsProvider = null)
+    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', TerminalDimensionsProvider $terminalDimensionsProvider = null)
    {
        $this->name = $name;
        $this->version = $version;

diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Terminal\TerminalDimensionsProvider;
-use Symfony\Component\Console\Terminal\TerminalDimensionsProviderInterface;

 /**
 * The ProgressBar provides helpers to display progress output.
@@ -52,16 +51,16 @@ class ProgressBar
    private static $formats;

    /**
-     * @var TerminalDimensionsProviderInterface
+     * @var TerminalDimensionsProvider
     */
    private $terminalDimensionsProvider;

    /**
-     * @param OutputInterface                     $output                     An OutputInterface instance
-     * @param int                                 $max                        Maximum steps (0 if unknown)
-     * @param TerminalDimensionsProviderInterface $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, TerminalDimensionsProviderInterface $terminalDimensionsProvider = null)
+    public function __construct(OutputInterface $output, $max = 0, TerminalDimensionsProvider $terminalDimensionsProvider = null)
    {
        if ($output instanceof ConsoleOutputInterface) {
            $output = $output->getErrorOutput();

diff --git a/src/Symfony/Component/Console/Terminal/TerminalDimensionsProvider.php b/src/Symfony/Component/Console/Terminal/TerminalDimensionsProvider.php
@@ -11,15 +11,17 @@

 namespace Symfony\Component\Console\Terminal;

-class TerminalDimensionsProvider implements TerminalDimensionsProviderInterface
+class TerminalDimensionsProvider
 {
    /**
     * @var int[]
     */
    private $terminalDimensions = array();

    /**
-     * {@inheritdoc}
+     * Tries to figure out the terminal dimensions based on the current environment.
+     *
+     * @return int[] Array containing width and height
     */
    public function getTerminalDimensions()
    {
@@ -53,23 +55,32 @@ public function getTerminalDimensions()
    }

    /**
-     * {@inheritdoc}
+     * Tries to figure out the terminal width in which this application runs.
+     *
+     * @return int|null
     */
    public function getTerminalWidth()
    {
        return $this->getTerminalDimensions()[0];
    }

    /**
-     * {@inheritdoc}
+     * Tries to figure out the terminal height in which this application runs.
+     *
+     * @return int|null
     */
    public function getTerminalHeight()
    {
        return $this->getTerminalDimensions()[1];
    }

    /**
-     * {@inheritdoc}
+     * Sets terminal dimensions.
+     *
+     * Can be useful to force terminal dimensions for functional tests.
+     *
+     * @param int $width
+     * @param int $height
     */
    public function setTerminalDimensions($width, $height)
    {

diff --git a/src/Symfony/Component/Console/Terminal/TerminalDimensionsProviderInterface.php b/src/Symfony/Component/Console/Terminal/TerminalDimensionsProviderInterface.php
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Terminal\TerminalDimensionsProvider;
-use Symfony\Component\Console\Terminal\TerminalDimensionsProviderInterface;

 /**
 * @group time-sensitive
@@ -645,7 +644,7 @@ protected function generateOutput($expected)
    }

    /**
-     * @return TerminalDimensionsProviderInterface
+     * @return TerminalDimensionsProvider
     */
    private function createTerminalDimensionsProvider()
    {