php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-01 20:19:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #20605: Fix return value in SerialColumn::renderDataCellContent()

Browse Source
This commit is contained in:
Maksim Spirkov
2025-10-14 19:37:14 +03:00
committed by GitHub
parent e6bc2ca0ff
commit d26cddccfb
3 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -54,6 +54,7 @@ Yii Framework 2 Change Log
- Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
- Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
- Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)
- Bug #20605: Fix return value in `SerialColumn::renderDataCellContent()` (mspirkov)
- Bug #20604: Fix `@var` annotation for `yii\db\Command::$pdoStatement` (mspirkov)
- Bug #20600: Fix `@var` annotation for `yii\test\FileFixtureTrait::$dataFile` (mspirkov)
- Bug #20608: Fix `@return` annotations for `yii\rest\Serializer` methods (mspirkov)

4
framework/grid/SerialColumn.php
View File

@ -42,9 +42,9 @@ class SerialColumn extends Column
{
$pagination = $this->grid->dataProvider->getPagination();
if ($pagination !== false) {
return $pagination->getOffset() + $index + 1;
return (string) ($pagination->getOffset() + $index + 1);
}
return $index + 1;
return (string) ($index + 1);
}
}