Fixes #11907: Fixed yii\helpers\Console::getScreenSize() on Windows…

… was giving out width and height swapped
yiisoft · Aug 4, 2016 · 8a9c8a8 · 8a9c8a8 · karakum · Sep 20, 2016
1 parent 496de65
commit 8a9c8a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -23,6 +23,7 @@ Yii Framework 2 Change Log
 - Enh #12082: Used `jQuery.on(` instead of event method to ensure forwards compatibility (newerton)
 - Enh #12028: Add -h|--help option to console command to display help information (pana1990)
 - Bug #12053: `./yii migrate/create` was generating wrong code when using `bigPrimaryKey` (VojtechH, samdark)
+- Bug #11907: Fixed `yii\helpers\Console::getScreenSize()` on Windows was giving out width and height swapped (Spell6inder, samdark, cebe)
 
 2.0.9 July 11, 2016
 -------------------

diff --git a/framework/helpers/BaseConsole.php b/framework/helpers/BaseConsole.php
@@ -613,14 +613,14 @@ public static function getScreenSize($refresh = false)
         if (static::isRunningOnWindows()) {
             $output = [];
             exec('mode con', $output);
-            if (isset($output, $output[1]) && strpos($output[1], 'CON') !== false) {
-                return $size = [(int) preg_replace('~\D~', '', $output[3]), (int) preg_replace('~\D~', '', $output[4])];
+            if (isset($output, $output[1]) && preg_match('/con:.*lines:\s+(\d+)\s+columns:\s+(\d+)/mi', implode(' ', $output), $matches)) {
+                return $size = [(int)$matches[2], (int)$matches[1]];
             }
         } else {
             // try stty if available
             $stty = [];
             if (exec('stty -a 2>&1', $stty) && preg_match('/rows\s+(\d+);\s*columns\s+(\d+);/mi', implode(' ', $stty), $matches)) {
-                return $size = [$matches[2], $matches[1]];
+                return $size = [(int)$matches[2], (int)$matches[1]];
             }
 
             // fallback to tput, which may not be updated on terminal resize