Skip to content

Commit 5d817be

Browse files
committed
fix pagination
1 parent c59cffa commit 5d817be

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: src/Illuminate/Pagination/UrlWindow.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function get()
4444
{
4545
$onEachSide = $this->paginator->onEachSide;
4646

47-
if ($this->paginator->lastPage() < ($onEachSide * 2) + 6) {
47+
if ($this->paginator->lastPage() < ($onEachSide * 2) + 8) {
4848
return $this->getSmallSlider();
4949
}
5050

Diff for: tests/Pagination/UrlWindowTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ public function testPresenterCanGetAUrlRangeForAWindowOfLinks()
4141
* Test Being Near The End Of The List
4242
*/
4343
$array = [];
44-
for ($i = 1; $i <= 13; $i++) {
44+
for ($i = 1; $i <= 20; $i++) {
4545
$array[$i] = 'item'.$i;
4646
}
47-
$p = new LengthAwarePaginator($array, count($array), 1, 10);
47+
$p = new LengthAwarePaginator($array, count($array), 1, 17);
4848
$window = new UrlWindow($p);
4949
$last = [];
50-
for ($i = 4; $i <= 13; $i++) {
50+
for ($i = 11; $i <= 20; $i++) {
5151
$last[$i] = '/?page='.$i;
5252
}
5353
$this->assertEquals(['first' => [1 => '/?page=1', 2 => '/?page=2'], 'slider' => null, 'last' => $last], $window->get());
@@ -56,7 +56,7 @@ public function testPresenterCanGetAUrlRangeForAWindowOfLinks()
5656
public function testCustomUrlRangeForAWindowOfLinks()
5757
{
5858
$array = [];
59-
for ($i = 1; $i <= 13; $i++) {
59+
for ($i = 1; $i <= 20; $i++) {
6060
$array[$i] = 'item'.$i;
6161
}
6262

@@ -69,6 +69,6 @@ public function testCustomUrlRangeForAWindowOfLinks()
6969
$slider[$i] = '/?page='.$i;
7070
}
7171

72-
$this->assertEquals(['first' => [1 => '/?page=1', 2 => '/?page=2'], 'slider' => $slider, 'last' => [12 => '/?page=12', 13 => '/?page=13']], $window->get());
72+
$this->assertEquals(['first' => [1 => '/?page=1', 2 => '/?page=2'], 'slider' => $slider, 'last' => [19 => '/?page=19', 20 => '/?page=20']], $window->get());
7373
}
7474
}

0 commit comments

Comments
 (0)