From a042f14fd89f1c25b2c764b1ed8cc40cc08c9ca8 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 8 Apr 2026 17:45:25 +0700
Subject: [PATCH 1/3] Bump to Rector ^2.4.1 and replace deprecated file to
 getFile() on rector rule

---
 composer.json                                       | 2 +-
 src/Rector/StaticCall/RouteActionCallableRector.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 24349c069..9facaf3cd 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "description": "Rector upgrades rules for Laravel Framework",
     "require": {
         "php": ">=8.3",
-        "rector/rector": "^2.3.0",
+        "rector/rector": "^2.4.1",
         "webmozart/assert": "^1.11 || ^2.0",
         "symplify/rule-doc-generator-contracts": "^11.2"
     },
diff --git a/src/Rector/StaticCall/RouteActionCallableRector.php b/src/Rector/StaticCall/RouteActionCallableRector.php
index 2f86b3941..57ce47d59 100644
--- a/src/Rector/StaticCall/RouteActionCallableRector.php
+++ b/src/Rector/StaticCall/RouteActionCallableRector.php
@@ -243,7 +243,7 @@ private function resolveControllerFromAction(mixed $action, ?string $groupNamesp
         }
 
         [$controller, $method] = $segments;
-        $namespace = $this->getNamespace($this->file->getFilePath());
+        $namespace = $this->getNamespace($this->getFile()->getFilePath());
         if ($groupNamespace !== null) {
             $namespace .= '\\' . $groupNamespace;
         }

From 72228e8bab4be227e7fb29d81d24dff75c7d7ced Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 8 Apr 2026 17:47:42 +0700
Subject: [PATCH 2/3] re-run rector

---
 rector.php                                                      | 1 +
 src/AbstractRector.php                                          | 2 ++
 src/NodeAnalyzer/FacadeAssertionAnalyzer.php                    | 2 ++
 src/NodeAnalyzer/RelationshipAnalyzer.php                       | 2 ++
 src/NodeFactory/DispatchableTestsMethodsFactory.php             | 2 ++
 src/Rector/FuncCall/TypeHintTappableCallRector.php              | 2 --
 src/Rector/If_/AbortIfRector.php                                | 1 -
 src/Rector/If_/ReportIfRector.php                               | 1 -
 src/Rector/StaticCall/CarbonSetTestNowToTravelToRector.php      | 2 ++
 src/Set/LaravelSetProvider.php                                  | 2 ++
 src/Set/Packages/Faker/FakerSetList.php                         | 2 ++
 src/Set/Packages/Livewire/LivewireSetList.php                   | 2 ++
 src/ValueObject/ApplyDefaultInsteadOfNullCoalesce.php           | 2 ++
 src/ValueObject/ExpectedClassMethodMethodCalls.php              | 2 ++
 src/ValueObject/ForwardingCall.php                              | 2 ++
 src/ValueObject/ReplaceRequestKeyAndMethodValue.php             | 2 ++
 src/ValueObject/ReplaceServiceContainerCallArg.php              | 2 ++
 .../DispatchToHelperFunctionsRectorTest.php                     | 2 ++
 18 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/rector.php b/rector.php
index ef24bafb4..6b538c6b3 100644
--- a/rector.php
+++ b/rector.php
@@ -16,6 +16,7 @@
         // for tests
         '*/Source/*',
         '*/Fixture/*',
+        '*/tests/NodeAnalyzer/fixtures/*',
 
         // skip for handle scoped, like in the rector-src as well
         // @see https://github.com/rectorphp/rector-src/blob/7f73cf017214257c170d34db3af7283eaeeab657/rector.php#L71
diff --git a/src/AbstractRector.php b/src/AbstractRector.php
index 6819f0795..2c7a6b264 100644
--- a/src/AbstractRector.php
+++ b/src/AbstractRector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel;
 
 use Rector\Rector\AbstractRector as BaseAbstractRector;
diff --git a/src/NodeAnalyzer/FacadeAssertionAnalyzer.php b/src/NodeAnalyzer/FacadeAssertionAnalyzer.php
index 10131fb90..9ce1a21e1 100644
--- a/src/NodeAnalyzer/FacadeAssertionAnalyzer.php
+++ b/src/NodeAnalyzer/FacadeAssertionAnalyzer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\NodeAnalyzer;
 
 use PhpParser\Node\Expr\StaticCall;
