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

Merge branch '2.1' 

* 2.1:
  [Console] made Application::getTerminalDimensions() public
  Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
  [2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd
  Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)

Conflicts:
	composer.json
This commit is contained in:
Fabien Potencier 2013-01-05 21:35:20 +01:00
parent af070084d3 d786e09341
commit 583d999b4e
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -59,7 +59,7 @@
"doctrine/data-fixtures": "1.0.*", "doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": ">=2.2,<2.4-dev", "doctrine/dbal": ">=2.2,<2.4-dev",
"doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/orm": ">=2.2.3,<2.4-dev",
"monolog/monolog": "1.*", "monolog/monolog": ">=1.0,<1.3-dev",
"propel/propel1": "dev-master" "propel/propel1": "dev-master"
}, },
"autoload": { "autoload": {

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

@ -797,7 +797,7 @@ class Application
$len = $strlen($title); $len = $strlen($title);
$width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX; $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
$lines = array(); $lines = array();
foreach (preg_split("{\r?\n}", $e->getMessage()) as $line) { foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
foreach (str_split($line, $width - 4) as $line) { foreach (str_split($line, $width - 4) as $line) {
$lines[] = sprintf(' %s ', $line); $lines[] = sprintf(' %s ', $line);
$len = max($strlen($line) + 4, $len); $len = max($strlen($line) + 4, $len);
@ -859,21 +859,11 @@ class Application
* *
* @return int|null * @return int|null
*/ */
public function getTerminalWidth() protected function getTerminalWidth()
{ {
if (defined('PHP_WINDOWS_VERSION_BUILD')) { $dimensions = $this->getTerminalDimensions();
if ($ansicon = getenv('ANSICON')) {
return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
}
if (preg_match('{^(\d+)x\d+$}i', $this->getConsoleMode(), $matches)) { return $dimensions[0];
return $matches[1];
}
}
if (preg_match("{rows.(\d+);.columns.(\d+);}i", $this->getSttyColumns(), $match)) {
return $match[2];
}
} }
/** /**
@ -881,21 +871,43 @@ class Application
* *
* @return int|null * @return int|null
*/ */
public function getTerminalHeight() protected function getTerminalHeight()
{
$dimensions = $this->getTerminalDimensions();
return $dimensions[1];
}
/**
* Tries to figure out the terminal dimensions based on the current environment
*
* @return array Array containing width and height
*/
public function getTerminalDimensions()
{ {
if (defined('PHP_WINDOWS_VERSION_BUILD')) { if (defined('PHP_WINDOWS_VERSION_BUILD')) {
if ($ansicon = getenv('ANSICON')) { // extract [w, H] from "wxh (WxH)"
return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon)); if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
return array((int) $matches[1], (int) $matches[2]);
} }
// extract [w, h] from "wxh"
if (preg_match('{^\d+x(\d+)$}i', $this->getConsoleMode(), $matches)) { if (preg_match('/^(\d+)x(\d+)$/', $this->getConsoleMode(), $matches)) {
return $matches[1]; return array((int) $matches[1], (int) $matches[2]);
} }
} }
if (preg_match("{rows.(\d+);.columns.(\d+);}i", $this->getSttyColumns(), $match)) { if ($sttyString = $this->getSttyColumns()) {
return $match[1]; // extract [w, h] from "rows h; columns w;"
if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
return array((int) $matches[2], (int) $matches[1]);
}
// extract [w, h] from "; h rows; w columns"
if (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
return array((int) $matches[2], (int) $matches[1]);
}
} }
return array(null, null);
} }
/** /**
@ -996,7 +1008,7 @@ class Application
fclose($pipes[2]); fclose($pipes[2]);
proc_close($process); proc_close($process);
if (preg_match('{--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n}', $info, $matches)) { if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
return $matches[2].'x'.$matches[1]; return $matches[2].'x'.$matches[1];
} }
} }