fixed that array should work out of the box as a source for ResultSet

Author: bartmcleod

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])) {

test/ResultSet/ResultSetIntegrationTest.php

@@ -89,6 +89,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 ReturnType();
+        $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')

test/ResultSet/ReturnType.php

@@ -0,0 +1,13 @@
+<?php
+
+
+namespace ZendTest\Db\ResultSet;
+
+
+class ReturnType
+{
+    public function exchangeArray(array $values)
+    {
+
+    }
+}