diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json index 0941b42824e..567a157c717 100644 --- a/build/target-repository/composer.json +++ b/build/target-repository/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": "^7.4|^8.0", - "phpstan/phpstan": "^2.1.33" + "phpstan/phpstan": "^2.1.34" }, "autoload": { "files": [ diff --git a/composer.json b/composer.json index ce878e83d21..ce879c31de9 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "nikic/php-parser": "^5.7", "ondram/ci-detector": "^4.2", "phpstan/phpdoc-parser": "^2.3", - "phpstan/phpstan": "^2.1.33", + "phpstan/phpstan": "^2.1.34", "react/event-loop": "^1.6", "react/promise": "^3.3", "react/socket": "^1.17", diff --git a/src/PhpParser/Printer/BetterStandardPrinter.php b/src/PhpParser/Printer/BetterStandardPrinter.php index 8f9d94f63b5..9acc42eb4ae 100644 --- a/src/PhpParser/Printer/BetterStandardPrinter.php +++ b/src/PhpParser/Printer/BetterStandardPrinter.php @@ -29,7 +29,6 @@ use PhpParser\Node\Stmt\Nop; use PhpParser\PrettyPrinter\Standard; use PhpParser\Token; -use PHPStan\Node\Expr\AlwaysRememberedExpr; use Rector\Configuration\Option; use Rector\Configuration\Parameter\SimpleParameterProvider; use Rector\NodeAnalyzer\ExprAnalyzer; @@ -128,23 +127,6 @@ protected function p( int $lhsPrecedence = self::MAX_PRECEDENCE, bool $parentFormatPreserved = false ): string { - // handle already AlwaysRememberedExpr - // @see https://github.com/rectorphp/rector/issues/8815#issuecomment-2503453191 - if ($node instanceof AlwaysRememberedExpr) { - return $this->p($node->getExpr(), $precedence, $lhsPrecedence, $parentFormatPreserved); - } - - // handle overlapped origNode is Match_ and its subnodes still have AlwaysRememberedExpr - $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE); - if ($originalNode instanceof Match_) { - $subNodeNames = $node->getSubNodeNames(); - foreach ($subNodeNames as $subNodeName) { - while ($originalNode->{$subNodeName} instanceof AlwaysRememberedExpr) { - $originalNode->{$subNodeName} = $originalNode->{$subNodeName}->getExpr(); - } - } - } - $this->wrapBinaryOpWithBrackets($node); $content = parent::p($node, $precedence, $lhsPrecedence, $parentFormatPreserved);