Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Fixture;

final class AttributeOnClosureAndArrowFunction
{
public function run()
{
$closure = #[\Closure(class: 'Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Source\AnotherClass')] function () {
};

return new \stdClass(#[\Closure(class: 'Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Source\AnotherClass')] fn () => 1);
}
}

?>
-----
<?php

namespace Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Fixture;

final class AttributeOnClosureAndArrowFunction
{
public function run()
{
$closure = #[\Closure(class: \Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Source\AnotherClass::class)] function () {
};

return new \stdClass(#[\Closure(class: \Rector\Tests\Php55\Rector\String_\StringClassNameToClassConstantRector\Source\AnotherClass::class)] fn () => 1);
}
}

?>
33 changes: 33 additions & 0 deletions src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\AssignRef;
Expand All @@ -20,6 +21,7 @@
use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\Clone_;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\Empty_;
use PhpParser\Node\Expr\ErrorSuppress;
Expand Down Expand Up @@ -378,6 +380,11 @@ private function fillScope(array $stmts, string $filePath, MutatingScope $scope)

return;
}

// PHPStan does not process attributes of closures and arrow functions
if (($node instanceof Closure || $node instanceof ArrowFunction) && $node->attrGroups !== []) {
$this->processClosureAttributeGroups($node, $mutatingScope, $nodeCallback);
}
};

try {
Expand Down Expand Up @@ -416,6 +423,32 @@ private function processIssetOrUnset(Isset_|Unset_ $node, MutatingScope $mutatin
}
}

/**
* @param callable(Node $node, MutatingScope $scope): void $nodeCallback
*/
private function processClosureAttributeGroups(
Closure|ArrowFunction $node,
MutatingScope $mutatingScope,
callable $nodeCallback
): void {
$argExpressions = [];
foreach ($node->attrGroups as $attrGroup) {
$attrGroup->setAttribute(AttributeKey::SCOPE, $mutatingScope);

foreach ($attrGroup->attrs as $attr) {
$attr->setAttribute(AttributeKey::SCOPE, $mutatingScope);
$attr->name->setAttribute(AttributeKey::SCOPE, $mutatingScope);

foreach ($attr->args as $arg) {
$arg->setAttribute(AttributeKey::SCOPE, $mutatingScope);
$argExpressions[] = new Expression($arg->value);
}
}
}

$this->nodeScopeResolverProcessNodes($argExpressions, $mutatingScope, $nodeCallback);
}

private function processEcho(Echo_ $echo, MutatingScope $mutatingScope): void
{
foreach ($echo->exprs as $expr) {
Expand Down
Loading