[Console] SymfonyStyle : Fix blocks wordwrapping
Allow to print strings with a length greater than the terminal length in a block by allowing to cut words.
This commit is contained in:
parent
e09874bd98
commit
58f2fada56
@ -76,7 +76,7 @@ class SymfonyStyle extends OutputStyle
|
|||||||
// wrap and add newlines for each element
|
// wrap and add newlines for each element
|
||||||
foreach ($messages as $key => $message) {
|
foreach ($messages as $key => $message) {
|
||||||
$message = OutputFormatter::escape($message);
|
$message = OutputFormatter::escape($message);
|
||||||
$lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL)));
|
$lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
|
||||||
|
|
||||||
if (count($messages) > 1 && $key < count($messages) - 1) {
|
if (count($messages) > 1 && $key < count($messages) - 1) {
|
||||||
$lines[] = '';
|
$lines[] = '';
|
||||||
|
@ -4,6 +4,9 @@ namespace Symfony\Component\Console\Tests\Style;
|
|||||||
|
|
||||||
use PHPUnit_Framework_TestCase;
|
use PHPUnit_Framework_TestCase;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
use Symfony\Component\Console\Tester\CommandTester;
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
|
|
||||||
class SymfonyStyleTest extends PHPUnit_Framework_TestCase
|
class SymfonyStyleTest extends PHPUnit_Framework_TestCase
|
||||||
@ -42,4 +45,20 @@ class SymfonyStyleTest extends PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
|
return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLongWordsBlockWrapping()
|
||||||
|
{
|
||||||
|
$word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
|
||||||
|
$wordLength = strlen($word);
|
||||||
|
$maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
|
||||||
|
|
||||||
|
$this->command->setCode(function (InputInterface $input, OutputInterface $output) use ($word) {
|
||||||
|
$sfStyle = new SymfonyStyle($input, $output);
|
||||||
|
$sfStyle->block($word, 'CUSTOM', 'fg=white;bg=blue', ' § ', false);
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
|
||||||
|
$expectedCount = (int) ceil($wordLength / ($maxLineLength)) + (int) ($wordLength > $maxLineLength - 5);
|
||||||
|
$this->assertSame($expectedCount, substr_count($this->tester->getDisplay(true), ' § '));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user