minor #19446 [Console] Overcomplete argument exception message tweak. (SpacePossum)

fabpot · fabpot · commit bdfc2aa652c6 · 2016-07-28T13:56:28.000-04:00
This PR was squashed before being merged into the 2.7 branch (closes #19446). Discussion ---------- [Console] Overcomplete argument exception message tweak. | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Updates the exception message when to many arguments are passed. From; ```php 'Too many arguments.' ``` To: ```php 'No argument expected, got "foo".' // or 'Too many arguments, expected arguments "foo".' // or 'Too many arguments, expected arguments "foo, bar".' // ... turtles all the way down ``` Commits ------- 7af59cd [Console] Overcomplete argument exception message tweak.
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -174,7 +174,12 @@ private function parseArgument($token)
 
         // unexpected argument
         } else {
-            throw new \RuntimeException('Too many arguments.');
+            $all = $this->definition->getArguments();
+            if (count($all)) {
+                throw new \RuntimeException(sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all))));
+            }
+
+            throw new \RuntimeException(sprintf('No arguments expected, got "%s".', $token));
         }
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -183,7 +183,17 @@ public function provideInvalidInput()
             array(
                 array('cli.php', 'foo', 'bar'),
                 new InputDefinition(),
-                'Too many arguments.',
+                'No arguments expected, got "foo".',
+            ),
+            array(
+                array('cli.php', 'foo', 'bar'),
+                new InputDefinition(array(new InputArgument('number'))),
+                'Too many arguments, expected arguments "number".',
+            ),
+            array(
+                array('cli.php', 'foo', 'bar', 'zzz'),
+                new InputDefinition(array(new InputArgument('number'), new InputArgument('county'))),
+                'Too many arguments, expected arguments "number" "county".',
             ),
             array(
                 array('cli.php', '--foo'),

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,12 @@ private function parseArgument($token)`
`174`	`174`
`175`	`175`	`// unexpected argument`
`176`	`176`	`} else {`
`177`		`- throw new \RuntimeException('Too many arguments.');`
	`177`	`+ $all = $this->definition->getArguments();`
	`178`	`+ if (count($all)) {`
	`179`	`+ throw new \RuntimeException(sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all))));`
	`180`	`+ }`
	`181`	`+`
	`182`	`+ throw new \RuntimeException(sprintf('No arguments expected, got "%s".', $token));`
`178`	`183`	`}`
`179`	`184`	`}`
`180`	`185`