Fix page variable detection in pagination

Author: mikebronner

src/CachedBuilder.php

@@ -126,12 +126,13 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = request($pageName, $page ?: 1);
+        $page = request()->input($pageName)
+            ?: $page
+            ?: 1;
 
         if (is_array($page)) {
             $page = $this->recursiveImplodeWithKey($page);
         }
-
         $cacheKey = $this->makeCacheKey($columns, null, "-paginate_by_{$perPage}_{$pageName}_{$page}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);

tests/CreatesApplication.php

@@ -3,6 +3,7 @@
 use GeneaLabs\LaravelModelCaching\Providers\Service as LaravelModelCachingService;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Observers\AuthorObserver;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
@@ -38,6 +39,7 @@ public function setUp()
 
         $this->cache()->flush();
         $publishers = factory(Publisher::class, 10)->create();
+        (new Author)->observe(AuthorObserver::class);
         factory(Author::class, 10)->create()
             ->each(function ($author) use ($publishers) {
                 factory(Book::class, random_int(5, 25))->make()

tests/Fixtures/Observers/AuthorObserver.php

@@ -0,0 +1,16 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures\Observers;
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+
+class AuthorObserver
+{
+    public function saving(Author $author)
+    {
+        $author->email .= "";
+    }
+
+    public function retrieved(Author $author)
+    {
+        $author->email .= "";
+    }
+}

tests/Integration/CachedBuilder/PaginateTest.php

@@ -20,8 +20,6 @@
  */
 class PaginateTest extends IntegrationTestCase
 {
-
-
     public function testPaginationIsCached()
     {
         $authors = (new Author)
@@ -44,6 +42,7 @@ public function testPaginationIsCached()
         $this->assertEquals($liveResults->pluck("name"), $authors->pluck("name"));
     }
 
+    /** @group test */
     public function testPaginationReturnsCorrectLinks()
     {
         if (starts_with(app()->version(), "5.6")

tests/Integration/CachedModelTest.php

@@ -1,8 +1,9 @@
 <?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\Observers\AuthorObserver;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
@@ -16,7 +17,7 @@
 
 class CachedModelTest extends IntegrationTestCase
 {
-    
+
 
     public function testAllModelResultsCreatesCache()
     {
@@ -190,4 +191,18 @@ public function testModelCacheDoesInvalidateWhenNoCooldownPeriod()
         $this->assertCount(11, $authorsAfterCreate);
         $this->assertCount(11, $uncachedAuthors);
     }
+
+    // /** @group test */
+    // public function testModelObserver()
+    // {
+    //     (new Author)->observe(AuthorObserver::class);
+    //     $authors = (new Author)->get();
+    //     $author1 = $authors->first();
+    //     $author2 = $authors->last();
+    //
+    //     $author1->save();
+    //
+    //     $this->assertEquals("saving@noemail.com", $author1->email);
+    //     $this->assertEquals("retrieved@noemail.com", $author2->email);
+    // }
 }