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

merged branch 1ed/console-line-breaks (PR #1361)

Browse Source 
Commits
-------

3cfff4b [Console] fixed output formatter if content has line breaks

Discussion
----------

[Console] fixed formatter if content has line breaks

Fixes the Symfony2 ASCII art in shell.
This commit is contained in:
Fabien Potencier 2011-06-19 11:36:24 +02:00
commit 3f70fc1d44
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Console/Formatter/OutputFormatter.php
View File

@ -125,7 +125,7 @@ class OutputFormatter implements OutputFormatterInterface
*/
public function format($message)
{
return preg_replace_callback('#<([a-z][a-z0-9_=;-]+)>(.*?)</\\1?>#i', array($this, 'replaceStyle'), $message);
return preg_replace_callback('#<([a-z][a-z0-9_=;-]+)>(.*?)</\\1?>#is', array($this, 'replaceStyle'), $message);
}
/**

51
tests/Symfony/Tests/Component/Console/Formatter/OutputFormatterTest.php
View File

@ -129,4 +129,55 @@ class FormatterStyleTest extends \PHPUnit_Framework_TestCase
"\033[30;46msome question\033[0m", $formatter->format('<question>some question</question>')
);
}
public function testContentWithLineBreaks()
{
$formatter = new OutputFormatter(true);
$this->assertEquals(<<<EOF
\033[32m
some text\033[0m
EOF
, $formatter->format(<<<EOF
<info>
some text</info>
EOF
));
$this->assertEquals(<<<EOF
\033[32msome text
\033[0m
EOF
, $formatter->format(<<<EOF
<info>some text
</info>
EOF
));
$this->assertEquals(<<<EOF
\033[32m
some text
\033[0m
EOF
, $formatter->format(<<<EOF
<info>
some text
</info>
EOF
));
$this->assertEquals(<<<EOF
\033[32m
some text
more text
\033[0m
EOF
, $formatter->format(<<<EOF
<info>
some text
more text
</info>
EOF
));
}
}