[CodeQuality] Parenthesize assignments nested under unary/binary operators in LogicalToBooleanRector (#9807, #9808)

Author: TomasVotruba

rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/binary_compound_assign.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+$x = 0;
+2 * $x += 42 and true;
+
+?>
+-----
+<?php
+
+$x = 0;
+2 * ($x += 42) && true;
+
+?>

rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/binary_compound_assign_existing_parens.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+$s = 0;
+2 * ($s += 42) and true;
+
+?>
+-----
+<?php
+
+$s = 0;
+2 * ($s += 42) && true;
+
+?>

rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/cast_assign.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+$t = 0;
+(int) $t = 42 and true;
+
+?>
+-----
+<?php
+
+$t = 0;
+(int) ($t = 42) && true;
+
+?>

rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/unary_minus_compound_assign.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+$z = 0;
+-$z += 42 and true;
+
+?>
+-----
+<?php
+
+$z = 0;
+-($z += 42) && true;
+
+?>

rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/Fixture/unary_not_assign.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+$y = 0;
+!$y = 42 and true;
+
+?>
+-----
+<?php
+
+$y = 0;
+!($y = 42) && true;
+
+?>

rules/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector.php

@@ -5,11 +5,22 @@
 namespace Rector\CodeQuality\Rector\LogicalAnd;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\AssignRef;
+use PhpParser\Node\Expr\BinaryOp;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PhpParser\Node\Expr\BinaryOp\LogicalAnd;
 use PhpParser\Node\Expr\BinaryOp\LogicalOr;
+use PhpParser\Node\Expr\BitwiseNot;
+use PhpParser\Node\Expr\BooleanNot;
+use PhpParser\Node\Expr\Cast;
+use PhpParser\Node\Expr\ErrorSuppress;
+use PhpParser\Node\Expr\UnaryMinus;
+use PhpParser\Node\Expr\UnaryPlus;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -74,10 +85,33 @@ private function refactorLogicalToBoolean(LogicalOr|LogicalAnd $node): BooleanAn
             $node->right = $this->refactorLogicalToBoolean($node->right);
         }
 
+        // "and"/"or" bind looser than "="/"+="; once they become "&&"/"||" the assignment must be
+        // re-printed so the pretty-printer re-adds the parentheses that keep the original semantics
+        $this->reprintNestedAssign($node->left);
+        $this->reprintNestedAssign($node->right);
+
         if ($node instanceof LogicalOr) {
             return new BooleanOr($node->left, $node->right);
         }
 
         return new BooleanAnd($node->left, $node->right);
     }
+
+    private function reprintNestedAssign(Expr $expr): void
+    {
+        if ($expr instanceof Assign || $expr instanceof AssignOp || $expr instanceof AssignRef) {
+            $expr->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+            return;
+        }
+
+        if ($expr instanceof BooleanNot || $expr instanceof BitwiseNot || $expr instanceof UnaryMinus || $expr instanceof UnaryPlus || $expr instanceof ErrorSuppress || $expr instanceof Cast) {
+            $this->reprintNestedAssign($expr->expr);
+            return;
+        }
+
+        if ($expr instanceof BinaryOp) {
+            $this->reprintNestedAssign($expr->left);
+            $this->reprintNestedAssign($expr->right);
+        }
+    }
 }