From 060775b0dabf3b2a27aa35a4135dde61a800962f Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 18 Dec 2013 14:31:43 +0100
Subject: [PATCH] Json::encode did not handle JsonSerializable objects

---
 framework/CHANGELOG.md             | 1 +
 framework/yii/helpers/BaseJson.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 1c36d5d..cc0d4b0 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
 - Bug #1545: It was not possible to execute db Query twice, params where missing (cebe)
 - Bug: Fixed `Call to a member function registerAssetFiles() on a non-object` in case of wrong `sourcePath` for an asset bundle (samdark)
 - Bug: Fixed incorrect event name for `yii\jui\Spinner` (samdark)
+- Bug: Json::encode() did not handle objects that implement JsonSerializable interface correctly (cebe)
 - Enh #1293: Replaced Console::showProgress() with a better approach. See Console::startProgress() for details (cebe)
 - Enh #1406: DB Schema support for Oracle Database (p0larbeer, qiangxue)
 - Enh #1437: Added ListView::viewParams (qiangxue)
diff --git a/framework/yii/helpers/BaseJson.php b/framework/yii/helpers/BaseJson.php
index 35b35ff..019c7ef 100644
--- a/framework/yii/helpers/BaseJson.php
+++ b/framework/yii/helpers/BaseJson.php
@@ -81,6 +81,10 @@ class BaseJson
 	 */
 	protected static function processData($data, &$expressions, $expPrefix)
 	{
+		if ($data instanceof \JsonSerializable) {
+			return $data;
+		}
+
 		if (is_object($data)) {
 			if ($data instanceof JsExpression) {
 				$token = "!{[$expPrefix=" . count($expressions) . ']}!';