Terminal width taken also by env

Author: Slamdunk

composer.json

@@ -17,7 +17,8 @@
         "phpunit/phpunit": "^6.5",
         "roave/security-advisories": "dev-master",
         "slam/php-cs-fixer-extensions": "^1.10",
-        "slam/php-debug-r": "^1.1"
+        "slam/php-debug-r": "^1.1",
+        "symfony/console": "^4.0"
     },
     "autoload": {
         "psr-4": {

lib/ErrorHandler.php

@@ -79,13 +79,7 @@ public function getTerminalWidth(): int
         if (null === $this->terminalWidth) {
             $width = \getenv('COLUMNS');
 
-            // @codeCoverageIgnoreStart
-            if (\defined('PHP_WINDOWS_VERSION_BUILD') and $ansicon = \getenv('ANSICON')) {
-                $width = \preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
-            }
-            // @codeCoverageIgnoreEnd
-
-            if (\preg_match('{rows.(\d+);.columns.(\d+);}i', \exec('stty -a 2> /dev/null | grep columns'), $match)) {
+            if (false === $width and 1 === \preg_match('{rows.(\d+);.columns.(\d+);}i', \exec('stty -a 2> /dev/null | grep columns'), $match)) {
                 $width = $match[2];
             }
 

tests/ErrorHandlerTest.php

@@ -7,6 +7,7 @@
 use ErrorException;
 use PHPUnit\Framework\TestCase;
 use Slam\ErrorHandler\ErrorHandler;
+use Symfony\Component\Console\Terminal;
 
 final class ErrorHandlerTest extends TestCase
 {
@@ -36,6 +37,7 @@ protected function setUp()
 
     protected function tearDown()
     {
+        \putenv('COLUMNS');
         \ini_set('error_log', $this->backupErrorLog);
         @\unlink($this->errorLog);
     }
@@ -224,4 +226,23 @@ public function testUsernameInEmailSubject()
 
         $this->assertContains($username, $message['subject']);
     }
+
+    public function testTerminalWidthByEnv()
+    {
+        $width = \mt_rand(1000, 9000);
+        \putenv(\sprintf('COLUMNS=%s', $width));
+
+        $errorHandler = new ErrorHandler(function () {
+        });
+
+        $this->assertSame($width, $errorHandler->getTerminalWidth());
+
+        \putenv('COLUMNS');
+
+        $errorHandler = new ErrorHandler(function () {
+        });
+
+        $terminal = new Terminal();
+        $this->assertSame($terminal->getWidth(), $errorHandler->getTerminalWidth());
+    }
 }