From c0b498dc42fba8c8230d3cfcb5d0c8e698a72257 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 22 Jan 2025 09:21:20 +0700 Subject: [PATCH 1/2] [NodeTypeResolver] Clean up wrap in parentheses check ReprintNodeVisitor --- .../PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php index c8a62ea202..40a181310f 100644 --- a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php +++ b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php @@ -36,12 +36,6 @@ public function enterNode(Node $node): ?Node return $node; } - if ($node instanceof BooleanNot && $node->expr instanceof BinaryOp && $node->expr->getAttribute( - AttributeKey::ORIGINAL_NODE - ) instanceof Node) { - $node->expr->setAttribute(AttributeKey::WRAPPED_IN_PARENTHESES, true); - } - return null; } } From 5d55cffc8e61424a86b42624816f90887c061743 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 22 Jan 2025 02:23:02 +0000 Subject: [PATCH 2/2] [ci-review] Rector Rectify --- .../RenameFunctionLikeParamWithinCallLikeArgRector.php | 2 +- .../PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php b/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php index 477ad8f5b3..d184dcdb44 100644 --- a/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php +++ b/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php @@ -93,7 +93,7 @@ public function refactor(Node $node): ?Node continue; } - if (($node->name ?? null) === null) { + if (!$node->name ?? null instanceof Node) { continue; } diff --git a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php index 40a181310f..1457c0eab8 100644 --- a/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php +++ b/src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ReprintNodeVisitor.php @@ -7,7 +7,6 @@ use PhpParser\Node; use PhpParser\Node\Expr\BinaryOp; use PhpParser\Node\Expr\BinaryOp\Coalesce; -use PhpParser\Node\Expr\BooleanNot; use PhpParser\NodeVisitorAbstract; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;