8000 Merge branch '2.5' · symfony/symfony@a7d52fd · GitHub
[go: up one dir, main page]
Skip to content

Commit a7d52fd

Browse files
fabpotfabpot
committed
Merge branch '2.5'
* 2.5: [FrameworkBundle] minor fix [Console] add a dot [Form] remove unnecessary call clean handling of :: passed to find() Conflicts: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php src/Symfony/Component/Console/Tests/Fixtures/application_1.txt src/Symfony/Component/Console/Tests/Fixtures/application_2.txt src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
2 parents 089129b + 643fdc8 commit a7d52fd

20 files changed

+37
-28
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(KernelInterface $kernel)
4747
public function parse($controller)
4848
{
4949
$originalController = $controller;
50-
if (3 != count($parts = explode(':', $controller))) {
50+
if (3 !== count($parts = explode(':', $controller))) {
5151
throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));
5252
}
5353

‎src/Symfony/Component/Console/Application.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ protected function getDefaultInputDefinition()
923923

924924
new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message.'),
925925
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message.'),
926-
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
926+
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.'),
927927
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version.'),
928928
new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output.'),
929929
new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output.'),
@@ -1067,7 +1067,7 @@ private function findAlternatives($name, $collection)
10671067
}
10681068

10691069
$lev = levenshtein($subname, $parts[$i]);
1070-
if ($lev <= strlen($subname) / 3 || false !== strpos($parts[$i], $subname)) {
1070+
if ($lev <= strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) {
10711071
$alternatives[$collectionName] = $exists ? $alternatives[$collectionName] + $lev : $lev;
10721072
} elseif ($exists) {
10731073
$alternatives[$collectionName] += $threshold;

‎src/Symfony/Component/Console/Tests/ApplicationTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,18 @@ public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
445445
$this->assertEquals('foo:sublong', $application->findNamespace('f:sub'));
446446
}
447447

448+
/**
449+
* @expectedException \InvalidArgumentException
450+
* @expectedExceptionMessage Command "foo::bar" is not defined.
451+
*/
452+
public function testFindWithDoubleColonInNameThrowsException()
453+
{
454+
$application = new Application();
455+
$application->add(new \FooCommand());
456+
$application->add(new \Foo4Command());
457+
$application->find('foo::bar');
458+
}
459+
448460
public function testSetCatchExceptions()
449461
{
450462
$application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message.","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message.","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version.","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output.","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output.","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question.","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
1+
{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message.","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message.","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version.","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output.","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output.","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question.","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ To display the list of available commands, please use the <info>list</info> comm
9090
* Accept value: no
9191
* Is value required: no
9292
* Is multiple: no
93-
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
93+
* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
9494
* Default: `false`
9595

9696
**version:**

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<comment>Options:</comment>
77
<info>--help</info> (-h) Display this help message.
88
<info>--quiet</info> (-q) Do not output any message.
9-
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
9+
<info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.
1010
<info>--version</info> (-V) Display this application version.
1111
<info>--ansi</info> Force ANSI output.
1212
<info>--no-ansi</info> Disable ANSI output.

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<description>Do not output any message.</description>
4343
</option>
4444
<option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
45-
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
45+
<description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.</description>
4646
</option>
4747
<option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
4848
<description>Display this application version.</description>

0 commit comments

Comments
 (0)
0