Fix double-wrap regression: gate nested compound-assignment reprint to source operands

Author: TomasVotruba

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;
+
+?>

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -479,7 +479,7 @@ private function wrapBinaryOpWithBrackets(Node $node): void
         // an assignment nested directly under a unary operator (e.g. "!$x = 1", "-$x += 1",
         // "(int) $x = 1") loses its required parentheses once "and"/"or" become "&&"/"||"; force
         // the assignment to reprint so the pretty-printer re-adds them based on precedence
-        if ($this->isUnaryExprWithAssign($node) && $this->origTokens instanceof TokenStream) {
+        if ($node->getStartTokenPos() >= 0 && $this->isUnaryExprWithAssign($node) && $this->origTokens instanceof TokenStream) {
             $node->expr->setAttribute(AttributeKey::ORIGINAL_NODE, null);
         }
 
@@ -491,16 +491,29 @@ private function wrapBinaryOpWithBrackets(Node $node): void
             return;
         }
 
-        if ($this->isAssignExpr($node->left)
+        if ($node->left instanceof Assign
             && $this->origTokens instanceof TokenStream
             && ! $this->origTokens->haveParens($node->left->getStartTokenPos(), $node->left->getEndTokenPos())) {
             $node->left->setAttribute(AttributeKey::ORIGINAL_NODE, null);
         }
 
-        if ($this->isAssignExpr($node->right) && $this->origTokens instanceof TokenStream) {
+        if ($node->right instanceof Assign && $this->origTokens instanceof TokenStream) {
             $node->right->setAttribute(AttributeKey::ORIGINAL_NODE, null);
         }
 
+        // a compound assignment ("+=", "-=", …) nested in an originally printed operand keeps its
+        // verbatim, parenless tokens; force it to reprint so the required parentheses are re-added.
+        // only for source operands: freshly created binary nodes already get them from precedence
+        if ($node->getStartTokenPos() >= 0) {
+            if ($node->left instanceof AssignOp || $node->left instanceof AssignRef) {
+                $node->left->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+            }
+
+            if ($node->right instanceof AssignOp || $node->right instanceof AssignRef) {
+                $node->right->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+            }
+        }
+
         // boolean operators (&&, ||) bind tighter than the logical ones (and, or); when
         // LogicalToBooleanRector swaps them, operands with lower precedence must be reprinted
         // so the pretty-printer re-adds the parentheses that keep the original semantics
@@ -537,9 +550,9 @@ private function isUnaryExprWithAssign(Node $node): bool
         return $this->isAssignExpr($node->expr);
     }
 
-    private function isAssignExpr(Node $node): bool
+    private function isAssignExpr(Expr $expr): bool
     {
-        return $node instanceof Assign || $node instanceof AssignOp || $node instanceof AssignRef;
+        return $expr instanceof Assign || $expr instanceof AssignOp || $expr instanceof AssignRef;
     }
 
     /**