Named arguments - fix optional arguments and variadics

phpstan · Apr 4, 2021 · 3e5621e · 3e5621e
1 parent f2ecdac
commit 3e5621e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
+use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ResolvedFunctionVariant;
 use PHPStan\Type\ErrorType;
@@ -409,8 +410,11 @@ private function processArguments(
 				$namedArgumentAlreadyOccurred = true;
 
 				$parametersCount = count($parameters);
+				$requiredParametersByName = array_filter($unusedParametersByName, static function (ParameterReflection $parameter): bool {
+					return !$parameter->isOptional();
+				});
 				if (
-					count($unusedParametersByName) !== 0
+					count($requiredParametersByName) !== 0
 					|| !$parametersAcceptor->isVariadic()
 					|| $parametersCount <= 0
 					|| $isBuiltin

diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1903,4 +1903,17 @@ public function testBug3546(): void
 		$this->analyse([__DIR__ . '/data/bug-3546.php'], []);
 	}
 
+	public function testBug4800(): void
+	{
+		if (!self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires static reflection.');
+		}
+
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->phpVersion = 80000;
+		$this->analyse([__DIR__ . '/data/bug-4800.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-4800.php b/tests/PHPStan/Rules/Methods/data/bug-4800.php
@@ -0,0 +1,20 @@
+<?php // lint >= 8.0
+
+namespace Bug4800;
+
+class HelloWorld
+{
+	/**
+	 * @param string|int ...$arguments
+	 */
+	public function a(string $bar = '', ...$arguments): string
+	{
+		return '';
+	}
+
+	public function b(): void
+	{
+		$this->a(bar: 'baz', foo: 'bar', c: 3);
+		$this->a(foo: 'bar', c: 3);
+	}
+}