Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-02-20 00:32:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #19655: Fix LinkPager::getPageRange when maxButtons is 2

Browse Source
This commit is contained in:
Maksim Spirkov
2025-09-27 12:56:04 +04:00
committed by GitHub
parent 31106c86fe
commit dc65bd3726
3 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -32,6 +32,7 @@ Yii Framework 2 Change Log
- Enh #20525: Add `@template` annotations for all actions (max-s-lab)
- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (max-s-lab)
- Bug #20530: Fix notice "Object of class DateTimeImmutable could not be converted to int" in `CookieCollection::has` (max-s-lab)
- Bug #19655: Fix `LinkPager::getPageRange` when `maxButtons` is 2 (max-s-lab)
- Enh #20539: Update minimum PHP version requirement from `7.3` to `7.4` (terabytesoftw)
- Bug #20541: Remove deprecated caching components: `XCache` and `ZendDataCache`, and update related tests and documentation (terabytesoftw)

4
framework/widgets/LinkPager.php
View File

@@ -264,7 +264,9 @@ class LinkPager extends Widget
$currentPage = $this->pagination->getPage();
$pageCount = $this->pagination->getPageCount();
$beginPage = max(0, $currentPage - (int) ($this->maxButtonCount / 2));
$beginPageOffset = $this->maxButtonCount > 2 ? (int) ($this->maxButtonCount / 2) : 0;
$beginPage = max(0, $currentPage - $beginPageOffset);
if (($endPage = $beginPage + $this->maxButtonCount - 1) >= $pageCount) {
$endPage = $pageCount - 1;
$beginPage = max(0, $endPage - $this->maxButtonCount + 1);

93
tests/framework/widgets/LinkPagerTest.php
View File

@@ -160,6 +160,99 @@ class LinkPagerTest extends \yiiunit\TestCase
);
}
public function testWithTwoButtons()
{
$output = LinkPager::widget([
'pagination' => $this->getPagination(0),
'maxButtonCount' => 2,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev disabled"><span>&laquo;</span></li>
<li class="active"><a href="/?r=test&amp;page=1" data-page="0">1</a></li>
<li><a href="/?r=test&amp;page=2" data-page="1">2</a></li>
<li class="next"><a href="/?r=test&amp;page=2" data-page="1">&raquo;</a></li></ul>
HTML,
$output,
);
$output = LinkPager::widget([
'pagination' => $this->getPagination(1),
'maxButtonCount' => 2,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev"><a href="/?r=test&amp;page=1" data-page="0">&laquo;</a></li>
<li class="active"><a href="/?r=test&amp;page=2" data-page="1">2</a></li>
<li><a href="/?r=test&amp;page=3" data-page="2">3</a></li>
<li class="next"><a href="/?r=test&amp;page=3" data-page="2">&raquo;</a></li></ul>
HTML,
$output,
);
}
public function testWithOneButton()
{
$output = LinkPager::widget([
'pagination' => $this->getPagination(0),
'maxButtonCount' => 1,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev disabled"><span>&laquo;</span></li>
<li class="active"><a href="/?r=test&amp;page=1" data-page="0">1</a></li>
<li class="next"><a href="/?r=test&amp;page=2" data-page="1">&raquo;</a></li></ul>
HTML,
$output,
);
$output = LinkPager::widget([
'pagination' => $this->getPagination(1),
'maxButtonCount' => 1,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev"><a href="/?r=test&amp;page=1" data-page="0">&laquo;</a></li>
<li class="active"><a href="/?r=test&amp;page=2" data-page="1">2</a></li>
<li class="next"><a href="/?r=test&amp;page=3" data-page="2">&raquo;</a></li></ul>
HTML,
$output,
);
}
public function testWithNoButtons()
{
$output = LinkPager::widget([
'pagination' => $this->getPagination(0),
'maxButtonCount' => 0,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev disabled"><span>&laquo;</span></li>
<li class="next"><a href="/?r=test&amp;page=2" data-page="1">&raquo;</a></li></ul>
HTML,
$output
);
$output = LinkPager::widget([
'pagination' => $this->getPagination(1),
'maxButtonCount' => 0,
]);
$this->assertEqualsWithoutLE(
<<<HTML
<ul class="pagination"><li class="prev"><a href="/?r=test&amp;page=1" data-page="0">&laquo;</a></li>
<li class="next"><a href="/?r=test&amp;page=3" data-page="2">&raquo;</a></li></ul>
HTML,
$output
);
}
/**
* @see https://github.com/yiisoft/yii2/issues/15536
*/