Use "toArray()" when available.

Type casting object implementing ArrayAccess does not yield the expected array.
cakephp · Oct 13, 2015 · b6eb79e · b6eb79e
1 parent 286ba0f
commit b6eb79e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -156,6 +156,9 @@ public static function extract($data, $path)
             list($token, $conditions) = self::_splitConditions($token);
 
             foreach ($context[$_key] as $item) {
+                if (is_object($item) && method_exists($item, 'toArray')) {
+                    $item = $item->toArray();
+                }
                 foreach ((array)$item as $k => $v) {
                     if (static::_matchToken($k, $token)) {
                         $next[] = $v;

diff --git a/tests/TestCase/Utility/HashTest.php b/tests/TestCase/Utility/HashTest.php
@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\Utility;
 
 use ArrayObject;
+use Cake\ORM\Entity;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Hash;
 
@@ -152,7 +153,7 @@ public static function articleData()
     public static function articleDataObject()
     {
         return new ArrayObject([
-            new ArrayObject([
+            new Entity([
                 'Article' => new ArrayObject([
                     'id' => '1',
                     'user_id' => '1',