Use argument types as parameter types for inline closures (#7798) by leongersen · Pull Request #1628 · phpstan/phpstan-src

leongersen · 2022-08-16T15:29:33Z

Implements #7798. Thank you for your advise, it was very helpful.

The relevant code for this in NodeScopeResolver is this but you won't have to touch that for this feature request, it works in a general sense:

phpstan-src/src/Analyser/NodeScopeResolver.php

Lines 2964 to 2975 in 4b6d964

if ($passedToType instanceof UnionType) {

$passedToType = TypeCombinator::union(...array_filter(

$passedToType->getTypes(),

static fn (Type $type) => $type->isCallable()->yes(),

));

}

$callableParameters = null;

$acceptors = $passedToType->getCallableParametersAcceptors($scope);

if (count($acceptors) === 1) {

$callableParameters = $acceptors[0]->getParameters();

}

This unfortunately is not used for this case; $passedToType is only passed to processClosureNode when handling a closure as a function argument:

phpstan-src/src/Analyser/NodeScopeResolver.php

Lines 3223 to 3226 in 4b6d964

    
           if ($arg->value instanceof Expr\Closure) { 
        
           	$this->callNodeCallbackWithExpression($nodeCallback, $arg->value, $scopeToPass, $context); 
        
           	$result = $this->processClosureNode($arg->value, $scopeToPass, $nodeCallback, $context, $parameterType ?? null); 
        
           } elseif ($arg->value instanceof Expr\ArrowFunction) {

phpstan-src/src/Analyser/NodeScopeResolver.php

Lines 2220 to 2221 in 4b6d964

    
           	return $this->processClosureNode($expr, $scope, $nodeCallback, $context, null); 
        
           } elseif ($expr instanceof Expr\ClosureUse) {

Because the closure is never the argument (it is the name of the FuncCall), this case is slightly different than for array_map, as the Expr\Closure is never handled by ParametersAcceptorSelector::selectFromArgs (only its ClosureType is).

Please let me know if I misunderstood.

ondrejmirtes

This is really nicce and almost perfect! The only thing missing is that you should also test and make sure it works for arrow functions :) Please add another gathered file in NodeScopeResolverTest, but only for PHP_VERSION_ID >= 70400.

leongersen · 2022-08-17T06:52:22Z

Thanks for the feedback, much appreciated. I've now added support and tests for arrow functions as well.

I've duplicated the logic and added another NodeVisitor, as processArrowFunctionNode duplicates logic from processClosureNode. If you'd like it abstracted I can of course do that.

ondrejmirtes · 2022-08-17T11:46:29Z

Thank you!

The functionality was introduced in phpstan#1628. It works. But as soon as you use an inline assign expression it breaks. Let's support this case too. Sometimes, you want to call something inline and also use the callback later.

The functionality was introduced in #1628. It works. But as soon as you use an inline assign expression it breaks. Let's support this case too. Sometimes, you want to call something inline and also use the callback later.

ondrejmirtes requested changes Aug 16, 2022

View reviewed changes

Use argument types as parameter types for inline closures (#7798)

366e330

leongersen force-pushed the closure-argument-type branch from 019b63d to 366e330 Compare August 17, 2022 06:51

ondrejmirtes approved these changes Aug 17, 2022

View reviewed changes

ondrejmirtes merged commit 3dbb89e into phpstan:1.8.x Aug 17, 2022

ondrejmirtes mentioned this pull request Aug 17, 2022

Feature request: Carry types into invoked callable/closure phpstan/phpstan#7798

Closed

leongersen deleted the closure-argument-type branch August 17, 2022 12:01

ondrejmirtes mentioned this pull request Aug 17, 2022

Immediately-invoked function expression miss types from collection phpstan/phpstan#3846

Closed

leofeyer mentioned this pull request Sep 28, 2022

First-class callable error since PHPStan 1.8.3 phpstan/phpstan#8078

Closed

ruudk mentioned this pull request Oct 8, 2024

Use argument types as parameter types for inline closures when assigned #3554

Merged

ruudk mentioned this pull request Oct 9, 2024

Modifying a parameter passed by reference in Immediately Invoked Function Expression results in mixed on param out phpstan/phpstan#11824

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use argument types as parameter types for inline closures (#7798)#1628

Use argument types as parameter types for inline closures (#7798)#1628
ondrejmirtes merged 1 commit intophpstan:1.8.xfrom
leongersen:closure-argument-type

leongersen commented Aug 16, 2022 •

edited

Loading

Uh oh!

ondrejmirtes left a comment

Uh oh!

leongersen commented Aug 17, 2022

Uh oh!

ondrejmirtes commented Aug 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	if ($passedToType instanceof UnionType) {
	$passedToType = TypeCombinator::union(...array_filter(
	$passedToType->getTypes(),
	static fn (Type $type) => $type->isCallable()->yes(),
	));
	}

	$callableParameters = null;
	$acceptors = $passedToType->getCallableParametersAcceptors($scope);
	if (count($acceptors) === 1) {
	$callableParameters = $acceptors[0]->getParameters();
	}

	if ($arg->value instanceof Expr\Closure) {
	$this->callNodeCallbackWithExpression($nodeCallback, $arg->value, $scopeToPass, $context);
	$result = $this->processClosureNode($arg->value, $scopeToPass, $nodeCallback, $context, $parameterType ?? null);
	} elseif ($arg->value instanceof Expr\ArrowFunction) {

	return $this->processClosureNode($expr, $scope, $nodeCallback, $context, null);
	} elseif ($expr instanceof Expr\ClosureUse) {

Conversation

leongersen commented Aug 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ondrejmirtes left a comment

Choose a reason for hiding this comment

Uh oh!

leongersen commented Aug 17, 2022

Uh oh!

ondrejmirtes commented Aug 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

leongersen commented Aug 16, 2022 •

edited

Loading