Fix invalid option default argument

phpstan · May 12, 2019 · c4da70e · c4da70e
1 parent 1f1527e
commit c4da70e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/Rules/Symfony/InvalidOptionDefaultValueRule.php b/src/Rules/Symfony/InvalidOptionDefaultValueRule.php
@@ -11,6 +11,7 @@
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
@@ -76,8 +77,8 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		// is array
-		if (($mode & 8) === 8 && !(new UnionType([new ArrayType(new IntegerType(), new StringType()), new NullType()]))->isSuperTypeOf($defaultType)->yes()) {
-			return [sprintf('Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<int, string>|null, %s given.', $defaultType->describe(VerbosityLevel::typeOnly()))];
+		if (($mode & 8) === 8 && !(new UnionType([new ArrayType(new MixedType(), new StringType()), new NullType()]))->isSuperTypeOf($defaultType)->yes()) {
+			return [sprintf('Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<string>|null, %s given.', $defaultType->describe(VerbosityLevel::typeOnly()))];
 		}
 
 		return [];

diff --git a/tests/Rules/Symfony/ExampleCommand.php b/tests/Rules/Symfony/ExampleCommand.php
@@ -29,6 +29,10 @@ protected function configure(): void
 		$this->addOption('b', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, '', [1]);
 		$this->addOption('c', null, InputOption::VALUE_OPTIONAL, '', 1);
 		$this->addOption('d', null, InputOption::VALUE_OPTIONAL, '', false);
+
+		/** @var string[] $defaults */
+		$defaults = [];
+		$this->addOption('e', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, '', $defaults);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int

diff --git a/tests/Rules/Symfony/InvalidOptionDefaultValueRuleTest.php b/tests/Rules/Symfony/InvalidOptionDefaultValueRuleTest.php
@@ -21,7 +21,7 @@ public function testGetArgument(): void
 			],
 			[
 				[
-					'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<int, string>|null, array<int, int> given.',
+					'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<string>|null, array<int, int> given.',
 					29,
 				],
 			]

diff --git a/tests/Rules/Symfony/UndefinedArgumentRuleTest.php b/tests/Rules/Symfony/UndefinedArgumentRuleTest.php
@@ -35,7 +35,7 @@ public function testGetArgument(): void
 			[
 				[
 					'Command "example-rule" does not define argument "undefined".',
-					37,
+					41,
 				],
 			]
 		);

diff --git a/tests/Rules/Symfony/UndefinedOptionRuleTest.php b/tests/Rules/Symfony/UndefinedOptionRuleTest.php
@@ -35,7 +35,7 @@ public function testGetArgument(): void
 			[
 				[
 					'Command "example-rule" does not define option "bbb".',
-					44,
+					48,
 				],
 			]
 		);
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ public function testGetArgument(): void @@
     			],
     			[
     				[
-    					'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<int, string>|null, array<int, int> given.',
+    					'Parameter #5 $default of method Symfony\Component\Console\Command\Command::addOption() expects array<string>|null, array<int, int> given.',
 ,
     				],
     			]
@@ Expand Down @@