apply parameter closure type extension in FunctionCallParametersCheck

conf/config.neon

@@ -672,6 +672,8 @@ services:
  -
  class: PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider
  factory: PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider
+ -
+ class: PHPStan\Type\ParameterClosureTypeHelper
 
  -
  class: PHPStan\File\FileHelper

src/Analyser/NodeScopeResolver.php

@@ -63,7 +63,6 @@
 use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
-use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
 use PHPStan\File\FileHelper;
 use PHPStan\File\FileReader;
@@ -171,6 +170,7 @@
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\StaticTypeFactory;
@@ -250,7 +250,7 @@ public function __construct(
  private readonly TypeSpecifier $typeSpecifier,
  private readonly DynamicThrowTypeExtensionProvider $dynamicThrowTypeExtensionProvider,
  private readonly ReadWritePropertiesExtensionProvider $readWritePropertiesExtensionProvider,
- private readonly ParameterClosureTypeExtensionProvider $parameterClosureTypeExtensionProvider,
+ private readonly ParameterClosureTypeHelper $parameterClosureTypeHelper,
  private readonly ScopeFactory $scopeFactory,
  private readonly bool $polluteScopeWithLoopInitialAssignments,
  private readonly bool $polluteScopeWithAlwaysIterableForeach,
@@ -4621,7 +4621,7 @@ private function processArgs(
  }
 
  if ($parameter !== null) {
- $overwritingParameterType = $this->getParameterTypeFromParameterClosureTypeExtension($callLike, $calleeReflection, $parameter, $scopeToPass);
+ $overwritingParameterType = $this->parameterClosureTypeHelper->getParameterTypeFromParameterClosureTypeExtension($callLike, $calleeReflection, $parameter, $scopeToPass);
 
  if ($overwritingParameterType !== null) {
  $parameterType = $overwritingParameterType;
@@ -4673,7 +4673,7 @@ private function processArgs(
  }
 
  if ($parameter !== null) {
- $overwritingParameterType = $this->getParameterTypeFromParameterClosureTypeExtension($callLike, $calleeReflection, $parameter, $scopeToPass);
+ $overwritingParameterType = $this->parameterClosureTypeHelper->getParameterTypeFromParameterClosureTypeExtension($callLike, $calleeReflection, $parameter, $scopeToPass);
 
  if ($overwritingParameterType !== null) {
  $parameterType = $overwritingParameterType;
@@ -4820,36 +4820,6 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
  return new ExpressionResult($scope, $hasYield, $throwPoints, $impurePoints);
  }
 
- /**
- * @param MethodReflection|FunctionReflection|null $calleeReflection
- */
- private function getParameterTypeFromParameterClosureTypeExtension(CallLike $callLike, $calleeReflection, ParameterReflection $parameter, MutatingScope $scope): ?Type
- {
- if ($callLike instanceof FuncCall && $calleeReflection instanceof FunctionReflection) {
- foreach ($this->parameterClosureTypeExtensionProvider->getFunctionParameterClosureTypeExtensions() as $functionParameterClosureTypeExtension) {
- if ($functionParameterClosureTypeExtension->isFunctionSupported($calleeReflection, $parameter)) {
- return $functionParameterClosureTypeExtension->getTypeFromFunctionCall($calleeReflection, $callLike, $parameter, $scope);
- }
- }
- } elseif ($calleeReflection instanceof MethodReflection) {
- if ($callLike instanceof StaticCall) {
- foreach ($this->parameterClosureTypeExtensionProvider->getStaticMethodParameterClosureTypeExtensions() as $staticMethodParameterClosureTypeExtension) {
- if ($staticMethodParameterClosureTypeExtension->isStaticMethodSupported($calleeReflection, $parameter)) {
- return $staticMethodParameterClosureTypeExtension->getTypeFromStaticMethodCall($calleeReflection, $callLike, $parameter, $scope);
- }
- }
- } elseif ($callLike instanceof MethodCall) {
- foreach ($this->parameterClosureTypeExtensionProvider->getMethodParameterClosureTypeExtensions() as $methodParameterClosureTypeExtension) {
- if ($methodParameterClosureTypeExtension->isMethodSupported($calleeReflection, $parameter)) {
- return $methodParameterClosureTypeExtension->getTypeFromMethodCall($calleeReflection, $callLike, $parameter, $scope);
- }
- }
- }
- }
-
- return null;
- }
-
  /**
  * @param MethodReflection|FunctionReflection|null $calleeReflection
  */

src/Rules/AttributesCheck.php

@@ -155,6 +155,7 @@ public function check(
  ],
  'attribute',
  $attributeConstructor->acceptsNamedArguments(),
+ $attributeConstructor,
  );
 
  foreach ($parameterErrors as $error) {

src/Rules/Classes/InstantiationRule.php

@@ -220,6 +220,7 @@ private function checkClassName(string $class, bool $isName, Node $node, Scope $
  ],
  'new',
  $constructorReflection->acceptsNamedArguments(),
+ $constructorReflection,
  ));
  }
 

src/Rules/FunctionCallParametersCheck.php

@@ -7,6 +7,8 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
 use PHPStan\Reflection\ParametersAcceptor;
@@ -20,6 +22,7 @@
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\NeverType;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeTraverser;
@@ -42,6 +45,7 @@ public function __construct(
  private PhpVersion $phpVersion,
  private UnresolvableTypeHelper $unresolvableTypeHelper,
  private PropertyReflectionFinder $propertyReflectionFinder,
+ private ParameterClosureTypeHelper $parameterClosureTypeHelper,
  private bool $checkArgumentTypes,
  private bool $checkArgumentsPassedByReference,
  private bool $checkExtraArguments,
@@ -55,6 +59,7 @@ public function __construct(
  * @param Node\Expr\FuncCall|Node\Expr\MethodCall|Node\Expr\StaticCall|Node\Expr\New_ $funcCall
  * @param array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string, 6: string, 7: string, 8: string, 9: string, 10: string, 11: string, 12: string, 13?: string, 14?: string} $messages
  * @param 'attribute'|'callable'|'method'|'staticMethod'|'function'|'new' $nodeType
+ * @param MethodReflection|FunctionReflection|null $callReflection
  * @return list<IdentifierRuleError>
  */
  public function check(
@@ -65,6 +70,7 @@ public function check(
  array $messages,
  string $nodeType = 'function',
  bool $acceptsNamedArguments = true,
+ $callReflection = null,
  ): array
  {
  $functionParametersMinCount = 0;
@@ -311,7 +317,13 @@ public function check(
  }
 
  if ($this->checkArgumentTypes) {
- $parameterType = TypeUtils::resolveLateResolvableTypes($parameter->getType());
+ $parameterType = $this->parameterClosureTypeHelper->getParameterTypeFromParameterClosureTypeExtension(
+ $funcCall,
+ $callReflection,
+ $parameter,
+ $scope,
+ ) ?? $parameter->getType();
+ $parameterType = TypeUtils::resolveLateResolvableTypes($parameterType);
 
  if (
  !$parameter->passedByReference()->createsNewVariable()

src/Rules/Functions/CallToFunctionParametersRule.php

@@ -68,6 +68,7 @@ public function processNode(Node $node, Scope $scope): array
  ],
  'function',
  $function->acceptsNamedArguments(),
+ $function,
  );
  }
 

src/Rules/Methods/CallMethodsRule.php

@@ -74,6 +74,7 @@ public function processNode(Node $node, Scope $scope): array
  ],
  'method',
  $methodReflection->acceptsNamedArguments(),
+ $methodReflection,
  ));
  }
 

