diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Console] Fix error when mode is not in PATH

Browse Source
This commit is contained in:
Jordi Boggiano 2012-10-15 17:06:38 +02:00
parent 13e6ce42a6
commit cf1e02d9ae
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Symfony/Component/Console/Application.php
View File

@ -854,8 +854,7 @@ class Application
return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
}
exec('mode CON', $execData);
if (preg_match('{columns:\s*(\d+)}i', $execData[4], $matches)) {
if (preg_match('{columns:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
return $matches[1];
}
}
@ -877,8 +876,7 @@ class Application
return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));
}
exec('mode CON', $execData);
if (preg_match('{lines:\s*(\d+)}i', $execData[3], $matches)) {
if (preg_match('{lines:\s*(\d+)}i', $this->getConsoleMode(), $matches)) {
return $matches[1];
}
}
@ -966,6 +964,29 @@ class Application
}
}
/**
* Runs and parses mode CON if it's available, suppressing any error output
*
* @return string
*/
private function getConsoleMode()
{
if (!function_exists('proc_open')) {
return;
}
$descriptorspec = array(1 => array('pipe', 'w'), 2 => array('pipe', 'w'));
$process = proc_open('mode CON', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
if (is_resource($process)) {
$info = stream_get_contents($pipes[1]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
return $info;
}
}
/**
* Sorts commands in alphabetical order.
*