Trying to fix zendframework#6768: allowing false values in PriorityList

samsonasik · Oct 16, 2014 · e9812a0 · e9812a0
1 parent 3e6936d
commit e9812a0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/library/Zend/Stdlib/PriorityList.php b/library/Zend/Stdlib/PriorityList.php
@@ -54,6 +54,13 @@ class PriorityList implements Iterator, Countable
      */
     protected $sorted = false;
 
+    /**
+     * Holds current node, false if current() was invalid
+     *
+     * @var mixed
+     */
+    protected $currentNode = false;
+
     /**
      * Insert a new item.
      *
@@ -193,6 +200,7 @@ public function rewind()
     public function current()
     {
         $node = current($this->items);
+        $this->currentNode = $node;
         return ($node !== false ? $node['data'] : false);
     }
 
@@ -227,7 +235,8 @@ public function next()
      */
     public function valid()
     {
-        return ($this->current() !== false);
+        $this->current();
+        return ($this->currentNode !== false);
     }
 
     /**