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

Merge branch 'master' into fix-type-boolean-mysql

Browse Source
This commit is contained in:
Wilmer Arambula
2023-10-25 14:38:13 -03:00
parent f0628dfab5 7005d2775b
commit 4a46f6763e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -11,6 +11,7 @@ Yii Framework 2 Change Log
- Bug #20002: Fixed superfluous query on HEAD request in serializer (xicond) - Bug #20002: Fixed superfluous query on HEAD request in serializer (xicond)
- Enh #12743: Added new methods `BaseActiveRecord::loadRelations()` and `BaseActiveRecord::loadRelationsFor()` to eager load related models for existing primary model instances (PowerGamer1) - Enh #12743: Added new methods `BaseActiveRecord::loadRelations()` and `BaseActiveRecord::loadRelationsFor()` to eager load related models for existing primary model instances (PowerGamer1)
- Enh #20030: Improve performance of handling `ErrorHandler::$memoryReserveSize` (antonshevelev, rob006) - Enh #20030: Improve performance of handling `ErrorHandler::$memoryReserveSize` (antonshevelev, rob006)
- Enh #20042: Add empty array check to `ActiveQueryTrait::findWith()` (renkas)
- Enh #20032: Added `mask` method for string masking with multibyte support (salehhashemi1992) - Enh #20032: Added `mask` method for string masking with multibyte support (salehhashemi1992)

4
framework/db/ActiveQueryTrait.php
View File

@ -135,6 +135,10 @@ trait ActiveQueryTrait
*/ */
public function findWith($with, &$models) public function findWith($with, &$models)
{ {
if (empty($models)) {
return;
}
$primaryModel = reset($models); $primaryModel = reset($models);
if (!$primaryModel instanceof ActiveRecordInterface) { if (!$primaryModel instanceof ActiveRecordInterface) {
/* @var $modelClass ActiveRecordInterface */ /* @var $modelClass ActiveRecordInterface */