From bf04637cf98cfd9b5f234f62133cef1ec7b52d2f Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 6 Oct 2026 10:20:01 +0200
Subject: [PATCH 1/2] Bump to PHPStan 2.3

---
 composer.json                                                | 2 +-
 .../RemoveUselessAssignFromPropertyPromotionRector.php       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index b06552a5721..d69d0677a18 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "nikic/php-parser": "^5.9",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3.3",
-        "phpstan/phpstan": "^2.2.14",
+        "phpstan/phpstan": "^2.3",
         "react/child-process": "^0.6.5",
         "react/event-loop": "^1.6",
         "react/socket": "^1.17",
diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUselessAssignFromPropertyPromotionRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUselessAssignFromPropertyPromotionRector.php
index 35f345b4418..46d8e30b66e 100644
--- a/rules/DeadCode/Rector/ClassMethod/RemoveUselessAssignFromPropertyPromotionRector.php
+++ b/rules/DeadCode/Rector/ClassMethod/RemoveUselessAssignFromPropertyPromotionRector.php
@@ -121,11 +121,6 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        // empty data? nothing to remove
-        if ($removeStmtKeys === []) {
-            return null;
-        }
-
         foreach ($removeStmtKeys as $removeStmtKey) {
             unset($node->stmts[$removeStmtKey]);
         }

From fd5a863571d75425a9a357720a266d4aed939f19 Mon Sep 17 00:00:00 2001
From: GitHub Action <actions@github.com>
Date: Tue, 6 Oct 2026 08:21:16 +0000
Subject: [PATCH 2/2] [ci-review] Rector Rectify

---
 .../If_/ChangeIfElseValueAssignToEarlyReturnRector.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php
index d6a0aaa7ffa..83983ca1e35 100644
--- a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php
+++ b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php
@@ -108,9 +108,9 @@ public function refactor(Node $node): ?Node
             /** @var Assign $assign */
             $assign = $this->stmtsManipulator->getUnwrappedLastStmt($if->stmts);
 
-            $returnLastIf = new Return_($assign->expr);
-            $this->mirrorComments($returnLastIf, $assign);
-            $if->stmts[$lastIfStmtKey] = $returnLastIf;
+            $return = new Return_($assign->expr);
+            $this->mirrorComments($return, $assign);
+            $if->stmts[$lastIfStmtKey] = $return;
 
             /** @var Else_ $else */
             $else = $if->else;