Updating the Pagination Service to 4.x

burzum · Mar 9, 2020 · 9c945c2 · 9c945c2
1 parent 4242f31
commit 9c945c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -3,6 +3,10 @@ imports:
 
 build:
     nodes:
+        php72:
+            environment:
+                php: '7.2'
+
         php73:
             environment:
                 php: '7.3'
@@ -19,10 +23,6 @@ build:
                             file: 'coverage.xml'
                             format: 'clover'
 
-        php72:
-            environment:
-                php: '7.2'
-
 filter:
     excluded_paths:
         - docs/

diff --git a/src/Service/PaginationService.php b/src/Service/PaginationService.php
@@ -15,6 +15,7 @@
 
 namespace Burzum\Cake\Service;
 
+use Cake\Event\EventInterface;
 use Cake\Http\ServerRequest;
 
 /**
@@ -42,8 +43,8 @@ public function __construct(ServerRequest &$request)
         $this->request = $request;
 
         $_this = $this;
-        $this->getEventManager()->on('Service.afterPaginate', function () use ($_this) {
-            $_this->_request = $_this->addPagingParamToRequest($_this->request);
+        $this->getEventManager()->on('Service.afterPaginate', function (EventInterface $event) use ($_this) {
+            $event->setData('request', $_this->addPagingParamToRequest($_this->request));
         });
     }
 }
diff --git a/tests/TestCase/Service/PaginationServiceTest.php b/tests/TestCase/Service/PaginationServiceTest.php
@@ -44,10 +44,11 @@ public function testPaginate()
         $request = new ServerRequest();
         $service = new PaginationService($request);
 
-        $this->assertFalse($request->getParam('paging'));
+        $articles = TableRegistry::getTableLocator()->get('Articles');
 
-        $articles = TableRegistry::get('Articles');
         $result = $service->paginate($articles);
+        $request = $service->addPagingParamToRequest($request);
+
         $params = $request->getParam('paging');
         $expected = [
             'Articles' => [
@@ -68,11 +69,11 @@ public function testPaginate()
                 'completeSort' => [],
                 'start' => 1,
                 'end' => 3,
-            ],
-            false
+                'requestedPage' => 1
+            ]
         ];
 
-        $this->assertInternalType('array', $params);
+        $this->assertIsArray($params);
         $this->assertEquals($expected, $params);
         $this->assertInstanceOf(ResultSet::class, $result);
     }