Merge pull request #28 from CauanCabral/master

Update how paging request attribute are defined
burzum · Jan 19, 2021 · ea6bdd3 · ea6bdd3
2 parents be6342a + d090422
commit ea6bdd3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -9,6 +9,6 @@
 EventManager::instance()->on('Controller.initialize', function ($event) {
     $controller = $event->getSubject();
     $controller->getEventManager()->on('Service.afterPaginate', function ($event) use ($controller) {
-        $event->getSubject()->addPagingParamToRequest($controller->request);
+        $controller->setRequest($event->getSubject()->addPagingParamToRequest($controller->getRequest()));
     });
 });
diff --git a/src/Service/ServicePaginatorTrait.php b/src/Service/ServicePaginatorTrait.php
@@ -115,6 +115,6 @@ public function paginate($object, array $params = [], array $settings = [])
      */
     public function addPagingParamToRequest(ServerRequest $request): ServerRequest
     {
-        return $request->withParam('paging', $this->getPaginator()->getPagingParams() + (array)$request->getParam('paging'));
+        return $request->withAttribute('paging', $this->getPaginator()->getPagingParams() + $request->getAttribute('paging', []));
     }
 }
diff --git a/tests/TestCase/Service/PaginationServiceTest.php b/tests/TestCase/Service/PaginationServiceTest.php
@@ -49,7 +49,7 @@ public function testPaginate()
         $result = $service->paginate($articles);
         $request = $service->addPagingParamToRequest($request);
 
-        $params = $request->getParam('paging');
+        $params = $request->getAttribute('paging');
         $expected = [
             'Articles' => [
                 'finder' => 'all',