Making EntityTrait::toArray smarter about how it handles input

cakephp · May 13, 2015 · 529a427 · 529a427
1 parent c7c32b6
commit 529a427
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -437,12 +437,16 @@ public function toArray()
         $result = [];
         foreach ($this->visibleProperties() as $property) {
             $value = $this->get($property);
-            if (is_array($value) && isset($value[0]) && $value[0] instanceof EntityInterface) {
+            if (is_array($value)) {
                 $result[$property] = [];
                 foreach ($value as $k => $entity) {
-                    $result[$property][$k] = $entity->toArray();
+                    if (method_exists($entity, 'toArray')) {
+                        $result[$property][$k] = $entity->toArray();
+                    } else {
+                        $result[$property][$k] = $entity;
+                    }
                 }
-            } elseif ($value instanceof EntityInterface) {
+            } elseif (method_exists($value, 'toArray')) {
                 $result[$property] = $value->toArray();
             } else {
                 $result[$property] = $value;

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -806,6 +806,30 @@ public function testToArrayRecursive()
         $this->assertEquals($expected, $user->toArray());
     }
 
+    /**
+     * Tests that an entity with entities and other misc types can be properly toArray'd
+     *
+     * @return void
+     */
+    public function testToArrayMixed()
+    {
+        $test = new Entity([
+            'id' => 1,
+            'foo' => [
+                new Entity(['hi' => 'test']),
+                'notentity' => 1
+            ]
+        ]);
+        $expected = [
+            'id' => 1,
+            'foo' => [
+                ['hi' => 'test'],
+                'notentity' => 1
+            ]
+        ];
+        $this->assertEquals($expected, $test->toArray());
+    }
+
     /**
      * Test that get accessors are called when converting to arrays.
      *