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

#40302 improve exception message when required argument is added after an optional one

Browse Source
This commit is contained in:
marbul 2021-03-03 18:38:02 +01:00
parent f0e076a013
commit 9bddbbd7ed
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Symfony/Component/Console/Input/InputDefinition.php
View File

@ -30,8 +30,8 @@ class InputDefinition
{
private $arguments;
private $requiredCount;
private $hasAnArrayArgument = false;
private $hasOptional;
private $lastArrayArgument;
private $lastOptionalArgument;
private $options;
private $negations;
private $shortcuts;
@ -72,8 +72,8 @@ class InputDefinition
{
$this->arguments = [];
$this->requiredCount = 0;
$this->hasOptional = false;
$this->hasAnArrayArgument = false;
$this->lastOptionalArgument = null;
$this->lastArrayArgument = null;
$this->addArguments($arguments);
}
@ -100,22 +100,22 @@ class InputDefinition
throw new LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName()));
}
if ($this->hasAnArrayArgument) {
throw new LogicException('Cannot add an argument after an array argument.');
if (null !== $this->lastArrayArgument) {
throw new LogicException(sprintf('Cannot add a required argument "%s" after an array argument "%s".', $argument->getName(), $this->lastArrayArgument->getName()));
}
if ($argument->isRequired() && $this->hasOptional) {
throw new LogicException('Cannot add a required argument after an optional one.');
if ($argument->isRequired() && null !== $this->lastOptionalArgument) {
throw new LogicException(sprintf('Cannot add a required argument "%s" after an optional one "%s".', $argument->getName(), $this->lastOptionalArgument->getName()));
}
if ($argument->isArray()) {
$this->hasAnArrayArgument = true;
$this->lastArrayArgument = $argument;
}
if ($argument->isRequired()) {
++$this->requiredCount;
} else {
$this->hasOptional = true;
$this->lastOptionalArgument = $argument;
}
$this->arguments[$argument->getName()] = $argument;
@ -172,7 +172,7 @@ class InputDefinition
*/
public function getArgumentCount()
{
return $this->hasAnArrayArgument ? \PHP_INT_MAX : \count($this->arguments);
return null !== $this->lastArrayArgument ? \PHP_INT_MAX : \count($this->arguments);
}
/**

6
src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
View File

@ -101,7 +101,7 @@ class InputDefinitionTest extends TestCase
public function testArrayArgumentHasToBeLast()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('Cannot add an argument after an array argument.');
$this->expectExceptionMessage('Cannot add a required argument "anotherbar" after an array argument "fooarray".');
$this->initializeArguments();
$definition = new InputDefinition();
@ -111,9 +111,9 @@ class InputDefinitionTest extends TestCase
public function testRequiredArgumentCannotFollowAnOptionalOne()
{
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('Cannot add a required argument after an optional one.');
$this->initializeArguments();
$this->expectException(\LogicException::class);
$this->expectExceptionMessage(sprintf('Cannot add a required argument "%s" after an optional one "%s".', $this->foo2->getName(), $this->foo->getName()));
$definition = new InputDefinition();
$definition->addArgument($this->foo);