Update tests and code to support cachable trait

Author: mikebronner

src/Console/Commands/Flush.php

@@ -1,7 +1,6 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Console\Commands;
 
 use Illuminate\Console\Command;
-use GeneaLabs\LaravelModelCaching\CachedModel;
 
 class Flush extends Command
 {
@@ -21,7 +20,7 @@ public function handle()
 
         $model = new $option;
 
-        if (! $model instanceof CachedModel) {
+        if (! method_exists($model, 'flushCache')) {
             $this->error("'{$option}' is not an instance of CachedModel.");
             $this->line("Only CachedModel instances can be flushed.");
 

src/Traits/Cachable.php

@@ -41,6 +41,10 @@ public function disableCache()
 
     public function flushCache(array $tags = [])
     {
+        if (emptyArray($tags)) {
+            $tags = $this->makeCacheTags();
+        }
+
         $this->cache($tags)->flush();
     }
 
@@ -59,8 +63,10 @@ protected function makeCacheKey(
 
     protected function makeCacheTags() : array
     {
-        return (new CacheTags($this->eagerLoad, $this->model))
+        $tags = (new CacheTags($this->eagerLoad ?? [], $this->model ?? $this))
             ->make();
+
+        return $tags;
     }
 
     public static function bootCachable()
@@ -72,6 +78,10 @@ public static function bootCachable()
 
     public static function all($columns = ['*'])
     {
+        if (session('genealabs-laravel-model-caching-is-disabled')) {
+            return parent::all($columns);
+        }
+
         $class = get_called_class();
         $instance = new $class;
         $tags = [str_slug(get_called_class())];

tests/Fixtures/Author.php

@@ -1,12 +1,15 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\CachedModel;
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
-class Author extends CachedModel
+class Author extends Model
 {
+    use Cachable;
+
     protected $fillable = [
         'name',
         'email',

tests/Fixtures/Book.php

@@ -1,11 +1,14 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\CachedModel;
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-class Book extends CachedModel
+class Book extends Model
 {
+    use Cachable;
+
     protected $casts = [
         'price' => 'float',
     ];

tests/Fixtures/Profile.php

@@ -1,11 +1,14 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\CachedModel;
-use Illuminate\Database\Eloquent\Relations\HasMany;
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
-class Profile extends CachedModel
+class Profile extends Model
 {
+    use Cachable;
+
     protected $fillable = [
         'first_name',
         'last_name',

tests/Fixtures/Publisher.php

@@ -1,10 +1,13 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\CachedModel;
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-class Publisher extends CachedModel
+class Publisher extends Model
 {
+    use Cachable;
+
     protected $fillable = [
         'name',
     ];

tests/Fixtures/Store.php

@@ -1,10 +1,13 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\CachedModel;
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-class Store extends CachedModel
+class Store extends Model
 {
+    use Cachable;
+
     protected $fillable = [
         'address',
         'name',