fix

rectorphp · Jan 6, 2025 · 5e9d010 · 5e9d010
1 parent 616bfed
commit 5e9d010
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php b/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php
@@ -6,12 +6,14 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 use PhpParser\Node\Expr\BooleanNot;
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Name\FullyQualified;
 use PHPStan\Type\ObjectType;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
@@ -91,6 +93,10 @@ private function processConvertToExclusiveType(
             ? $objectType->getFullyQualifiedName()
             : $objectType->getClassName();
 
+        if ($expr instanceof Assign) {
+            $expr->setAttribute(AttributeKey::WRAPPED_IN_PARENTHESES, true);
+        }
+
         $instanceof = new Instanceof_($expr, new FullyQualified($fullyQualifiedType));
         if ($binaryOp instanceof NotIdentical) {
             return $instanceof;

diff --git a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DeadCode\Rector\If_;
 
+use Attribute;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
@@ -22,6 +23,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use Rector\NodeManipulator\IfManipulator;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -110,6 +112,7 @@ private function refactorStmtAndInstanceof(If_ $if, Instanceof_ $instanceof): nu
         }
 
         if ($instanceof->expr instanceof Assign) {
+            $instanceof->expr->setAttribute(AttributeKey::WRAPPED_IN_PARENTHESES, false);
             $assignExpression = new Expression($instanceof->expr);
             return array_merge([$assignExpression], $if->stmts);
         }