src/Rules/Methods/CallStaticMethodsRule.php

@@ -82,6 +82,7 @@ public function processNode(Node $node, Scope $scope): array
  ],
  'staticMethod',
  $method->acceptsNamedArguments(),
+ $method,
  ));
 
  return $errors;

src/Testing/RuleTestCase.php

@@ -16,7 +16,6 @@
 use PHPStan\Collectors\Registry as CollectorRegistry;
 use PHPStan\Dependency\DependencyResolver;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
-use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
 use PHPStan\File\FileHelper;
 use PHPStan\Php\PhpVersion;
@@ -30,6 +29,7 @@
 use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Type\FileTypeMapper;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use function array_map;
 use function count;
 use function implode;
@@ -95,7 +95,7 @@ private function getAnalyser(DirectRuleRegistry $ruleRegistry): Analyser
  $typeSpecifier,
  self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
  $readWritePropertiesExtensions !== [] ? new DirectReadWritePropertiesExtensionProvider($readWritePropertiesExtensions) : self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
- self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
  self::createScopeFactory($reflectionProvider, $typeSpecifier),
  $this->shouldPolluteScopeWithLoopInitialAssignments(),
  $this->shouldPolluteScopeWithAlwaysIterableForeach(),

src/Testing/TypeInferenceTestCase.php

@@ -9,7 +9,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\ScopeContext;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
-use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
 use PHPStan\File\FileHelper;
 use PHPStan\File\SystemAgnosticSimpleRelativePathHelper;
@@ -22,6 +21,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\FileTypeMapper;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use PHPStan\Type\Type;
 use PHPStan\Type\VerbosityLevel;
 use Symfony\Component\Finder\Finder;
