Fix case where caching is disabled via config, and disableCache() is called anyway

Fixes #96

Author: mikebronner

src/Traits/ModelCaching.php

@@ -54,7 +54,9 @@ public function newEloquentBuilder($query)
 
     public function scopeDisableCache(EloquentBuilder $query) : EloquentBuilder
     {
-        $query = $query->disableModelCaching();
+        if ($this->isCachable()) {
+            $query = $query->disableModelCaching();
+        }
 
         return $query;
     }

tests/Integration/CachedModelTest.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
@@ -53,6 +54,23 @@ public function testScopeDisablesCaching()
         $this->assertNotEquals($authors, $cachedResults);
     }
 
+    public function testScopeDisablesCachingWhenCalledOnModel()
+    {
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'];
+        $authors = (new PrefixedAuthor)
+            ->disableCache()
+            ->where("name", "Bruno")
+            ->get();
+
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertNull($cachedResults);
+        $this->assertNotEquals($authors, $cachedResults);
+    }
+
     public function testAllMethodCachingCanBeDisabledViaConfig()
     {
         config(['laravel-model-caching.disabled' => true]);