Refactored out checking of Cachable trait

(instead of looking if method exists) Fixes #81 #57
mikebronner · Feb 19, 2018 · cf08e6d · cf08e6d
1 parent a755769
commit cf08e6d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Console/Commands/Flush.php b/src/Console/Commands/Flush.php
@@ -19,8 +19,10 @@ public function handle()
         }
 
         $model = new $option;
+        $usesCachableTrait = collect(class_uses($model))
+            ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
 
-        if (! method_exists($model, 'flushCache')) {
+        if (! $usesCachableTrait) {
             $this->error("'{$option}' is not an instance of CachedModel.");
             $this->line("Only CachedModel instances can be flushed.");
 

diff --git a/src/Traits/Cachable.php b/src/Traits/Cachable.php
@@ -22,14 +22,25 @@ protected function cache(array $tags = [])
         }
 
         if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
-            array_push($tags, str_slug(get_called_class()));
-
+            $tags = $this->addTagsWhenCalledFromCachedBuilder($tags);
             $cache = $cache->tags($tags);
         }
 
         return $cache;
     }
 
+    protected function addTagsWhenCalledFromCachedBuilder(array $tags) : array
+    {
+        $usesCachableTrait = collect(class_uses($this))
+            ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
+
+        if (! $usesCachableTrait) {
+            array_push($tags, str_slug(get_called_class()));
+        }
+
+        return $tags;
+    }
+
     public function disableCache()
     {
         cache()->forever(self::$isCachableKey, true);