Updated Rector to commit 88d58c1141c1a75b7b73816f68e5c9c17a485998

rectorphp/rector-src@88d58c1 Remove setAttribute() from Rector rules, where not suitable + add phpstan rule to help separate to DecoratingNodeVisitors (#7738)

Author: TomasVotruba

rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php

@@ -3,17 +3,16 @@
 declare (strict_types=1);
 namespace Rector\DeadCode\Rector\Expression;
 
+use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Nop;
 use PhpParser\NodeVisitor;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
-use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\DeadCode\NodeManipulator\LivingCodeManipulator;
 use Rector\NodeAnalyzer\PropertyFetchAnalyzer;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -35,16 +34,11 @@ final class RemoveDeadStmtRector extends AbstractRector
      * @readonly
      */
     private ReflectionResolver $reflectionResolver;
-    /**
-     * @readonly
-     */
-    private PhpDocInfoFactory $phpDocInfoFactory;
-    public function __construct(LivingCodeManipulator $livingCodeManipulator, PropertyFetchAnalyzer $propertyFetchAnalyzer, ReflectionResolver $reflectionResolver, PhpDocInfoFactory $phpDocInfoFactory)
+    public function __construct(LivingCodeManipulator $livingCodeManipulator, PropertyFetchAnalyzer $propertyFetchAnalyzer, ReflectionResolver $reflectionResolver)
     {
         $this->livingCodeManipulator = $livingCodeManipulator;
         $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
         $this->reflectionResolver = $reflectionResolver;
-        $this->phpDocInfoFactory = $phpDocInfoFactory;
     }
     public function getRuleDefinition(): RuleDefinition
     {
@@ -108,10 +102,9 @@ private function hasGetMagic(Expression $expression): bool
      */
     private function removeNodeAndKeepComments(Expression $expression)
     {
-        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($expression);
-        if ($expression->getComments() !== []) {
+        if ($expression->getDocComment() instanceof Doc) {
             $nop = new Nop();
-            $nop->setAttribute(AttributeKey::PHP_DOC_INFO, $phpDocInfo);
+            $nop->setDocComment($expression->getDocComment());
             return $nop;
         }
         return NodeVisitor::REMOVE_NODE;

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -121,8 +121,10 @@ public function refactor(Node $node)
         if ($node->stmts === []) {
             return NodeVisitor::REMOVE_NODE;
         }
-        $node->stmts[0]->setAttribute(AttributeKey::COMMENTS, array_merge($node->getComments(), $node->stmts[0]->getComments()));
-        $node->stmts[0]->setAttribute(AttributeKey::HAS_MERGED_COMMENTS, \true);
+        // keep original comments
+        if ($node->getComments() !== []) {
+            $node->stmts[0]->setAttribute(AttributeKey::COMMENTS, array_merge($node->getComments(), $node->stmts[0]->getComments()));
+        }
         return $node->stmts;
     }
     private function shouldSkipFromVariable(Expr $expr): bool

rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php

@@ -11,6 +11,7 @@
 use Rector\DeadCode\ConditionEvaluator;
 use Rector\DeadCode\ConditionResolver;
 use Rector\DeadCode\Contract\ConditionInterface;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -89,7 +90,7 @@ private function refactorIsMatch(If_ $if): ?array
         if ($if->elseifs !== []) {
             return null;
         }
-        return $if->stmts;
+        return $this->keepIfLevelComments($if, $if->stmts);
     }
     /**
      * @return Stmt[]|NodeVisitor::REMOVE_NODE
@@ -100,7 +101,17 @@ private function refactorIsNotMatch(If_ $if)
         if (!$if->else instanceof Else_) {
             return NodeVisitor::REMOVE_NODE;
         }
-        // else is always used
-        return $if->else->stmts;
+        return $this->keepIfLevelComments($if, $if->else->stmts);
+    }
+    /**
+     * @param Stmt[] $stmts
+     * @return Stmt[]
+     */
+    private function keepIfLevelComments(If_ $if, array $stmts): array
+    {
+        if ($stmts !== []) {
+            $stmts[0]->setAttribute(AttributeKey::COMMENTS, array_merge($if->getComments(), $stmts[0]->getComments()));
+        }
+        return $stmts;
     }
 }

rules/Php72/Rector/FuncCall/GetClassOnNullRector.php

@@ -70,7 +70,7 @@ public function refactor(Node $node): ?Node
                 return null;
             }
             // just created func call
