Fix advanced pagination querystring

Fixes #131

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.2.61] - 31 May 2018
+### Fixed
+- caching of paginated queries with page identifiers as arrays (`?page[size]=1`).
+
+## [0.2.60] - 27 May 2018
+### Added
+- unit tests for multiple versions of Laravel simultaneously.
+- backwards-compatibility to Laravel 5.4.
+
 ## [0.2.59] - 27 May 2018
 ### Fixed
 - caching of queries with `whereNotIn` clauses.

src/CachedBuilder.php

@@ -127,11 +127,34 @@ public function paginate(
         }
 
         $page = request("page", $page ?: 1);
+
+        if (is_array($page)) {
+            $page = $this->recursiveImplodeWithKey($page);
+        }
+        dump($perPage, $columns, $pageName, $page);
+
         $cacheKey = $this->makeCacheKey($columns, null, "-paginate_by_{$perPage}_{$pageName}_{$page}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
+    protected function recursiveImplodeWithKey(array $items, string $glue = "_") : string
+    {
+        $result = "";
+
+        foreach ($items as $key => $value) {
+            if (is_array($value)) {
+                $result .= $key . $glue . $this->recursiveImplode($value, $glue);
+
+                continue;
+            }
+
+            $result .= $glue . $key . $glue . $value;
+        }
+
+        return $result;
+    }
+
     public function pluck($column, $key = null)
     {
         if (! $this->isCachable()) {

tests/Feature/PaginationTest.php

@@ -33,4 +33,26 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
         $page2->see($page2ActiveLink);
         $page2->see($book->title);
     }
+
+    public function testAdvancedPagination()
+    {
+        if (starts_with(app()->version(), "5.6")) {
+            $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-test?page[size]=1");
+
+        $response->see($page1ActiveLink);
+    }
 }