Fix custom pagination

Fixes #172

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 10 Sep 2018
+### Changed
+- use of `cache()` helper method to `app("cache")` to allow for better Lumen compatibility. Thanks @nope7777!
+
+### Updated
+- test script for Laravel 5.7 to use non-dev version of test dependency.
+
+### Removed
+- `codedungeon/phpunit-result-printer` unit test output printer.
+
+### Fixed
+- use of custom pagination name.
+
 ## [0.3.0] - 10 Sep 2018
 ### Added
 - Laravel 5.7 compatibility.

composer.json

@@ -18,11 +18,10 @@
         "php": ">=7.1.3"
     },
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "*",
         "fzaninotto/faker": "*",
         "mockery/mockery": "*",
-        "orchestra/database": "3.7.x-dev",
-        "orchestra/testbench-browser-kit": "3.7.x-dev",
+        "orchestra/database": "3.7.x-dev@dev",
+        "orchestra/testbench-browser-kit": "3.7.*",
         "orchestra/testbench": "3.7.*",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",

phpunit.xml

@@ -7,7 +7,6 @@
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
-    printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
     stopOnFailure="false"
 >

src/CachedBuilder.php

@@ -126,7 +126,7 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = request("page", $page ?: 1);
+        $page = request($pageName, $page ?: 1);
 
         if (is_array($page)) {
             $page = $this->recursiveImplodeWithKey($page);

src/Traits/Caching.php

@@ -88,7 +88,7 @@ protected function makeCacheTags() : array
         return $tags;
     }
 
-    public function getModelCacheCooldown(Model $instance)
+    public function getModelCacheCooldown(Model $instance) : array
     {
         $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
@@ -99,11 +99,7 @@ public function getModelCacheCooldown(Model $instance)
             return [null, null, null];
         }
 
-        return [
-            $cacheCooldown,
-            $invalidatedAt,
-            $savedAt,
-        ];
+        return [$cacheCooldown, $invalidatedAt, $savedAt];
     }
 
     protected function getCacheCooldownDetails(

tests/Feature/PaginationTest.php

@@ -59,4 +59,28 @@ public function testAdvancedPagination()
 
         $response->see($page1ActiveLink);
     }
+
+    public function testCustomPagination()
+    {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
+            $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
+            $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
+        }
+
+        if (starts_with(app()->version(), "5.5")) {
+            $page1ActiveLink = '<li class="active"><span>1</span></li>';
+            $page2ActiveLink = '<li class="active"><span>2</span></li>';
+        }
+
+        if (starts_with(app()->version(), "5.4")) {
+            $page1ActiveLink = '<li class="active"><span>1</span></li>';
+            $page2ActiveLink = '<li class="active"><span>2</span></li>';
+        }
+
+        $response = $this->visit("pagination-test2?custom-page=2");
+
+        $response->see($page2ActiveLink);
+    }
 }

tests/pu-57.sh

@@ -3,9 +3,9 @@
 cp composer.json original-composer.json
 
 composer require codedungeon/phpunit-result-printer --no-update --dev
-composer require "orchestra/database:3.7.x-dev" --no-update --dev
+composer require "orchestra/database:3.7.x-dev@dev" --no-update --dev
 composer require "orchestra/testbench:3.7.*" --no-update --dev
-composer require "orchestra/testbench-browser-kit:3.7.x-dev" --no-update --dev
+composer require "orchestra/testbench-browser-kit:3.7.*" --no-update --dev
 composer require "illuminate/cache:5.7.*" --no-update
 composer require "illuminate/config:5.7.*" --no-update
 composer require "illuminate/console:5.7.*" --no-update

tests/routes/web.php

@@ -11,3 +11,13 @@
             'books'
         ));
 });
+
+Route::get('pagination-test2', function () {
+    $books = (new Book)
+        ->paginate(10, ["*"], "custom-page");
+
+    return view("model-caching-tests.pagination")
+        ->with(compact(
+            'books'
+        ));
+});