Upgrade 1-11.38

vendor/symfony/console/Terminal.php

@@ -15,7 +15,6 @@ class Terminal
 {
     private static $width;
     private static $height;
-    private static $stty;
 
     /**
      * Gets the terminal width.
@@ -55,27 +54,6 @@ class Terminal
         return self::$height ?: 50;
     }
 
-    /**
-     * @internal
-     *
-     * @return bool
-     */
-    public static function hasSttyAvailable()
-    {
-        if (null !== self::$stty) {
-            return self::$stty;
-        }
-
-        // skip check if exec function is disabled
-        if (!\function_exists('exec')) {
-            return false;
-        }
-
-        exec('stty 2>&1', $output, $exitcode);
-
-        return self::$stty = 0 === $exitcode;
-    }
-
     private static function initDimensions()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -84,34 +62,12 @@ class Terminal
                 // or [w, h] from "wxh"
                 self::$width = (int) $matches[1];
                 self::$height = isset($matches[4]) ? (int) $matches[4] : (int) $matches[2];
-            } elseif (!self::hasVt100Support() && self::hasSttyAvailable()) {
-                // only use stty on Windows if the terminal does not support vt100 (e.g. Windows 7 + git-bash)
-                // testing for stty in a Windows 10 vt100-enabled console will implicitly disable vt100 support on STDOUT
-                self::initDimensionsUsingStty();
             } elseif (null !== $dimensions = self::getConsoleMode()) {
                 // extract [w, h] from "wxh"
                 self::$width = (int) $dimensions[0];
                 self::$height = (int) $dimensions[1];
             }
-        } else {
-            self::initDimensionsUsingStty();
-        }
-    }
-
-    /**
-     * Returns whether STDOUT has vt100 support (some Windows 10+ configurations).
-     */
-    private static function hasVt100Support()
-    {
-        return \function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(fopen('php://stdout', 'w'));
-    }
-
-    /**
-     * Initializes dimensions using the output of an stty columns line.
-     */
-    private static function initDimensionsUsingStty()
-    {
-        if ($sttyString = self::getSttyColumns()) {
+        } elseif ($sttyString = self::getSttyColumns()) {
             if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
                 // extract [w, h] from "rows h; columns w;"
                 self::$width = (int) $matches[2];
@@ -131,13 +87,25 @@ class Terminal
      */
     private static function getConsoleMode()
     {
-        $info = self::readFromProcess('mode CON');
-
-        if (null === $info || !preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-            return null;
+        if (!\function_exists('proc_open')) {
+            return;
         }
 
-        return [(int) $matches[2], (int) $matches[1]];
+        $descriptorspec = [
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ];
+        $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
+        if (\is_resource($process)) {
+            $info = stream_get_contents($pipes[1]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+            proc_close($process);
+
+            if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
+                return [(int) $matches[2], (int) $matches[1]];
+            }
+        }
     }
 
     /**
@@ -146,19 +114,9 @@ class Terminal
      * @return string|null
      */
     private static function getSttyColumns()
-    {
-        return self::readFromProcess('stty -a | grep columns');
-    }
-
-    /**
-     * @param string $command
-     *
-     * @return string|null
-     */
-    private static function readFromProcess($command)
     {
         if (!\function_exists('proc_open')) {
-            return null;
+            return;
         }
 
         $descriptorspec = [
@@ -166,16 +124,14 @@ class Terminal
             2 => ['pipe', 'w'],
         ];
 
-        $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (!\is_resource($process)) {
-            return null;
+        $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
+        if (\is_resource($process)) {
+            $info = stream_get_contents($pipes[1]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+            proc_close($process);
+
+            return $info;
         }
-
-        $info = stream_get_contents($pipes[1]);
-        fclose($pipes[1]);
-        fclose($pipes[2]);
-        proc_close($process);
-
-        return $info;
     }
 }