Updated Rector to commit 3b46948b9f2101fb62a3227ef112611429bd4ae5

rectorphp/rector-src@3b46948 Replace custom attributes with existing ones (#7732)

Author: TomasVotruba

rules/CodingStyle/Rector/FunctionLike/FunctionLikeToFirstClassCallableRector.php

@@ -7,7 +7,6 @@
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrowFunction;
-use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\FuncCall;
@@ -25,6 +24,7 @@
 use PHPStan\Reflection\Native\NativeFunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\CallableType;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\AstResolver;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
@@ -50,10 +50,6 @@ final class FunctionLikeToFirstClassCallableRector extends AbstractRector implem
      * @var string
      */
     private const HAS_CALLBACK_SIGNATURE_MULTI_PARAMS = 'has_callback_signature_multi_params';
-    /**
-     * @var string
-     */
-    private const IS_IN_ASSIGN = 'is_in_assign';
     public function __construct(AstResolver $astResolver, ReflectionResolver $reflectionResolver)
     {
         $this->astResolver = $astResolver;
@@ -73,19 +69,13 @@ function ($parameter) {
     }
     public function getNodeTypes(): array
     {
-        return [Assign::class, CallLike::class, ArrowFunction::class, Closure::class];
+        return [CallLike::class, ArrowFunction::class, Closure::class];
     }
     /**
      * @param CallLike|ArrowFunction|Closure $node
      */
     public function refactor(Node $node): ?\PhpParser\Node\Expr\CallLike
     {
-        if ($node instanceof Assign) {
-            if ($node->expr instanceof Closure || $node->expr instanceof ArrowFunction) {
-                $node->expr->setAttribute(self::IS_IN_ASSIGN, \true);
-            }
-            return null;
-        }
         if ($node instanceof CallLike) {
             if ($node->isFirstClassCallable()) {
                 return null;
@@ -157,7 +147,7 @@ private function shouldSkip($node, $callLike, Scope $scope): bool
         if ($node->getAttribute(self::HAS_CALLBACK_SIGNATURE_MULTI_PARAMS) === \true) {
             return \true;
         }
-        if ($node->getAttribute(self::IS_IN_ASSIGN) === \true) {
+        if ($node->getAttribute(AttributeKey::IS_ASSIGNED_TO) === \true || $node->getAttribute(AttributeKey::IS_BEING_ASSIGNED)) {
             return \true;
         }
         $reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($callLike);

rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php

@@ -4,12 +4,8 @@
 namespace Rector\Php70\Rector\Break_;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\ArrowFunction;
-use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt\Break_;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Return_;
-use PhpParser\Node\Stmt\Switch_;
 use PhpParser\NodeVisitor;
 use Rector\NodeNestingScope\ContextAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -26,10 +22,6 @@ final class BreakNotInLoopOrSwitchToReturnRector extends AbstractRector implemen
      * @readonly
      */
     private ContextAnalyzer $contextAnalyzer;
-    /**
-     * @var string
-     */
-    private const IS_BREAK_IN_SWITCH = 'is_break_in_switch';
     public function __construct(ContextAnalyzer $contextAnalyzer)
     {
         $this->contextAnalyzer = $contextAnalyzer;
@@ -73,33 +65,17 @@ public function run()
      */
     public function getNodeTypes(): array
     {
-        return [Switch_::class, Break_::class];
+        return [Break_::class];
     }
     /**
-     * @param Switch_|Break_ $node
+     * @param Break_ $node
      * @return Return_|null|NodeVisitor::REMOVE_NODE
      */
     public function refactor(Node $node)
     {
-        if ($node instanceof Switch_) {
-            $this->traverseNodesWithCallable($node->cases, static function (Node $subNode): ?int {
-                if ($subNode instanceof Class_ || $subNode instanceof FunctionLike && !$subNode instanceof ArrowFunction) {
-                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
-                }
-                if (!$subNode instanceof Break_) {
-                    return null;
-                }
-                $subNode->setAttribute(self::IS_BREAK_IN_SWITCH, \true);
-                return null;
-            });
-            return null;
-        }
         if ($this->contextAnalyzer->isInLoop($node)) {
             return null;
         }
-        if ($node->getAttribute(self::IS_BREAK_IN_SWITCH) === \true) {
-            return null;
-        }
         if ($this->contextAnalyzer->isInIf($node)) {
             return new Return_();
         }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '6efa09477442d9bfed0989fdd1d773bb0d3fa5a2';
+    public const PACKAGE_VERSION = '3b46948b9f2101fb62a3227ef112611429bd4ae5';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-12-08 00:49:28';
+    public const RELEASE_DATE = '2025-12-07 23:51:44';
     /**
      * @var int
      */

src/NodeNestingScope/ContextAnalyzer.php

@@ -15,7 +15,7 @@ final class ContextAnalyzer
      */
     public function isInLoop(Node $node): bool
     {
-        return $node->getAttribute(AttributeKey::IS_IN_LOOP) === \true;
+        return $node->getAttribute(AttributeKey::IS_IN_LOOP_OR_SWITCH) === \true;
     }
     /**
      * @api

src/NodeTypeResolver/Node/AttributeKey.php

@@ -143,7 +143,7 @@ final class AttributeKey
     /**
      * @var string
      */
-    public const IS_IN_LOOP = 'is_in_loop';
+    public const IS_IN_LOOP_OR_SWITCH = 'is_in_loop';
     /**
      * @var string
      */

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php

@@ -150,7 +150,7 @@ private function processContextInLoop($node): void
                 return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
             }
             if ($subNode instanceof If_ || $subNode instanceof Break_) {
-                $subNode->setAttribute(AttributeKey::IS_IN_LOOP, \true);
+                $subNode->setAttribute(AttributeKey::IS_IN_LOOP_OR_SWITCH, \true);
             }
             return null;
         });