Merge branch 'hotfix/zendframework/zendframework#6242-stdlib/Priority…

…List/fixCurrentAndIterator' into develop

Close zendframework/zendframework#6242

src/PriorityList.php

@@ -192,6 +192,7 @@ public function rewind()
      */
     public function current()
     {
+        $this->sorted || $this->sort();
         $node = current($this->items);
         return ($node !== false ? $node['data'] : false);
     }
@@ -204,6 +205,7 @@ public function current()
      */
     public function key()
     {
+        $this->sorted || $this->sort();
         return key($this->items);
     }
 
@@ -230,6 +232,14 @@ public function valid()
         return ($this->current() !== false);
     }
 
+    /**
+     * @return self
+     */
+    public function getIterator()
+    {
+        return clone $this;
+    }
+
     /**
      * count(): defined by Countable interface.
      *

test/PriorityListTest.php

@@ -171,6 +171,26 @@ public function testPriorityWithNegativesAndNull()
         $this->assertEquals(array('bar', 'foo', 'baz'), $orders);
     }
 
+    public function testCurrent()
+    {
+        $this->list->insert('foo', 'foo_value', null);
+        $this->list->insert('bar', 'bar_value', 1);
+        $this->list->insert('baz', 'baz_value', -1);
+
+        $this->assertEquals('bar', $this->list->key());
+        $this->assertEquals('bar_value', $this->list->current());
+    }
+
+    public function testIterator()
+    {
+        $this->list->insert('foo', 'foo_value');
+        $iterator = $this->list->getIterator();
+        $this->assertEquals($iterator, $this->list);
+
+        $this->list->insert('bar', 'bar_value');
+        $this->assertNotEquals($iterator, $this->list);
+    }
+
     public function testToArray()
     {
         $this->list->insert('foo', 'foo_value', null);