[Console] Add support for parsing terminal width/height on localized windows, fixes #5742

Seldaek · Seldaek · commit d2231d8cd81a · 2012-12-13T18:42:00.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -853,7 +853,7 @@ protected function getTerminalWidth()
                 return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
             }
 
-            if (preg_match('{columns:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
+            if (preg_match('{^(\d+)x\d+$}i', $this->getConsoleMode(), $matches)) {
                 return $matches[1];
             }
         }
@@ -875,7 +875,7 @@ protected function getTerminalHeight()
                 return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));
             }
 
-            if (preg_match('{lines:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
+            if (preg_match('{^\d+x(\d+)$}i', $this->getConsoleMode(), $matches)) {
                 return $matches[1];
             }
         }
@@ -966,7 +966,7 @@ private function getSttyColumns()
     /**
      * Runs and parses mode CON if it's available, suppressing any error output
      *
-     * @return string
+     * @return string <width>x<height> or null if it could not be parsed
      */
     private function getConsoleMode()
     {
@@ -982,7 +982,9 @@ private function getConsoleMode()
             fclose($pipes[2]);
             proc_close($process);
 
-            return $info;
+            if (preg_match('{--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n}', $info, $matches)) {
+                return $matches[2].'x'.$matches[1];
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ protected function getTerminalWidth()`
`853`	`853`	`return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);`
`854`	`854`	`}`
`855`	`855`
`856`		`- if (preg_match('{columns:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {`
	`856`	`+ if (preg_match('{^(\d+)x\d+$}i', $this->getConsoleMode(), $matches)) {`
`857`	`857`	`return $matches[1];`
`858`	`858`	`}`
`859`	`859`	`}`
`@@ -875,7 +875,7 @@ protected function getTerminalHeight()`
`875`	`875`	`return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));`
`876`	`876`	`}`
`877`	`877`
`878`		`- if (preg_match('{lines:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {`
	`878`	`+ if (preg_match('{^\d+x(\d+)$}i', $this->getConsoleMode(), $matches)) {`
`879`	`879`	`return $matches[1];`
`880`	`880`	`}`
`881`	`881`	`}`
`@@ -966,7 +966,7 @@ private function getSttyColumns()`
`966`	`966`	`/**`
`967`	`967`	`* Runs and parses mode CON if it's available, suppressing any error output`
`968`	`968`	`*`
`969`		`- * @return string`
	`969`	`+ * @return string <width>x<height> or null if it could not be parsed`
`970`	`970`	`*/`
`971`	`971`	`private function getConsoleMode()`
`972`	`972`	`{`
`@@ -982,7 +982,9 @@ private function getConsoleMode()`
`982`	`982`	`fclose($pipes[2]);`
`983`	`983`	`proc_close($process);`
`984`	`984`
`985`		`- return $info;`
	`985`	`+ if (preg_match('{--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n}', $info, $matches)) {`
	`986`	`+ return $matches[2].'x'.$matches[1];`
	`987`	`+ }`
`986`	`988`	`}`
`987`	`989`	`}`
`988`	`990`