Pagination: open page > pageCount get last page

codeigniter4 · Apr 16, 2020 · af0d333 · af0d333
1 parent 8b97001
commit af0d333
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
@@ -208,10 +208,12 @@ public function store(string $group, int $page, int $perPage = null, int $total,
 		$this->ensureGroup($group, $perPage);
 
 		$perPage                             = $perPage ?? $this->config->perPage;
+		$pageCount                           = (int)ceil($total / $perPage);
+		$page                                = $page > $pageCount ? $pageCount : $page;
 		$this->groups[$group]['currentPage'] = $page;
 		$this->groups[$group]['perPage']     = $perPage;
 		$this->groups[$group]['total']       = $total;
-		$this->groups[$group]['pageCount']   = (int)ceil($total / $perPage);
+		$this->groups[$group]['pageCount']   = $pageCount;
 
 		return $this;
 	}

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
@@ -419,4 +419,10 @@ public function testBasedURI()
 		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
 	}
 
+	public function testAccessPageMoreThanPageCountGetLastPage()
+	{
+		$this->pager->store('default', 11, 1, 10);
+		$this->assertEquals(10, $this->pager->getCurrentPage());
+	}
+
 }