Merge branch 'hotfix/ZF-9521' of https://github.com/adamlundrigan/zf2 …

…into hotfix/zf-9521 Conflicts: tests/Zend/Json/JsonTest.php
zendframework · Aug 30, 2011 · 252cf0c · 252cf0c
commit 252cf0c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/src/Encoder.php b/src/Encoder.php
@@ -146,18 +146,22 @@ protected function _encodeObject(&$value)
 
         $props = '';
 
-        if ($value instanceof \Iterator) {
-            $propCollection = $value;
+        if (method_exists($value, 'toJson')) {
+            $props =',' . preg_replace("/^\{(.*)\}$/","\\1",$value->toJson());
         } else {
-            $propCollection = get_object_vars($value);
-        }
+            if ($value instanceof \Iterator) {
+                $propCollection = $value;
+            } else {
+                $propCollection = get_object_vars($value);
+            }
 
-        foreach ($propCollection as $name => $propValue) {
-            if (isset($propValue)) {
-                $props .= ','
-                        . $this->_encodeValue($name)
-                        . ':'
-                        . $this->_encodeValue($propValue);
+            foreach ($propCollection as $name => $propValue) {
+                if (isset($propValue)) {
+                    $props .= ','
+                            . $this->_encodeValue($name)
+                            . ':'
+                            . $this->_encodeValue($propValue);
+                }
             }
         }
 

diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -837,6 +837,19 @@ public function testEncodeWillUseToJsonWhenBothToJsonAndToArrayMethodsAreAvailab
         $this->assertNotSame($objJson, $arrJson);
     }
 
+    /**
+     * @group ZF-9521
+     */
+    public function testWillEncodeArrayOfObjectsEachWithToJsonMethod()
+    {
+        $array = array('one'=>new ToJsonClass());
+        $expected = '{"one":{"__className":"ZendTest\\\\Json\\\\ToJSONClass","firstName":"John","lastName":"Doe","email":"john@doe.com"}}';
+
+        Json\Json::$useBuiltinEncoderDecoder = true;
+        $json = Json\Encoder::encode($array);
+        $this->assertEquals($expected, $json);
+    }
+
 }
 
 /**