fix: apply dynamic parameter type extensions in FunctionCallParametersCheck

Author: calebdw

e2e/parameter-type-extension/phpstan-baseline.neon

@@ -1,5 +1,3 @@
-includes:
-	- phpstan-baseline.neon
 parameters:
 	level: 9
 	paths:

e2e/parameter-type-extension/phpstan.neon.dist

@@ -12,6 +12,8 @@
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ConstantReflection;
 use PHPStan\Reflection\ExtendedParameterReflection;
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ReflectionProvider;
@@ -23,6 +25,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\ConditionalType;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\DynamicParameterTypeResolver;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\IntegerRangeType;
@@ -55,6 +58,7 @@ public function __construct(
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
 		private PropertyReflectionFinder $propertyReflectionFinder,
 		private ReflectionProvider $reflectionProvider,
+		private DynamicParameterTypeResolver $dynamicParameterTypeResolver,
 		#[AutowiredParameter(ref: '%checkFunctionArgumentTypes%')]
 		private bool $checkArgumentTypes,
 		#[AutowiredParameter]
@@ -98,6 +102,7 @@ public function check(
 		string $exclusiveConstantsMessage,
 		string $bitmaskNotAllowedMessage,
 		?array $renamedNamedArgumentParameterData,
+		MethodReflection|FunctionReflection|null $calleeReflection = null,
 	): array
 	{
 		if ($funcCall instanceof Node\Expr\MethodCall || $funcCall instanceof Node\Expr\StaticCall || $funcCall instanceof Node\Expr\FuncCall) {
@@ -391,6 +396,15 @@ public function check(
 			if ($this->checkArgumentTypes) {
 				$parameterType = TypeUtils::resolveLateResolvableTypes($parameter->getType());
 
+				// judge the argument against the type the extensions announced for
+				// the parameter, which is what NodeScopeResolver walked it with
+				if (!$funcCall instanceof Node\Expr\New_) {
+					$overriddenType = $this->dynamicParameterTypeResolver->resolve($funcCall, $calleeReflection, $parameter, $scope);
+					if ($overriddenType !== null) {
+						$parameterType = $overriddenType;
+					}
+				}
+
 				if (
 					!$parameter->passedByReference()->createsNewVariable()
 					|| (!$isBuiltin && !$argumentValueType instanceof ErrorType)

src/Rules/FunctionCallParametersCheck.php

@@ -74,6 +74,7 @@ public function processNode(Node $node, Scope&NodeCallbackInvoker&CollectedDataE
 			'Constants %s cannot be combined for %s of function ' . $functionName . '.',
 			'Combining constants with | is not allowed for %s of function ' . $functionName . '.',
 			null,
+			$function,
 		);
 	}
 

src/Rules/Functions/CallToFunctionParametersRule.php

@@ -108,6 +108,7 @@ private function processSingleMethodCall(Scope&NodeCallbackInvoker&CollectedData
 				$declaringClass->getName(),
 				$methodReflection->getName(),
 			] : null,
+			$methodReflection,
 		));
 	}
 

src/Rules/Methods/CallMethodsRule.php

@@ -114,6 +114,7 @@ private function processSingleMethodCall(Scope&NodeCallbackInvoker&CollectedData
 			'Constants %s cannot be combined for %s of ' . $lowercasedMethodName . '.',
 			'Combining constants with | is not allowed for %s of ' . $lowercasedMethodName . '.',
 			null,
+			$method,
 		));
 
 		return $errors;

src/Rules/Methods/CallStaticMethodsRule.php

@@ -11,6 +11,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\DynamicParameterTypeResolver;
 
 /**
  * @extends RuleTestCase<CallMethodsRule>
@@ -44,6 +45,7 @@ protected function getRule(): Rule
 				new UnresolvableTypeHelper(),
 				new PropertyReflectionFinder(),
 				$reflectionProvider,
+				self::getContainer()->getByType(DynamicParameterTypeResolver::class),
 				checkArgumentTypes: true,
 				checkArgumentsPassedByReference: true,
 				checkExtraArguments: true,

tests/PHPStan/Analyser/Bug9307CallMethodsRuleTest.php

@@ -15,6 +15,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\DynamicParameterTypeResolver;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 
 /**
@@ -49,6 +50,7 @@ protected function getRule(): Rule
 					new UnresolvableTypeHelper(),
 					new PropertyReflectionFinder(),
 					$reflectionProvider,
+					self::getContainer()->getByType(DynamicParameterTypeResolver::class),
 					checkArgumentTypes: true,
 					checkArgumentsPassedByReference: true,
 					checkExtraArguments: true,

tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php

@@ -15,6 +15,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\DynamicParameterTypeResolver;
 
 /**
  * @extends RuleTestCase<ClassConstantAttributesRule>
@@ -44,6 +45,7 @@ protected function getRule(): Rule
 					new UnresolvableTypeHelper(),
 					new PropertyReflectionFinder(),
 					$reflectionProvider,
+					self::getContainer()->getByType(DynamicParameterTypeResolver::class),
 					checkArgumentTypes: true,
 					checkArgumentsPassedByReference: true,
 					checkExtraArguments: true,

tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php

@@ -15,6 +15,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\DynamicParameterTypeResolver;
 use function array_merge;
 
 /**
@@ -46,6 +47,7 @@ protected function getRule(): Rule
 				new UnresolvableTypeHelper(),
 				new PropertyReflectionFinder(),
 				$reflectionProvider,
+				self::getContainer()->getByType(DynamicParameterTypeResolver::class),
 				checkArgumentTypes: true,
 				checkArgumentsPassedByReference: true,
 				checkExtraArguments: true,