Forward-port #3764 (stty size fix) to master (#3772)

greg-1-anderson · web-flow · commit b8174d1c2613 · 2018-11-06T20:11:17.000-08:00
diff --git a/src/Config/Environment.php b/src/Config/Environment.php
@@ -456,12 +456,13 @@ public function calculateColumns()
 
         // Trying to export the columns using stty.
         exec('stty size 2>&1', $columns_output, $columns_status);
-        if (!$columns_status) {
-            $columns = preg_replace('/\d+\s(\d+)/', '$1', $columns_output[0], -1, $columns_count);
+        $matched = false;
+        if (!$columns_status && $matched = preg_match('/^\d+\s(\d+)$/', $columns_output[0], $matches, 0)) {
+            $columns = $matches[1];
         }
 
         // If stty fails and Drush us running on Windows are we trying with mode con.
-        if (($columns_status || !$columns_count) && static::isWindows()) {
+        if (($columns_status || !$matched) && static::isWindows()) {
             $columns_output = [];
             exec('mode con', $columns_output, $columns_status);
             if (!$columns_status && is_array($columns_output)) {
