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

Added support of JsonSerializable interface to ArrayableTrait (#17888)

Browse Source
This commit is contained in:
Ivan Hermanov
2020-02-22 11:34:27 +02:00
committed by GitHub
parent c41b428088
commit 6e9764b467
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/base/ArrayableTrait.php
View File

@ -128,12 +128,16 @@ trait ArrayableTrait
if ($recursive) {
$nestedFields = $this->extractFieldsFor($fields, $field);
$nestedExpand = $this->extractFieldsFor($expand, $field);
if ($attribute instanceof Arrayable) {
if ($attribute instanceof \JsonSerializable) {
$attribute = $attribute->jsonSerialize();
} elseif ($attribute instanceof Arrayable) {
$attribute = $attribute->toArray($nestedFields, $nestedExpand);
} elseif (is_array($attribute)) {
$attribute = array_map(
function ($item) use ($nestedFields, $nestedExpand) {
if ($item instanceof Arrayable) {
if ($item instanceof \JsonSerializable) {
return $item->jsonSerialize();
} elseif ($item instanceof Arrayable) {
return $item->toArray($nestedFields, $nestedExpand);
}
return $item;