Merge pull request #221 from niels-nijens/improve-terminal-width-dete…

…ction Improve terminal width detection
accompli · Nov 16, 2016 · 9291256 · 9291256
2 parents 9e6cbed + 722615a
commit 9291256
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -33,6 +33,23 @@ public function getHelp()
         return Accompli::LOGO.parent::getHelp();
     }
 
+    /**
+     * Returns the terminal width.
+     *
+     * @return int
+     */
+    public function getTerminalWidth()
+    {
+        $terminalDimensions = $this->getTerminalDimensions();
+
+        $width = 120;
+        if (isset($terminalDimensions[0]) && $terminalDimensions[0] > 0) {
+            $width = $terminalDimensions[0];
+        }
+
+        return $width;
+    }
+
     /**
      * Returns the array with default commands.
      *

diff --git a/src/Console/Helper/TitleBlock.php b/src/Console/Helper/TitleBlock.php
@@ -2,7 +2,7 @@
 
 namespace Accompli\Console\Helper;
 
-use Symfony\Component\Console\Application;
+use Accompli\Console\Application;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -103,13 +103,7 @@ public function render()
     private function getTerminalWidth()
     {
         $application = new Application();
-        $terminalDimensions = $application->getTerminalDimensions();
 
-        $width = 120;
-        if (isset($terminalDimensions[0])) {
-            $width = $terminalDimensions[0];
-        }
-
-        return $width;
+        return $application->getTerminalWidth();
     }
 }
diff --git a/src/Console/Logger/ConsoleLogger.php b/src/Console/Logger/ConsoleLogger.php
@@ -2,12 +2,12 @@
 
 namespace Accompli\Console\Logger;
 
+use Accompli\Console\Application;
 use Accompli\Console\Formatter\OutputFormatter;
 use Accompli\Task\TaskInterface;
 use Psr\Log\AbstractLogger;
 use Psr\Log\InvalidArgumentException;
 use Psr\Log\LogLevel;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -195,14 +195,8 @@ public function getOperatingSystemName()
     public function getTerminalWidth()
     {
         $application = new Application();
-        $terminalDimensions = $application->getTerminalDimensions();
 
-        $width = 120;
-        if (isset($terminalDimensions[0])) {
-            $width = $terminalDimensions[0];
-        }
-
-        return $width;
+        return $application->getTerminalWidth();
     }
 
     /**