php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-31 18:47:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #17974: Fix ActiveRelationTrait compatibility with PHP 7.4

Browse Source
This commit is contained in:
Maxim Chistyakov
2020-04-19 22:25:02 +02:00
committed by GitHub
parent e6c4640c98
commit cb67d07b85
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -9,6 +9,7 @@ Yii Framework 2 Change Log
- Bug #17942: Fix for `DbCache` loop in MySQL `QueryBuilder` (alex-code) - Bug #17942: Fix for `DbCache` loop in MySQL `QueryBuilder` (alex-code)
- Bug #17960: Fix unsigned primary key type mapping for SQLite (bizley) - Bug #17960: Fix unsigned primary key type mapping for SQLite (bizley)
- Enh #17758: `Query::withQuery()` can be used for CTE (sartor) - Enh #17758: `Query::withQuery()` can be used for CTE (sartor)
- Bug #17974: Fix ActiveRelationTrait compatibility with PHP 7.4 (Ximich)
2.0.34 March 26, 2020 2.0.34 March 26, 2020

2
framework/db/ActiveRelationTrait.php
View File

@ -242,7 +242,7 @@ trait ActiveRelationTrait
$viaQuery->asArray($this->asArray); $viaQuery->asArray($this->asArray);
} }
$viaQuery->primaryModel = null; $viaQuery->primaryModel = null;
$viaModels = $viaQuery->populateRelation($viaName, $primaryModels); $viaModels = array_filter($viaQuery->populateRelation($viaName, $primaryModels));
$this->filterByModels($viaModels); $this->filterByModels($viaModels);
} else { } else {
$this->filterByModels($primaryModels); $this->filterByModels($primaryModels);