Commitef221e8

authored and

committed

[Console] Make error message more verbose

1 parent176f52d commitef221e8Copy full SHA for ef221e8

File tree

+26

-2

lines changed

src/Symfony/Component/Console
- Input
  - ArgvInput.php
- Tests/Input
  - ArgvInputTest.php

+26

-2

lines changed

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,25 @@ private function parseArgument(string $token)`
`165`	`165`	`// unexpected argument`
`166`	`166`	`}else {`
`167`	`167`	`$all =$this->definition->getArguments();`
	`168`	`+$symfonyCommandName =null;`
	`169`	`+if (($inputArgument =$all[$key =array_key_first($all)] ??null) &&'command' ===$inputArgument->getName()) {`
	`170`	`+$symfonyCommandName =$this->arguments['command'] ??null;`
	`171`	`+ unset($all[$key]);`
	`172`	`+ }`
	`173`	`+`
`168`	`174`	`if (\count($all)) {`
`169`		`-thrownewRuntimeException(sprintf('Too many arguments, expected arguments "%s".',implode('" "',array_keys($all))));`
	`175`	`+if ($symfonyCommandName) {`
	`176`	`+$message =sprintf('Too many arguments to "%s" command, expected arguments "%s".',$symfonyCommandName,implode('" "',array_keys($all)));`
	`177`	`+ }else {`
	`178`	`+$message =sprintf('Too many arguments, expected arguments "%s".',implode('" "',array_keys($all)));`
	`179`	`+ }`
	`180`	`+ }elseif ($symfonyCommandName) {`
	`181`	`+$message =sprintf('No arguments expected for "%s" command, got "%s".',$symfonyCommandName,$token);`
	`182`	`+ }else {`
	`183`	`+$message =sprintf('No arguments expected, got "%s".',$token);`
`170`	`184`	`}`
`171`	`185`
`172`		`-thrownewRuntimeException(sprintf('No arguments expected, got "%s".',$token));`
	`186`	`+thrownewRuntimeException($message);`
`173`	`187`	`}`
`174`	`188`	`}`
`175`	`189`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,16 @@ public function provideInvalidInput()`
`247`	`247`	`newInputDefinition([newInputOption('foo','f', InputOption::VALUE_NONE)]),`
`248`	`248`	`'The "-Щ" option does not exist.',`
`249`	`249`	`],`
	`250`	`+ [`
	`251`	`+ ['cli.php','acme:foo','bar'],`
	`252`	`+newInputDefinition([newInputArgument('command', InputArgument::REQUIRED)]),`
	`253`	`+'No arguments expected for "acme:foo" command, got "bar"',`
	`254`	`+ ],`
	`255`	`+ [`
	`256`	`+ ['cli.php','acme:foo','bar'],`
	`257`	`+newInputDefinition([newInputArgument('name', InputArgument::REQUIRED)]),`
	`258`	`+'Too many arguments, expected arguments "name".',`
	`259`	`+ ],`
`250`	`260`	`];`
`251`	`261`	`}`
`252`	`262`

Comments

(0)