Merge pull request #3209 from michalsn/pager_cast_segment_value

Cast currentPage value to integer in Pager class

system/Pager/Pager.php

@@ -559,7 +559,7 @@ protected function calculateCurrentPage(string $group)
 		{
 			try
 			{
-				$this->groups[$group]['currentPage'] = $this->groups[$group]['uri']->getSegment($this->segment[$group]);
+				$this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
 			}
 			catch (\CodeIgniter\HTTP\Exceptions\HTTPException $e)
 			{

tests/system/Pager/PagerTest.php

@@ -369,6 +369,12 @@ public function testMakeLinks()
 		$this->assertStringContainsString(
 			'?page_custom=1', $this->pager->makeLinks(1, null, 1, 'default_full', 0, 'custom')
 		);
+		$this->assertStringContainsString(
+			'/1', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+		);
+		$this->assertStringContainsString(
+			'<li class="active">', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+		);
 	}
 
 	public function testHeadLinks()