symfony
diff --git a/‎src/Symfony/Component/Console/Input/InputDefinition.php‎
Lines changed: 11 additions & 11 deletions b/‎src/Symfony/Component/Console/Input/InputDefinition.php‎
Lines changed: 11 additions & 11 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php‎
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php‎
Lines changed: 3 additions & 3 deletions
@@ -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 @@ public function setArguments(array $arguments = [])
     {
         $this->arguments = [];
         $this->requiredCount = 0;
-        $this->hasOptional = false;
-        $this->hasAnArrayArgument = false;
+        $this->lastOptionalArgument = null;
+        $this->lastArrayArgument = null;
         $this->addArguments($arguments);
     }
 
@@ -100,22 +100,22 @@ public function addArgument(InputArgument $argument)
             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 @@ public function getArguments()
      */
     public function getArgumentCount()
     {
-        return $this->hasAnArrayArgument ? \PHP_INT_MAX : \count($this->arguments);
+        return null !== $this->lastArrayArgument ? \PHP_INT_MAX : \count($this->arguments);
     }
 
     /**
 
@@ -101,7 +101,7 @@ public function testArgumentsMustHaveDifferentNames()
     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 @@ public function testArrayArgumentHasToBeLast()
 
     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);
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ class InputDefinition`
`30`	`30`	`{`
`31`	`31`	`private $arguments;`
`32`	`32`	`private $requiredCount;`
`33`		`- private $hasAnArrayArgument = false;`
`34`		`- private $hasOptional;`
	`33`	`+ private $lastArrayArgument;`
	`34`	`+ private $lastOptionalArgument;`
`35`	`35`	`private $options;`
`36`	`36`	`private $negations;`
`37`	`37`	`private $shortcuts;`
`@@ -72,8 +72,8 @@ public function setArguments(array $arguments = [])`
`72`	`72`	`{`
`73`	`73`	`$this->arguments = [];`
`74`	`74`	`$this->requiredCount = 0;`
`75`		`- $this->hasOptional = false;`
`76`		`- $this->hasAnArrayArgument = false;`
	`75`	`+ $this->lastOptionalArgument = null;`
	`76`	`+ $this->lastArrayArgument = null;`
`77`	`77`	`$this->addArguments($arguments);`
`78`	`78`	`}`
`79`	`79`
`@@ -100,22 +100,22 @@ public function addArgument(InputArgument $argument)`
`100`	`100`	`throw new LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName()));`
`101`	`101`	`}`
`102`	`102`
`103`		`- if ($this->hasAnArrayArgument) {`
`104`		`- throw new LogicException('Cannot add an argument after an array argument.');`
	`103`	`+ if (null !== $this->lastArrayArgument) {`
	`104`	`+ throw new LogicException(sprintf('Cannot add a required argument "%s" after an array argument "%s".', $argument->getName(), $this->lastArrayArgument->getName()));`
`105`	`105`	`}`
`106`	`106`
`107`		`- if ($argument->isRequired() && $this->hasOptional) {`
`108`		`- throw new LogicException('Cannot add a required argument after an optional one.');`
	`107`	`+ if ($argument->isRequired() && null !== $this->lastOptionalArgument) {`
	`108`	`+ throw new LogicException(sprintf('Cannot add a required argument "%s" after an optional one "%s".', $argument->getName(), $this->lastOptionalArgument->getName()));`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if ($argument->isArray()) {`
`112`		`- $this->hasAnArrayArgument = true;`
	`112`	`+ $this->lastArrayArgument = $argument;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if ($argument->isRequired()) {`
`116`	`116`	`++$this->requiredCount;`
`117`	`117`	`} else {`
`118`		`- $this->hasOptional = true;`
	`118`	`+ $this->lastOptionalArgument = $argument;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$this->arguments[$argument->getName()] = $argument;`
`@@ -172,7 +172,7 @@ public function getArguments()`
`172`	`172`	`*/`
`173`	`173`	`public function getArgumentCount()`
`174`	`174`	`{`
`175`		`- return $this->hasAnArrayArgument ? \PHP_INT_MAX : \count($this->arguments);`
	`175`	`+ return null !== $this->lastArrayArgument ? \PHP_INT_MAX : \count($this->arguments);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`/**`