diff --git a/src/NodeAnalyzer/RelationshipAnalyzer.php b/src/NodeAnalyzer/RelationshipAnalyzer.php
index a9bb54776..5430d0958 100644
--- a/src/NodeAnalyzer/RelationshipAnalyzer.php
+++ b/src/NodeAnalyzer/RelationshipAnalyzer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\NodeAnalyzer;
 
 use Illuminate\Database\Eloquent\Relations\Relation;
diff --git a/src/NodeFactory/DispatchableTestsMethodsFactory.php b/src/NodeFactory/DispatchableTestsMethodsFactory.php
index 586fbd751..31466494b 100644
--- a/src/NodeFactory/DispatchableTestsMethodsFactory.php
+++ b/src/NodeFactory/DispatchableTestsMethodsFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\NodeFactory;
 
 use PhpParser\Node\Arg;
diff --git a/src/Rector/FuncCall/TypeHintTappableCallRector.php b/src/Rector/FuncCall/TypeHintTappableCallRector.php
index ad6a0fb03..dcdad31ca 100644
--- a/src/Rector/FuncCall/TypeHintTappableCallRector.php
+++ b/src/Rector/FuncCall/TypeHintTappableCallRector.php
@@ -76,7 +76,6 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        /** @var Closure $closure */
         $closure = $node->getArgs()[1]->value;
 
         if ($closure->getParams() === []) {
@@ -114,7 +113,6 @@ private function refactorMethodCall(MethodCall $methodCall): ?MethodCall
             return null;
         }
 
