move new eloquent builder method into trait

Author: robert-moore96

src/CachedModel.php

@@ -1,28 +1,9 @@
 <?php namespace GeneaLabs\LaravelModelCaching;
 
-use GeneaLabs\LaravelModelCaching\CachedBuilder as Builder;
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
-use Illuminate\Cache\CacheManager;
-use Illuminate\Cache\TaggableStore;
-use Illuminate\Cache\TaggedCache;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Support\Collection;
-use LogicException;
 
 abstract class CachedModel extends Model
 {
     use Cachable;
-
-    public function newEloquentBuilder($query)
-    {
-        if (session('genealabs-laravel-model-caching-is-disabled')) {
-            session()->forget('genealabs-laravel-model-caching-is-disabled');
-
-            return new EloquentBuilder($query);
-        }
-
-        return new Builder($query);
-    }
 }

src/Traits/Cachable.php

@@ -5,6 +5,8 @@
 use GeneaLabs\LaravelModelCaching\CachedModel;
 use Illuminate\Cache\TaggableStore;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use GeneaLabs\LaravelModelCaching\CachedBuilder;
 
 trait Cachable
 {
@@ -80,4 +82,15 @@ public static function all($columns = ['*'])
                 return parent::all($columns);
             });
     }
+
+    public function newEloquentBuilder($query)
+    {
+        if (session('genealabs-laravel-model-caching-is-disabled')) {
+            session()->forget('genealabs-laravel-model-caching-is-disabled');
+
+            return new EloquentBuilder($query);
+        }
+
+        return new CachedBuilder($query);
+    }
 }