@@ -75,7 +75,7 @@ public static function processFile(
  $typeSpecifier,
  self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
  self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
- self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
  self::createScopeFactory($reflectionProvider, $typeSpecifier),
  self::getContainer()->getParameter('polluteScopeWithLoopInitialAssignments'),
  self::getContainer()->getParameter('polluteScopeWithAlwaysIterableForeach'),

src/Type/ParameterClosureTypeHelper.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type;
+
+use PhpParser\Node\Expr\CallLike;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParameterReflection;
+
+final class ParameterClosureTypeHelper
+{
+
+ public function __construct(private readonly ParameterClosureTypeExtensionProvider $parameterClosureTypeExtensionProvider)
+ {
+ }
+
+ /**
+ * @param MethodReflection|FunctionReflection|null $calleeReflection
+ */
+ public function getParameterTypeFromParameterClosureTypeExtension(CallLike $callLike, $calleeReflection, ParameterReflection $parameter, Scope $scope): ?Type
+ {
+ if ($callLike instanceof FuncCall && $calleeReflection instanceof FunctionReflection) {
+ foreach ($this->parameterClosureTypeExtensionProvider->getFunctionParameterClosureTypeExtensions() as $functionParameterClosureTypeExtension) {
+ if ($functionParameterClosureTypeExtension->isFunctionSupported($calleeReflection, $parameter)) {
+ return $functionParameterClosureTypeExtension->getTypeFromFunctionCall($calleeReflection, $callLike, $parameter, $scope);
+ }
+ }
+ } elseif ($calleeReflection instanceof MethodReflection) {
+ if ($callLike instanceof StaticCall) {
+ foreach ($this->parameterClosureTypeExtensionProvider->getStaticMethodParameterClosureTypeExtensions() as $staticMethodParameterClosureTypeExtension) {
+ if ($staticMethodParameterClosureTypeExtension->isStaticMethodSupported($calleeReflection, $parameter)) {
+ return $staticMethodParameterClosureTypeExtension->getTypeFromStaticMethodCall($calleeReflection, $callLike, $parameter, $scope);
+ }
+ }
+ } elseif ($callLike instanceof MethodCall) {
+ foreach ($this->parameterClosureTypeExtensionProvider->getMethodParameterClosureTypeExtensions() as $methodParameterClosureTypeExtension) {
+ if ($methodParameterClosureTypeExtension->isMethodSupported($calleeReflection, $parameter)) {
+ return $methodParameterClosureTypeExtension->getTypeFromMethodCall($calleeReflection, $callLike, $parameter, $scope);
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+}

src/Type/Php/PregReplaceCallbackClosureTypeExtension.php

@@ -8,7 +8,7 @@
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\ClosureType;
+use PHPStan\Type\CallableType;
 use PHPStan\Type\FunctionParameterClosureTypeExtension;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -49,7 +49,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
  return null;
  }
 
- return new ClosureType(
+ return new CallableType(
  [
  new NativeParameterReflection($parameter->getName(), $parameter->isOptional(), $matchesType, $parameter->passedByReference(), $parameter->isVariadic(), $parameter->getDefaultValue()),
  ],

tests/PHPStan/Analyser/AnalyserTest.php

@@ -11,7 +11,6 @@
 use PHPStan\Dependency\DependencyResolver;
 use PHPStan\Dependency\ExportedNodeResolver;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
-use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
 use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Node\Printer\Printer;
@@ -26,6 +25,7 @@
 use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\FileTypeMapper;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use stdClass;
 use function array_map;
 use function array_merge;
@@ -731,7 +731,7 @@ private function createAnalyser(bool $enableIgnoreErrorsWithinPhpDocs): Analyser
  $typeSpecifier,
  self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
  self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
- self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
  self::createScopeFactory($reflectionProvider, $typeSpecifier),
  false,
  true,

tests/PHPStan/Analyser/Bug9307CallMethodsRuleTest.php

@@ -12,6 +12,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use const PHP_VERSION_ID;
 
 /**
@@ -26,7 +27,19 @@ protected function getRule(): Rule
  $ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, false, true, true, false, true, false);
  return new CallMethodsRule(
  new MethodCallCheck($reflectionProvider, $ruleLevelHelper, true, true),
- new FunctionCallParametersCheck($ruleLevelHelper, new NullsafeCheck(), new PhpVersion(PHP_VERSION_ID), new UnresolvableTypeHelper(), new PropertyReflectionFinder(), true, true, true, true, true),
+ new FunctionCallParametersCheck(
+ $ruleLevelHelper,
+ new NullsafeCheck(),
+ new PhpVersion(PHP_VERSION_ID),
+ new UnresolvableTypeHelper(),
+ new PropertyReflectionFinder(),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
+ true,
+ true,
+ true,
+ true,
+ true,
+ ),
  );
  }
 

tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php

@@ -14,6 +14,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\ParameterClosureTypeHelper;
 use const PHP_VERSION_ID;
 
 /**
@@ -34,6 +35,7 @@ protected function getRule(): Rule
  new PhpVersion(80000),
  new UnresolvableTypeHelper(),
  new PropertyReflectionFinder(),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
  true,
  true,
  true,

tests/PHPStan/Rules/Classes/ClassConstantAttributesRuleTest.php

@@ -14,6 +14,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\ParameterClosureTypeHelper;
 
 /**
  * @extends RuleTestCase<ClassConstantAttributesRule>
@@ -33,6 +34,7 @@ protected function getRule(): Rule
  new PhpVersion(80000),
  new UnresolvableTypeHelper(),
  new PropertyReflectionFinder(),
+ self::getContainer()->getByType(ParameterClosureTypeHelper::class),
  true,
  true,
  true,