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

Release fix from SilverFire

Browse Source
This commit is contained in:
LAV45
2015-11-29 01:24:43 +03:00
parent 1028152aac
commit a2bf2598ce
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/helpers/BaseJson.php
View File

@ -132,9 +132,7 @@ class BaseJson
*/ */
protected static function processData($data, &$expressions, $expPrefix) protected static function processData($data, &$expressions, $expPrefix)
{ {
if ($data instanceof \Traversable) { if (is_object($data)) {
return $data;
} elseif (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;
@ -144,6 +142,8 @@ class BaseJson
$data = $data->jsonSerialize(); $data = $data->jsonSerialize();
} elseif ($data instanceof Arrayable) { } elseif ($data instanceof Arrayable) {
$data = $data->toArray(); $data = $data->toArray();
} elseif ($data instanceof \SimpleXMLElement) {
$data = (array) $data;
} else { } else {
$result = []; $result = [];
foreach ($data as $name => $value) { foreach ($data as $name => $value) {

7
tests/framework/helpers/JsonTest.php
View File

@ -7,6 +7,7 @@ use yii\helpers\BaseJson;
use yii\helpers\Json; use yii\helpers\Json;
use yiiunit\TestCase; use yiiunit\TestCase;
use yii\web\JsExpression; use yii\web\JsExpression;
use yiiunit\framework\web\Post;
/** /**
* @group helpers * @group helpers
@ -113,6 +114,12 @@ class JsonTest extends TestCase
$document = simplexml_load_string($xml); $document = simplexml_load_string($xml);
$this->assertSame('{"apiKey":"ieu2iqw4o","methodProperties":{"FindByString":"Kiev"}}', Json::encode($document)); $this->assertSame('{"apiKey":"ieu2iqw4o","methodProperties":{"FindByString":"Kiev"}}', Json::encode($document));
$postsStack = new \SplStack();
$postsStack->push(new Post(915, 'record1'));
$postsStack->push(new Post(456, 'record2'));
$this->assertSame('{"1":{"id":456,"title":"record2"},"0":{"id":915,"title":"record1"}}', Json::encode($postsStack));
} }
public function testDecode() public function testDecode()