-        /** @var Closure $closure */
         $closure = $methodCall->getArgs()[0]->value;
 
         if ($closure->getParams() === []) {
diff --git a/src/Rector/If_/AbortIfRector.php b/src/Rector/If_/AbortIfRector.php
index a136a9dd6..9be140f86 100644
--- a/src/Rector/If_/AbortIfRector.php
+++ b/src/Rector/If_/AbortIfRector.php
@@ -71,7 +71,6 @@ public function refactor(Node $node): ?Node
             $this->isName($ifStmts[0]->expr, 'abort')
         ) {
             $condition = $node->cond;
-            /** @var FuncCall $abortCall */
             $abortCall = $ifStmts[0]->expr;
 
             if ($this->exceptionUsesVariablesAssignedByCondition($abortCall, $condition)) {
diff --git a/src/Rector/If_/ReportIfRector.php b/src/Rector/If_/ReportIfRector.php
index cca7035ab..c339a9d7d 100644
--- a/src/Rector/If_/ReportIfRector.php
+++ b/src/Rector/If_/ReportIfRector.php
@@ -71,7 +71,6 @@ public function refactor(Node $node): ?Node
             $this->isName($ifStmts[0]->expr, 'report')
         ) {
             $condition = $node->cond;
-            /** @var FuncCall $abortCall */
             $abortCall = $ifStmts[0]->expr;
 
             if ($this->exceptionUsesVariablesAssignedByCondition($abortCall, $condition)) {
diff --git a/src/Rector/StaticCall/CarbonSetTestNowToTravelToRector.php b/src/Rector/StaticCall/CarbonSetTestNowToTravelToRector.php
index edb35a977..a9742b4ac 100644
--- a/src/Rector/StaticCall/CarbonSetTestNowToTravelToRector.php
+++ b/src/Rector/StaticCall/CarbonSetTestNowToTravelToRector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Rector\StaticCall;
 
 use PhpParser\Node;
diff --git a/src/Set/LaravelSetProvider.php b/src/Set/LaravelSetProvider.php
index 37da5cb6a..b69ff63ca 100644
--- a/src/Set/LaravelSetProvider.php
+++ b/src/Set/LaravelSetProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Set;
 
 use Rector\Set\Contract\SetInterface;
diff --git a/src/Set/Packages/Faker/FakerSetList.php b/src/Set/Packages/Faker/FakerSetList.php
index 8c265da33..84229d5f4 100644
--- a/src/Set/Packages/Faker/FakerSetList.php
+++ b/src/Set/Packages/Faker/FakerSetList.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Set\Packages\Faker;
 
 final class FakerSetList
diff --git a/src/Set/Packages/Livewire/LivewireSetList.php b/src/Set/Packages/Livewire/LivewireSetList.php
index d41102247..393546435 100644
--- a/src/Set/Packages/Livewire/LivewireSetList.php
+++ b/src/Set/Packages/Livewire/LivewireSetList.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Set\Packages\Livewire;
 
 final class LivewireSetList
diff --git a/src/ValueObject/ApplyDefaultInsteadOfNullCoalesce.php b/src/ValueObject/ApplyDefaultInsteadOfNullCoalesce.php
index 72314bd77..ef80b5800 100644
--- a/src/ValueObject/ApplyDefaultInsteadOfNullCoalesce.php
+++ b/src/ValueObject/ApplyDefaultInsteadOfNullCoalesce.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\ValueObject;
 
 use PHPStan\Type\ObjectType;
diff --git a/src/ValueObject/ExpectedClassMethodMethodCalls.php b/src/ValueObject/ExpectedClassMethodMethodCalls.php
index 5a598df01..a49e9b16e 100644
--- a/src/ValueObject/ExpectedClassMethodMethodCalls.php
+++ b/src/ValueObject/ExpectedClassMethodMethodCalls.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\ValueObject;
 
 use PhpParser\Node\Expr\ClassConstFetch;
diff --git a/src/ValueObject/ForwardingCall.php b/src/ValueObject/ForwardingCall.php
index 630d5b025..bc7453d77 100644
--- a/src/ValueObject/ForwardingCall.php
+++ b/src/ValueObject/ForwardingCall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\ValueObject;
 
 use PhpParser\Node\Expr;
diff --git a/src/ValueObject/ReplaceRequestKeyAndMethodValue.php b/src/ValueObject/ReplaceRequestKeyAndMethodValue.php
index 9109bdeec..7d2d03444 100644
--- a/src/ValueObject/ReplaceRequestKeyAndMethodValue.php
+++ b/src/ValueObject/ReplaceRequestKeyAndMethodValue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\ValueObject;
 
 use Webmozart\Assert\Assert;
diff --git a/src/ValueObject/ReplaceServiceContainerCallArg.php b/src/ValueObject/ReplaceServiceContainerCallArg.php
index 4b03592f3..ebeb0c8c5 100644
--- a/src/ValueObject/ReplaceServiceContainerCallArg.php
+++ b/src/ValueObject/ReplaceServiceContainerCallArg.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\ValueObject;
 
 use PhpParser\Node\Expr\ClassConstFetch;
diff --git a/tests/Rector/StaticCall/DispatchToHelperFunctionsRector/DispatchToHelperFunctionsRectorTest.php b/tests/Rector/StaticCall/DispatchToHelperFunctionsRector/DispatchToHelperFunctionsRectorTest.php
index 23107e7ce..82bfbd554 100644
--- a/tests/Rector/StaticCall/DispatchToHelperFunctionsRector/DispatchToHelperFunctionsRectorTest.php
+++ b/tests/Rector/StaticCall/DispatchToHelperFunctionsRector/DispatchToHelperFunctionsRectorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector;
 
 use Iterator;

From 20cb3b4cb40839cfab88b79587bba6aab0d86b66 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 8 Apr 2026 17:48:54 +0700
Subject: [PATCH 3/3] re-run rector

---
 src/Rector/If_/AbortIfRector.php  | 2 ++
 src/Rector/If_/ReportIfRector.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Rector/If_/AbortIfRector.php b/src/Rector/If_/AbortIfRector.php
index 9be140f86..49a39d732 100644
--- a/src/Rector/If_/AbortIfRector.php
+++ b/src/Rector/If_/AbortIfRector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Rector\If_;
 
 use PhpParser\Node;
diff --git a/src/Rector/If_/ReportIfRector.php b/src/Rector/If_/ReportIfRector.php
index c339a9d7d..460f81aeb 100644
--- a/src/Rector/If_/ReportIfRector.php
+++ b/src/Rector/If_/ReportIfRector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace RectorLaravel\Rector\If_;
 
 use PhpParser\Node;