Merge branch 'hotfix/bartmcleod' into develop

zendframework · Nov 30, 2017 · a5c3270 · a5c3270
2 parents ab816b7 + 75c7bcd
commit a5c3270
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/ResultSet/AbstractResultSet.php b/src/ResultSet/AbstractResultSet.php
@@ -194,6 +194,11 @@ public function key()
      */
     public function current()
     {
+        if (-1 === $this->buffer) {
+            // datasource was an array when the resultset was initialized
+            return $this->dataSource->current();
+        }
+
         if ($this->buffer === null) {
             $this->buffer = -2; // implicitly disable buffering from here on
         } elseif (is_array($this->buffer) && isset($this->buffer[$this->position])) {

diff --git a/test/ResultSet/ResultSetIntegrationTest.php b/test/ResultSet/ResultSetIntegrationTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest\Db\ResultSet;
 
 use ArrayIterator;
+use ArrayObject;
 use PHPUnit\Framework\TestCase;
 use SplStack;
 use stdClass;
@@ -89,6 +90,20 @@ public function testCanProvideIteratorAsDataSource()
         self::assertSame($it, $this->resultSet->getDataSource());
     }
 
+    public function testCanProvideArrayAsDataSource()
+    {
+        $dataSource = [['foo']];
+        $this->resultSet->initialize($dataSource);
+        $this->assertEquals($dataSource[0], (array) $this->resultSet->current());
+
+        $returnType = new ArrayObject([], ArrayObject::ARRAY_AS_PROPS);
+        $dataSource = [$returnType];
+        $this->resultSet->setArrayObjectPrototype($returnType);
+        $this->resultSet->initialize($dataSource);
+        $this->assertEquals($dataSource[0], $this->resultSet->current());
+        $this->assertContains($dataSource[0], $this->resultSet);
+    }
+
     public function testCanProvideIteratorAggregateAsDataSource()
     {
         $iteratorAggregate = $this->getMockBuilder('IteratorAggregate')