Merge 78da978 into 82a4d6e

sonata-project · Jun 22, 2018 · ddbcf3f · ddbcf3f
2 parents 82a4d6e + 78da978
commit ddbcf3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Datagrid/SimplePager.php b/src/Datagrid/SimplePager.php
@@ -119,7 +119,7 @@ public function init()
             $this->initializeIterator();
 
             $t = (int) ceil($this->thresholdCount / $this->getMaxPerPage()) + $this->getPage() - 1;
-            $this->setLastPage($t);
+            $this->setLastPage(\max(1, $t));
         }
     }
 

diff --git a/tests/Datagrid/SimplePagerTest.php b/tests/Datagrid/SimplePagerTest.php
@@ -112,7 +112,8 @@ public function testNoPagesForNoResults()
 
         $this->pager->setQuery($this->proxyQuery);
         $this->pager->init();
-        $this->AssertEquals(0, $this->pager->getLastPage());
+        $this->assertEquals(1, $this->pager->getLastPage());
+        $this->assertEquals(0, $this->pager->getNbResults());
     }
 
     public function testInitNoQuery()