Speeding up conversion of collections to arrays

cakephp · Jan 6, 2015 · 9ee1eab · 9ee1eab
1 parent 6b9920d
commit 9ee1eab
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
@@ -15,6 +15,7 @@
 namespace Cake\Collection;
 
 use AppendIterator;
+use ArrayIterator;
 use ArrayObject;
 use Cake\Collection\Collection;
 use Cake\Collection\Iterator\BufferedIterator;
@@ -409,6 +410,16 @@ public function insert($path, $values)
      */
     public function toArray($preserveKeys = true)
     {
+        if (get_class($this) === 'Cake\Collection\Collection') {
+            $inner = $this->getInnerIterator();
+            if ($inner instanceof ArrayIterator) {
+                $items = $this->getInnerIterator()->getArrayCopy();
+                return $preserveKeys ? $items : array_values($items);
+            }
+            if ($inner instanceof CollectionInterface) {
+                return $inner->toArray($preserveKeys);
+            }
+        }
         return iterator_to_array($this, $preserveKeys);
     }
 
@@ -418,7 +429,7 @@ public function toArray($preserveKeys = true)
      */
     public function toList()
     {
-        return iterator_to_array($this, false);
+        return $this->toArray(false);
     }
 
     /**