Skip to content

Commit bbd497c

Browse files
committed
fix fixture test
1 parent 32fa86e commit bbd497c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

rules-tests/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector/Fixture/multiple_call.php.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class MultipleCall
2121
{
2222
public function run($object)
2323
{
24-
$result = ($nullsafeVariable1 = ($nullsafeVariable3 = $object->multiple($args1)) ? $nullsafeVariable3->call($args2) : null) ? $nullsafeVariable1->otherCall($args3) : null;
25-
$result = ($nullsafeVariable2 = ($nullsafeVariable4 = ($nullsafeVariable5 = $object->multiple($args1)) ? $nullsafeVariable5->call($args2) : null) ? $nullsafeVariable4->otherCall($args3) : null) ? $nullsafeVariable2->anotherCall($args4) : null;
24+
$result = ($nullsafeVariable1 = ($nullsafeVariable2 = $object->multiple($args1)) ? $nullsafeVariable2->call($args2) : null) ? $nullsafeVariable1->otherCall($args3) : null;
25+
$result = ($nullsafeVariable3 = ($nullsafeVariable4 = ($nullsafeVariable5 = $object->multiple($args1)) ? $nullsafeVariable5->call($args2) : null) ? $nullsafeVariable4->otherCall($args3) : null) ? $nullsafeVariable3->anotherCall($args4) : null;
2626
}
2727
}
2828

rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,11 @@ public function refactor(Node $node): null|Ternary|Expression
7070

7171
if ($node instanceof Expression) {
7272
if ($node->expr instanceof Assign && ($node->expr->expr instanceof NullsafeMethodCall || $node->expr->expr instanceof NullsafePropertyFetch)) {
73-
$node->expr = new Assign($node->expr->var, $this->refactor($node->expr->expr));
74-
return $node;
73+
$refactorAssignExpr = $this->refactor($node->expr->expr);
74+
if ($refactorAssignExpr instanceof Ternary) {
75+
$node->expr->expr = $refactorAssignExpr;
76+
return $node;
77+
}
7578
}
7679

7780
return null;

0 commit comments

Comments
 (0)