Merge branch 'master' into develop

Author: mikebronner

composer.json

@@ -9,13 +9,13 @@
         }
     ],
     "require": {
+        "fico7489/laravel-pivot": "*",
         "illuminate/cache": "5.5 - 5.6",
         "illuminate/config": "5.5 - 5.6",
         "illuminate/console": "5.5 - 5.6",
         "illuminate/database": "5.5 - 5.6",
         "illuminate/support": "5.5 - 5.6",
-        "php": ">=7.1.3",
-        "fico7489/laravel-pivot": "^2.2"
+        "php": ">=7.1.3"
     },
     "require-dev": {
         "codedungeon/phpunit-result-printer": "*",

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/Feature/PaginationTest.php

@@ -7,17 +7,22 @@ class PaginationTest extends FeatureTestCase
 {
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
+        $page1ActiveLink = starts_with(app()->version(), "5.5")
+            ? '<li class="active"><span>1</span></li>'
+            : '<li class="page-item active"><span class="page-link">1</span></li>';
+        $page2ActiveLink = starts_with(app()->version(), "5.5")
+            ? '<li class="active"><span>2</span></li>'
+            : '<li class="page-item active"><span class="page-link">2</span></li>';
+
         $book = (new Book)
             ->take(11)
             ->get()
             ->last();
         $page1 = $this->visit("pagination-test");
 
-        $this->assertTrue(str_contains($page1->response->getContent(), '<li class="page-item active"><span class="page-link">1</span></li>'));
-
+        $page1->see($page1ActiveLink);
         $page2 = $page1->click("2");
-
-        $this->assertTrue(str_contains($page2->response->getContent(), '<li class="page-item active"><span class="page-link">2</span></li>'));
+        $page2->see($page2ActiveLink);
         $page2->see($book->title);
     }
 }

tests/Integration/CachedBuilderPaginationTest.php

@@ -44,6 +44,16 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
+        $page1ActiveLink = starts_with(app()->version(), "5.5")
+            ? '<li class="active"><span>1</span></li>'
+            : '<li class="page-item active"><span class="page-link">1</span></li>';
+        $page2ActiveLink = starts_with(app()->version(), "5.5")
+            ? '<li class="active"><span>2</span></li>'
+            : '<li class="page-item active"><span class="page-link">2</span></li>';
+        $page24ActiveLink = starts_with(app()->version(), "5.5")
+            ? '<li class="active"><span>24</span></li>'
+            : '<li class="page-item active"><span class="page-link">24</span></li>';
+
         $booksPage1 = (new Book)
             ->paginate(2);
         $booksPage2 = (new Book)
@@ -54,17 +64,8 @@ public function testPaginationReturnsCorrectLinks()
         $this->assertCount(2, $booksPage1);
         $this->assertCount(2, $booksPage2);
         $this->assertCount(2, $booksPage24);
-        $this->assertContains(
-            '<li class="page-item active"><span class="page-link">1</span></li>',
-            (string) $booksPage1->links()
-        );
-        $this->assertContains(
-            '<li class="page-item active"><span class="page-link">2</span></li>',
-            (string) $booksPage2->links()
-        );
-        $this->assertContains(
-            '<li class="page-item active"><span class="page-link">24</span></li>',
-            (string) $booksPage24->links()
-        );
+        $this->assertContains($page1ActiveLink, (string) $booksPage1->links());
+        $this->assertContains($page2ActiveLink, (string) $booksPage2->links());
+        $this->assertContains($page24ActiveLink, (string) $booksPage24->links());
     }
 }

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,41 @@ 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 testScopeDisableCacheDoesntCrashWhenCachingIsDisabledInConfig()
+    {
+        config(['laravel-model-caching.disabled' => true]);
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'];
+        $authors = (new PrefixedAuthor)
+            ->where("name", "Bruno")
+            ->disableCache()
+            ->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]);
@@ -98,6 +134,26 @@ public function testWhereHasIsBeingCached()
         $this->assertEquals(1, $cachedResults->first()->author->id);
     }
 
+    public function testWhereHasWithClosureIsBeingCached()
+    {
+        $books1 = (new Book)
+            ->with('author')
+            ->whereHas('author', function ($query) {
+                $query->whereId(1);
+            })
+            ->get()
+            ->keyBy('id');
+        $books2 = (new Book)
+            ->with('author')
+            ->whereHas('author', function ($query) {
+                $query->whereId(2);
+            })
+            ->get()
+            ->keyBy('id');
+
+        $this->assertNotEmpty($books1->diffKeys($books2));
+    }
+
     public function testModelCacheDoesntInvalidateDuringCooldownPeriod()
     {
         $authors = (new Author)