PhpFunctionFromParserNodeReflection - fix optionality of parameters with default value followed by variadic parmaeters

ondrejmirtes · ondrejmirtes · commit e00262df46a7 · 2020-06-11T13:09:16.000+02:00
diff --git a/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php b/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php
@@ -142,7 +142,7 @@ private function getParameters(): array
 
 		/** @var \PhpParser\Node\Param $parameter */
 		foreach (array_reverse($this->functionLike->getParams()) as $parameter) {
-			if (!$isOptional || $parameter->default === null) {
+			if ($parameter->default === null && !$parameter->variadic) {
 				$isOptional = false;
 			}
 
@@ -151,7 +151,7 @@ private function getParameters(): array
 			}
 			$parameters[] = new PhpParameterFromParserNodeReflection(
 				$parameter->var->name,
-				$isOptional || $parameter->variadic,
+				$isOptional,
 				$this->realParameterTypes[$parameter->var->name],
 				$this->phpDocParameterTypes[$parameter->var->name] ?? null,
 				$parameter->byRef
diff --git a/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php b/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
@@ -330,4 +330,10 @@ public function testBug3403(int $phpVersion): void
 		$this->analyse([__DIR__ . '/data/bug-3403.php'], []);
 	}
 
+	public function testBug3443(): void
+	{
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->analyse([__DIR__ . '/data/bug-3443.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-3443.php b/tests/PHPStan/Rules/Methods/data/bug-3443.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug3443;
+
+/**
+ * Interface Collection.
+ */
+interface CollectionInterface
+{
+
+	/**
+	 * @param mixed $data
+	 * @param mixed ...$parameters
+	 *
+	 * @return mixed
+	 */
+	public static function with($data = [], ...$parameters);
+
+}
+
+
+/**
+ * Class Collection.
+ */
+final class Collection implements CollectionInterface
+{
+
+	public static function with($data = [], ...$parameters)
+	{
+		return new self();
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -330,4 +330,10 @@ public function testBug3403(int $phpVersion): void`
`330`	`330`	`$this->analyse([__DIR__ . '/data/bug-3403.php'], []);`
`331`	`331`	`}`
`332`	`332`
	`333`	`+ public function testBug3443(): void`
	`334`	`+ {`
	`335`	`+ $this->phpVersionId = PHP_VERSION_ID;`
	`336`	`+ $this->analyse([__DIR__ . '/data/bug-3443.php'], []);`
	`337`	`+ }`
	`338`	`+`
`333`	`339`	`}`