Commit 1bd7c33

VincentLangletondrejmirtes

authored and

committed

Also support command argument and initialize method

1 parent bca27f1 commit 1bd7c33Copy full SHA for 1bd7c33

File tree

3 files changed

+35

-2

lines changed

src/Type/Symfony
- InputInterfaceGetArgumentDynamicReturnTypeExtension.php
- InputInterfaceHasArgumentDynamicReturnTypeExtension.php
tests/Type/Symfony/data
- ExampleBaseCommand.php

3 files changed

+35

-2

lines changed

`‎src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`89`	`89`	`if (`
`90`	`90`	`$canBeNullInInteract`
`91`	`91`	`&& $method instanceof MethodReflection`
`92`		`- && $method->getName() === 'interact'`
	`92`	`+ && ($method->getName() === 'interact' \|\| $method->getName() === 'initialize')`
`93`	`93`	`&& in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)`
`94`	`94`	`) {`
`95`	`95`	`$argTypes[] = new NullType();`

`‎src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use PHPStan\Type\TypeUtils;`
`14`	`14`	`use function array_unique;`
`15`	`15`	`use function count;`
	`16`	`+use function in_array;`
`16`	`17`
`17`	`18`	`final class InputInterfaceHasArgumentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension`
`18`	`19`	`{`
`@@ -52,6 +53,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`52`	`53`	`}`
`53`	`54`	`$argName = $argStrings[0]->getValue();`
`54`	`55`
	`56`	`+ if ($argName === 'command') {`
	`57`	`+ $method = $scope->getFunction();`
	`58`	`+ if (`
	`59`	`+ $method instanceof MethodReflection`
	`60`	`+ && ($method->getName() === 'interact' \|\| $method->getName() === 'initialize')`
	`61`	`+ && in_array('Symfony\Component\Console\Command\Command', $method->getDeclaringClass()->getParentClassesNames(), true)`
	`62`	`+ ) {`
	`63`	`+ return null;`
	`64`	`+ }`
	`65`	`+ }`
	`66`	`+`
`55`	`67`	`$returnTypes = [];`
`56`	`68`	`foreach ($this->consoleApplicationResolver->findCommands($classReflection) as $command) {`
`57`	`69`	`try {`

`‎tests/Type/Symfony/data/ExampleBaseCommand.php`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,26 @@ protected function configure(): void`
`19`	`19`	`$this->addArgument('base');`
`20`	`20`	`}`
`21`	`21`
`22`		`- protected function interact(InputInterface $input, OutputInterface $output): int`
	`22`	`+ protected function initialize(InputInterface $input, OutputInterface $output): void`
`23`	`23`	`{`
	`24`	`+ assertType('bool', $input->hasArgument('command'));`
	`25`	`+ assertType('string\|null', $input->getArgument('command'));`
	`26`	`+`
	`27`	`+ assertType('string\|null', $input->getArgument('base'));`
	`28`	`+ assertType('string', $input->getArgument('aaa'));`
	`29`	`+ assertType('string', $input->getArgument('bbb'));`
	`30`	`+ assertType('string\|null', $input->getArgument('required'));`
	`31`	`+ assertType('array<int, string>\|string', $input->getArgument('diff'));`
	`32`	`+ assertType('array<int, string>', $input->getArgument('arr'));`
	`33`	`+ assertType('string\|null', $input->getArgument('both'));`
	`34`	`+ assertType('Symfony\Component\Console\Helper\QuestionHelper', $this->getHelper('question'));`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ protected function interact(InputInterface $input, OutputInterface $output): void`
	`38`	`+ {`
	`39`	`+ assertType('bool', $input->hasArgument('command'));`
	`40`	`+ assertType('string\|null', $input->getArgument('command'));`
	`41`	`+`
`24`	`42`	`assertType('string\|null', $input->getArgument('base'));`
`25`	`43`	`assertType('string', $input->getArgument('aaa'));`
`26`	`44`	`assertType('string', $input->getArgument('bbb'));`
`@@ -33,6 +51,9 @@ protected function interact(InputInterface $input, OutputInterface $output): int`
`33`	`51`
`34`	`52`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`35`	`53`	`{`
	`54`	`+ assertType('true', $input->hasArgument('command'));`
	`55`	`+ assertType('string', $input->getArgument('command'));`
	`56`	`+`
`36`	`57`	`assertType('string\|null', $input->getArgument('base'));`
`37`	`58`	`assertType('string', $input->getArgument('aaa'));`
`38`	`59`	`assertType('string', $input->getArgument('bbb'));`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1bd7c33

File tree

3 files changed

3 files changed

`‎src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php`

`‎src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php`

`‎tests/Type/Symfony/data/ExampleBaseCommand.php`

0 commit comments