Merge branch 'feature/performance-audit' of https://github.com/EvanDo…

…tPro/zf2

src/SplPriorityQueue.php

@@ -46,6 +46,7 @@ public function insert($datum, $priority)
         parent::insert($datum, $priority);
     }
 
+
     /**
      * Serialize to an array
      *
@@ -55,46 +56,27 @@ public function insert($datum, $priority)
      */
     public function toArray()
     {
-        $this->setExtractFlags(self::EXTR_BOTH);
         $array = array();
-        while ($this->valid()) {
-            $array[] = $this->current();
-            $this->next();
-        }
-        $this->setExtractFlags(self::EXTR_DATA);
-
-        // Iterating through a priority queue removes items
-        foreach ($array as $item) {
-            $this->insert($item['data'], $item['priority']);
-        }
-
-        // Return only the data
-        $return = array();
-        foreach ($array as $item) {
-            $return[] = $item['data'];
+        foreach (clone $this as $item) {
+            $array[] = $item;
         }
-
-        return $return;
+        return $array;
     }
 
+
     /**
      * Serialize
      *
      * @return string
      */
     public function serialize()
     {
-        $data = array();
-        $this->setExtractFlags(self::EXTR_BOTH);
-        while ($this->valid()) {
-            $data[] = $this->current();
-            $this->next();
-        }
-        $this->setExtractFlags(self::EXTR_DATA);
+        $clone = clone $this;
+        $clone->setExtractFlags(self::EXTR_BOTH);
 
-        // Iterating through a priority queue removes items
-        foreach ($data as $item) {
-            $this->insert($item['data'], $item['priority']);
+        $data = array();
+        foreach ($clone as $item) {
+            $data[] = $item;
         }
 
         return serialize($data);