Making jsonSerialize be called recursively in entities

cakephp · Apr 30, 2016 · 590d135 · 590d135
1 parent c8edd81
commit 590d135
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -467,7 +467,7 @@ public function toArray()
      */
     public function jsonSerialize()
     {
-        return $this->toArray();
+        return $this->extract($this->visibleProperties());
     }
 
     /**

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -645,6 +645,21 @@ public function testJsonSerialize()
         $this->assertEquals(json_encode($data), json_encode($entity));
     }
 
+    /**
+     * Tests that jsonSerialize is called recursivily for contained entities
+     *
+     * @return void
+     */
+    public function testJsonSerializeRecursive()
+    {
+        $phone = $this->getMock(Entity::class, ['jsonSerialize']);
+        $phone->expects($this->once())->method('jsonSerialize')->will($this->returnValue('12345'));
+        $data = ['name' => 'James', 'age' => 20, 'phone' => $phone];
+        $entity = new Entity($data);
+        $expected = ['name' => 'James', 'age' => 20, 'phone' => '12345'];
+        $this->assertEquals(json_encode($expected), json_encode($entity));
+    }
+
     /**
      * Tests the extract method
      *