Merge branch '3.0' into 3.1
* 3.0: [Console] SymfonyStyle: Align multi-line/very-long-line blocks [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut Fix js comment in profiler
This commit is contained in:
commit
c968257472
@ -83,8 +83,8 @@
|
|||||||
requestStack = [],
|
requestStack = [],
|
||||||
|
|
||||||
extractHeaders = function(xhr, stackElement) {
|
extractHeaders = function(xhr, stackElement) {
|
||||||
// Here we avoid to call xhr.getResponseHeader in order to
|
/* Here we avoid to call xhr.getResponseHeader in order to */
|
||||||
// prevent polluting the console with CORS security errors
|
/* prevent polluting the console with CORS security errors */
|
||||||
var allHeaders = xhr.getAllResponseHeaders();
|
var allHeaders = xhr.getAllResponseHeaders();
|
||||||
var ret;
|
var ret;
|
||||||
|
|
||||||
|
@ -300,14 +300,14 @@ class Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
||||||
|
|
||||||
if ($mergeArgs) {
|
if ($mergeArgs) {
|
||||||
$currentArguments = $this->definition->getArguments();
|
$currentArguments = $this->definition->getArguments();
|
||||||
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
||||||
$this->definition->addArguments($currentArguments);
|
$this->definition->addArguments($currentArguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
|
||||||
|
|
||||||
$this->applicationDefinitionMerged = true;
|
$this->applicationDefinitionMerged = true;
|
||||||
if ($mergeArgs) {
|
if ($mergeArgs) {
|
||||||
$this->applicationDefinitionMergedWithArgs = true;
|
$this->applicationDefinitionMergedWithArgs = true;
|
||||||
|
@ -68,23 +68,36 @@ class SymfonyStyle extends OutputStyle
|
|||||||
{
|
{
|
||||||
$this->autoPrependBlock();
|
$this->autoPrependBlock();
|
||||||
$messages = is_array($messages) ? array_values($messages) : array($messages);
|
$messages = is_array($messages) ? array_values($messages) : array($messages);
|
||||||
|
$indentLength = 0;
|
||||||
$lines = array();
|
$lines = array();
|
||||||
|
|
||||||
// add type
|
|
||||||
if (null !== $type) {
|
if (null !== $type) {
|
||||||
$messages[0] = sprintf('[%s] %s', $type, $messages[0]);
|
$typePrefix = sprintf('[%s] ', $type);
|
||||||
|
$indentLength = strlen($typePrefix);
|
||||||
|
$lineIndentation = str_repeat(' ', $indentLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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, true)));
|
$lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix) - $indentLength, PHP_EOL, true)));
|
||||||
|
|
||||||
|
// prefix each line with a number of spaces equivalent to the type length
|
||||||
|
if (null !== $type) {
|
||||||
|
foreach ($lines as &$line) {
|
||||||
|
$line = $lineIndentation === substr($line, 0, $indentLength) ? $line : $lineIndentation.$line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (count($messages) > 1 && $key < count($messages) - 1) {
|
if (count($messages) > 1 && $key < count($messages) - 1) {
|
||||||
$lines[] = '';
|
$lines[] = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (null !== $type) {
|
||||||
|
$lines[0] = substr_replace($lines[0], $typePrefix, 0, $indentLength);
|
||||||
|
}
|
||||||
|
|
||||||
if ($padding && $this->isDecorated()) {
|
if ($padding && $this->isDecorated()) {
|
||||||
array_unshift($lines, '');
|
array_unshift($lines, '');
|
||||||
$lines[] = '';
|
$lines[] = '';
|
||||||
|
@ -733,6 +733,33 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
|
$this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \LogicException
|
||||||
|
* @expectedExceptionMessage An option with shortcut "e" already exists.
|
||||||
|
*/
|
||||||
|
public function testAddingOptionWithDuplicateShortcut()
|
||||||
|
{
|
||||||
|
$dispatcher = new EventDispatcher();
|
||||||
|
$application = new Application();
|
||||||
|
$application->setAutoExit(false);
|
||||||
|
$application->setCatchExceptions(false);
|
||||||
|
$application->setDispatcher($dispatcher);
|
||||||
|
|
||||||
|
$application->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'Environment'));
|
||||||
|
|
||||||
|
$application
|
||||||
|
->register('foo')
|
||||||
|
->setAliases(['f'])
|
||||||
|
->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
|
||||||
|
->setCode(function (InputInterface $input, OutputInterface $output) {})
|
||||||
|
;
|
||||||
|
|
||||||
|
$input = new ArrayInput(array('command' => 'foo'));
|
||||||
|
$output = new NullOutput();
|
||||||
|
|
||||||
|
$application->run($input, $output);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException \LogicException
|
* @expectedException \LogicException
|
||||||
* @dataProvider getAddingAlreadySetDefinitionElementData
|
* @dataProvider getAddingAlreadySetDefinitionElementData
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
|
||||||
|
|
||||||
|
//Ensure that all lines are aligned to the begin of the first line in a very long line block
|
||||||
|
return function (InputInterface $input, OutputInterface $output) {
|
||||||
|
$output = new SymfonyStyleWithForcedLineLength($input, $output);
|
||||||
|
$output->block(
|
||||||
|
'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
|
||||||
|
'CUSTOM',
|
||||||
|
'fg=white;bg=green',
|
||||||
|
'X ',
|
||||||
|
true
|
||||||
|
);
|
||||||
|
};
|
@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
|
||||||
|
|
||||||
|
//Ensure that all lines are aligned to the begin of the first line in a multi-line block
|
||||||
|
return function (InputInterface $input, OutputInterface $output) {
|
||||||
|
$output = new SymfonyStyleWithForcedLineLength($input, $output);
|
||||||
|
$output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
|
||||||
|
};
|
@ -0,0 +1,7 @@
|
|||||||
|
|
||||||
|
X [CUSTOM] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
|
||||||
|
X dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
|
||||||
|
X commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
|
||||||
|
X nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
|
||||||
|
X anim id est laborum
|
||||||
|
|
@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
X [CUSTOM] Custom block
|
||||||
|
X
|
||||||
|
X Second custom block line
|
||||||
|
|
@ -57,7 +57,7 @@ class SymfonyStyleTest extends PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function testLongWordsBlockWrapping()
|
public function testLongWordsBlockWrapping()
|
||||||
{
|
{
|
||||||
$word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
|
$word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygovgollhjvhvljfezefeqifzeiqgiqzhrsdgihqzridghqridghqirshdghdghieridgheirhsdgehrsdvhqrsidhqshdgihrsidvqhneriqsdvjzergetsrfhgrstsfhsetsfhesrhdgtesfhbzrtfbrztvetbsdfbrsdfbrn';
|
||||||
$wordLength = strlen($word);
|
$wordLength = strlen($word);
|
||||||
$maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
|
$maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user