fix: property/variable static calls, EloquentMagicMethodToQueryBuilderRector (#406)

Co-authored-by: Geni Jaho <[email protected]>

Author: parth391

src/Rector/StaticCall/EloquentMagicMethodToQueryBuilderRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use RectorLaravel\AbstractRector;
 use ReflectionException;
@@ -107,7 +108,13 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $staticCall = $this->nodeFactory->createStaticCall($originalClassName, 'query');
+        if ($node->class instanceof Name) {
+            $staticCall = $this->nodeFactory->createStaticCall($originalClassName, 'query');
+        }
+
+        if (! $node->class instanceof Name) {
+            $staticCall = new StaticCall($node->class, 'query');
+        }
 
         $methodCall = $this->nodeFactory->createMethodCall($staticCall, $methodName);
         foreach ($node->args as $arg) {

tests/Rector/StaticCall/EloquentMagicMethodToQueryBuilderRector/Fixture/fixture.php.inc

@@ -6,11 +6,20 @@ use RectorLaravel\Tests\Rector\StaticCall\EloquentMagicMethodToQueryBuilderRecto
 
 class SomeController
 {
+    public function __construct(
+        protected readonly User $userbaseModel,
+    ) {
+    }
+
     public function getUser()
     {
+        $userModel = new User;
+
         # eligible
         $user = User::publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
         $user = User::publicMethodBelongsToQueryBuilder(1);
+        $user = $this->userbaseModel::publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
+        $user = $userModel::publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
 
         # not eligible
         $user = User::privateMethodBelongsToQueryBuilder(1);
@@ -19,6 +28,8 @@ class SomeController
         $user = User::query()->publicMethodBelongsToEloquentQueryBuilder(1);
         $user = User::query()->publicMethodBelongsToQueryBuilder(1);
         $user = User::staticMethodBelongsToModel(1);
+        $user = $this->userbaseModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
+        $user = $userModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
     }
 }
 -----
@@ -30,11 +41,20 @@ use RectorLaravel\Tests\Rector\StaticCall\EloquentMagicMethodToQueryBuilderRecto
 
 class SomeController
 {
+    public function __construct(
+        protected readonly User $userbaseModel,
+    ) {
+    }
+
     public function getUser()
     {
+        $userModel = new User;
+
         # eligible
         $user = User::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
         $user = User::query()->publicMethodBelongsToQueryBuilder(1);
+        $user = $this->userbaseModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
+        $user = $userModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
 
         # not eligible
         $user = User::privateMethodBelongsToQueryBuilder(1);
@@ -43,5 +63,7 @@ class SomeController
         $user = User::query()->publicMethodBelongsToEloquentQueryBuilder(1);
         $user = User::query()->publicMethodBelongsToQueryBuilder(1);
         $user = User::staticMethodBelongsToModel(1);
+        $user = $this->userbaseModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
+        $user = $userModel::query()->publicMethodBelongsToEloquentQueryBuilder(1)->where('xxx', 'xxx')->first();
     }
 }

tests/Rector/StaticCall/EloquentMagicMethodToQueryBuilderRector/Fixture/with_exclude_methods.php.inc

@@ -6,10 +6,19 @@ use RectorLaravel\Tests\Rector\StaticCall\EloquentMagicMethodToQueryBuilderRecto
 
 class SomeController
 {
+    public function __construct(
+        protected readonly User $userBaseModel,
+    ) {
+    }
+
     public function getUser()
     {
+        $userModel = new User;
+
         # eligible
         $user = User::publicMethodBelongsToQueryBuilder();
+        $user = $this->userBaseModel::publicMethodBelongsToQueryBuilder();
+        $user = $userModel::publicMethodBelongsToQueryBuilder();
 
         # not eligible
         $user = User::excludablePublicMethodBelongsToEloquentQueryBuilder();
@@ -24,10 +33,19 @@ use RectorLaravel\Tests\Rector\StaticCall\EloquentMagicMethodToQueryBuilderRecto
 
 class SomeController
 {
+    public function __construct(
+        protected readonly User $userBaseModel,
+    ) {
+    }
+
     public function getUser()
     {
+        $userModel = new User;
+
         # eligible
         $user = User::query()->publicMethodBelongsToQueryBuilder();
+        $user = $this->userBaseModel::query()->publicMethodBelongsToQueryBuilder();
+        $user = $userModel::query()->publicMethodBelongsToQueryBuilder();
 
         # not eligible
         $user = User::excludablePublicMethodBelongsToEloquentQueryBuilder();