Merge pull request #1556 from WedgeSama/fix-pagination-console

Fix paginate subscriber when request stack is empty (eg. console).

Author: XWB

src/Subscriber/PaginateElasticaQuerySubscriber.php

@@ -74,7 +74,7 @@ public static function getSubscribedEvents()
     protected function setSorting(ItemsEvent $event)
     {
         $options = $event->options;
-        $sortField = $this->getRequest()->get($options['sortFieldParameterName']);
+        $sortField = $this->getFromRequest($options['sortFieldParameterName']);
 
         if (!$sortField && isset($options['defaultSortFieldName'])) {
             $sortField = $options['defaultSortFieldName'];
@@ -117,7 +117,7 @@ protected function getSort($sortField, array $options = [])
     protected function getSortDirection($sortField, array $options = [])
     {
         $dir = 'asc';
-        $sortDirection = $this->getRequest()->get($options['sortDirectionParameterName']);
+        $sortDirection = $this->getFromRequest($options['sortDirectionParameterName']);
 
         if (empty($sortDirection) && isset($options['defaultSortDirection'])) {
             $sortDirection = $options['defaultSortDirection'];
@@ -142,4 +142,17 @@ private function getRequest()
     {
         return $this->requestStack->getCurrentRequest();
     }
+
+    /**
+     * @param string|null $key
+     * @return mixed|null
+     */
+    private function getFromRequest(?string $key)
+    {
+        if (null !== $request = $this->getRequest()) {
+            return $request->get($key);
+        }
+
+        return null;
+    }
 }

tests/Unit/Subscriber/PaginateElasticaQuerySubscriberTest.php

@@ -271,6 +271,22 @@ public function testShouldInvokeNestedFilterCallable()
         ], $query->toArray());
     }
 
+    public function testShouldDoNothingIfNoRequest()
+    {
+        $subscriber = new PaginateElasticaQuerySubscriber($this->getRequestStack());
+
+        $adapter = $this->getAdapterMock();
+        $adapter->expects($this->never())
+            ->method('getQuery');
+        $adapter->method('getResults')
+            ->willReturn($this->getResultSetMock());
+
+        $event = new ItemsEvent(0, 10);
+        $event->target = $adapter;
+
+        $subscriber->items($event);
+    }
+
     protected function getAdapterMock()
     {
         return $this->createMock(RawPaginatorAdapter::class);