-            if ($node->getAttribute(AttributeKey::DO_NOT_CHANGE) === \true) {
+            if ($node->getAttribute(AttributeKey::ORIGINAL_NODE) === null) {
                 return null;
             }
             if (!$this->isName($node, 'get_class')) {
@@ -101,8 +101,6 @@ public function refactor(Node $node): ?Node
     }
     private function createGetClassFuncCall(FuncCall $oldFuncCall): FuncCall
     {
-        $funcCall = new FuncCall($oldFuncCall->name, $oldFuncCall->args);
-        $funcCall->setAttribute(AttributeKey::DO_NOT_CHANGE, \true);
-        return $funcCall;
+        return new FuncCall($oldFuncCall->name, $oldFuncCall->args);
     }
 }

rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php

@@ -74,7 +74,7 @@ public function refactor(Node $node): ?Node
         $comments = $node->stmts[0]->getAttribute(AttributeKey::COMMENTS) ?? [];
         if ($comments !== []) {
             $this->mirrorComments($arrowFunction->expr, $node->stmts[0]);
-            $arrowFunction->setAttribute(AttributeKey::COMMENT_CLOSURE_RETURN_MIRRORED, \true);
+            $arrowFunction->setAttribute(AttributeKey::COMMENTS, \true);
         }
         return $arrowFunction;
     }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '19a4c038808d4f11f5b81205dedeeb33aa8d181a';
+    public const PACKAGE_VERSION = '88d58c1141c1a75b7b73816f68e5c9c17a485998';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-12-08 16:41:14';
+    public const RELEASE_DATE = '2025-12-08 21:38:21';
     /**
      * @var int
      */

src/NodeTypeResolver/Node/AttributeKey.php

@@ -69,10 +69,6 @@ final class AttributeKey
      * @var string
      */
     public const IS_REGULAR_PATTERN = 'is_regular_pattern';
-    /**
-     * @var string
-     */
-    public const DO_NOT_CHANGE = 'do_not_change';
     /**
      * Helps with infinite loop detection
      * @var string
@@ -82,10 +78,6 @@ final class AttributeKey
      * @var string
      */
     public const WRAPPED_IN_PARENTHESES = 'wrapped_in_parentheses';
-    /**
-     * @var string
-     */
-    public const COMMENT_CLOSURE_RETURN_MIRRORED = 'comment_closure_return_mirrored';
     /**
      * To pass PHP 8.0 attribute FQN names
      * @var string
@@ -96,6 +88,7 @@ final class AttributeKey
      */
     public const EXTRA_USE_IMPORT = 'extra_use_import';
     /**
+     * Used internally by php-parser
      * @var string
      */
     public const DOC_LABEL = 'docLabel';
@@ -217,10 +210,6 @@ final class AttributeKey
      * @var string
      */
     public const IS_FIRST_LEVEL_STATEMENT = 'first_level_stmt';
-    /**
-     * @var string
-     */
-    public const HAS_MERGED_COMMENTS = 'has_merged_comments';
     public const IS_DEFAULT_PROPERTY_VALUE = 'is_default_property_value';
     public const IS_CLASS_CONST_VALUE = 'is_default_class_const_value';
     public const IS_INSIDE_SYMFONY_PHP_CLOSURE = 'is_inside_symfony_php_closure';

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -141,7 +141,7 @@ protected function p(Node $node, int $precedence = self::MAX_PRECEDENCE, int $lh
     }
     protected function pExpr_ArrowFunction(ArrowFunction $arrowFunction, int $precedence, int $lhsPrecedence): string
     {
-        if (!$arrowFunction->hasAttribute(AttributeKey::COMMENT_CLOSURE_RETURN_MIRRORED)) {
+        if (!$arrowFunction->hasAttribute(AttributeKey::COMMENTS)) {
             return parent::pExpr_ArrowFunction($arrowFunction, $precedence, $lhsPrecedence);
         }
         $expr = $arrowFunction->expr;

src/Rector/AbstractRector.php

@@ -226,10 +226,6 @@ private function postRefactorProcess(Node $originalNode, Node $node, $refactored
         /** @var MutatingScope|null $currentScope */
         $currentScope = $node->getAttribute(AttributeKey::SCOPE);
         if (is_array($refactoredNode)) {
-            $firstNode = current($refactoredNode);
-            if ($firstNode->getAttribute(AttributeKey::HAS_MERGED_COMMENTS, \false) === \false) {
-                $this->mirrorComments($firstNode, $originalNode);
-            }
             $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
             // search "infinite recursion" in https://github.com/nikic/PHP-Parser/blob/master/doc/component/Walking_the_AST.markdown
             $originalNodeId = spl_object_id($originalNode);

vendor/autoload.php

@@ -19,4 +19,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit12735a61b7a06210a61ac1597c9ec8fa::getLoader();
+return ComposerAutoloaderInit74acfc93a8a335df0429191cbf621bda::getLoader();