adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: PaginatorHelper::numbers() generates extra separator string in PHP 8.0+.

Browse source
This commit is contained in:
Koji Tanaka 2023-01-29 22:48:42 +09:00 committed by Kamil Wylegala
parent 3d32e313c0
commit 1d1750ae8c
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
View file

@ -1493,11 +1493,6 @@ class PaginatorHelperTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testNumbers() { public function testNumbers() {
// In PHP 8.0, the behavior of comparison operators has changed
// and the behavior of $offset = "last" has changed. So the test fails.
if (PHP_MAJOR_VERSION >= 8) {
$this->markTestIncomplete('In PHP 8.0, fail test.');
}
$this->Paginator->request->params['paging'] = array( $this->Paginator->request->params['paging'] = array(
'Client' => array( 'Client' => array(
'page' => 8, 'page' => 8,

3
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -822,7 +822,8 @@ class PaginatorHelper extends AppHelper {
if ($last && $end < $params['pageCount']) { if ($last && $end < $params['pageCount']) {
$lastPage = is_int($last) ? $last : 0; $lastPage = is_int($last) ? $last : 0;
$offset = ($params['pageCount'] < $end + $lastPage) ? $params['pageCount'] - $end : $last; $offset = ($params['pageCount'] < $end + $lastPage) ? $params['pageCount'] - $end : $last;
if ($offset <= $lastPage && $params['pageCount'] - $end > $lastPage) { $offsetIsLabel = (!is_int($offset) && !ctype_digit($offset));
if (($offsetIsLabel || $offset <= $lastPage) && $params['pageCount'] - $end > $lastPage) {
$out .= $this->last($offset, compact('tag', 'separator', 'ellipsis', 'class')); $out .= $this->last($offset, compact('tag', 'separator', 'ellipsis', 'class'));
} else { } else {
$out .= $this->last($offset, compact('tag', 'separator', 'class', 'ellipsis') + array('before' => $separator)); $out .= $this->last($offset, compact('tag', 'separator', 'class', 'ellipsis') + array('before' => $separator));