Merge release 2.2.5 into 3.0.x (#218)

Author: github-actions[bot]

src/Rules/NoDynamicWhereRule.php

@@ -155,7 +155,17 @@ private function findModel(ClassReflection $calledOnReflection): string|null
             $calledOnReflection->getName() === EloquentBuilder::class ||
             $calledOnReflection->isSubclassOf(EloquentBuilder::class)
         ) {
-            $modelType = $calledOnReflection->getActiveTemplateTypeMap()->getType('TModelClass');
+            if ($calledOnReflection->isGeneric()) {
+                $modelType = $calledOnReflection->getActiveTemplateTypeMap()->getType('TModelClass') ??
+                    $calledOnReflection->getActiveTemplateTypeMap()->getType('TModel');
+            } elseif ($calledOnReflection->getParentClass() !== null) {
+                $parent = $calledOnReflection->getParentClass();
+
+                $modelType = $parent->getActiveTemplateTypeMap()->getType('TModelClass') ??
+                    $parent->getActiveTemplateTypeMap()->getType('TModel');
+            } else {
+                $modelType = null;
+            }
 
             if (! $modelType instanceof ObjectType) {
                 return null;

tests/Rules/data/dynamic-where.php

@@ -158,8 +158,22 @@ public function hasActiveActions(): bool
 
 class AccountAction extends Model
 {
+    /**
+     * @param Builder<AccountAction> $query
+     *
+     * @return Builder<AccountAction>
+     */
     public function scopeWhereActive(Builder $query): Builder
     {
         return $query->where('is_active', true);
     }
 }
+
+/** @extends Builder<AccountAction> */
+class SomeBuilder extends Builder
+{
+    public function doFoo(): void
+    {
+        $this->whereActive();
+    }
+}