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

refactored Json helper.

Browse Source
This commit is contained in:
Qiang Xue
2014-01-11 17:25:54 -05:00
parent c7c34aaf3e
commit 3f6fec3c55
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/helpers/BaseJson.php
View File

@ -81,18 +81,20 @@ class BaseJson
*/ */
protected static function processData($data, &$expressions, $expPrefix) protected static function processData($data, &$expressions, $expPrefix)
{ {
if ($data instanceof \JsonSerializable) {
$data = $data->jsonSerialize();
}
if (is_object($data)) { if (is_object($data)) {
if ($data instanceof JsExpression) { if ($data instanceof JsExpression) {
$token = "!{[$expPrefix=" . count($expressions) . ']}!'; $token = "!{[$expPrefix=" . count($expressions) . ']}!';
$expressions['"' . $token . '"'] = $data->expression; $expressions['"' . $token . '"'] = $data->expression;
return $token; return $token;
} elseif ($data instanceof \JsonSerializable) {
$data = $data->jsonSerialize();
} elseif ($data instanceof Arrayable) {
$data = $data->toArray();
} else {
$data = get_object_vars($data);
} }
$data = $data instanceof Arrayable ? $data->toArray() : get_object_vars($data);
if ($data === [] && !$data instanceof Arrayable) { if ($data === []) {
return new \stdClass(); return new \stdClass();
} }
} }