Skip to content

[CodeQuality] Handle crash on variable variable on OptionalParametersAfterRequiredRector #4226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsonasik merged 5 commits into from
Jun 14, 2023
Merged

[CodeQuality] Handle crash on variable variable on OptionalParametersAfterRequiredRector #4226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcfe20c
[CodeQuality] Handle crash on variable variable on OptionalParameters…
samsonasik Jun 14, 2023
2bcb914
Fixed :tada:
samsonasik Jun 14, 2023
238aaac
Final touch: handle multiple assign
samsonasik Jun 14, 2023
7d37fc3
fixture
samsonasik Jun 14, 2023
afd8627
Final touch: clean up
samsonasik Jun 14, 2023
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
19 changes: 14 additions & 5 deletions packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\CallLike;
use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Ternary;
Expand Down Expand Up @@ -145,6 +146,19 @@ public function processNodes(
$node->expr->setAttribute(AttributeKey::SCOPE, $mutatingScope);
}

$expr = $node;
Copy link
Copy Markdown
Member Author

@samsonasik samsonasik Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this may need to be cloned to avoid object changed, ref https://3v4l.org/BU1O0

Copy link
Copy Markdown
Member Author

@samsonasik samsonasik Jun 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried debug after while, and it seems the object is followed, and target change is different with original node, so it actually ok, see https://3v4l.org/lR4mF

while ($expr instanceof Assign || $expr instanceof AssignOp) {
if ($expr->expr instanceof CallLike && ! $expr->expr->isFirstClassCallable()) {
foreach ($expr->expr->getArgs() as $arg) {
$arg->value->setAttribute(AttributeKey::SCOPE, $mutatingScope);
}
}

// decorate value as well
$expr->var->setAttribute(AttributeKey::SCOPE, $mutatingScope);
$expr = $expr->expr;
}

if ($node instanceof Ternary) {
$this->processTernary($node, $mutatingScope);
}
Expand Down Expand Up @@ -189,11 +203,6 @@ public function processNodes(
$node->name->setAttribute(AttributeKey::SCOPE, $mutatingScope);
}

if ($node instanceof Assign || $node instanceof AssignOp) {
// decorate value as well
$node->var->setAttribute(AttributeKey::SCOPE, $mutatingScope);
}

if ($node instanceof Trait_) {
$traitName = $this->resolveClassName($node);

Expand Down
9 changes: 9 additions & 0 deletions .../ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_variable_variable.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

abstract class SkipVariableVariable
{
private static function loadCurveByParam(\DOMXPath $xpath)
{
$$param = self::decodeValue($result->item(0)->textContent);
}
}
9 changes: 9 additions & 0 deletions ...ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_variable_variable2.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

abstract class SkipVariableVariable2
{
private static function loadCurveByParam(\DOMXPath $xpath)
{
$$param = $$bar = self::decodeValue($result->item(0)->textContent);
}
}