Merge pull request laminas#211 from Ocramius/fix/laminas#210-correct-resultset-cloning-to-avoid-iterator-rewind-issues

Ensure that each `Adapter#query()` call produces a new `ResultSet`

Author: Ocramius

src/Adapter/Adapter.php

@@ -195,9 +195,12 @@ public function query(
         }
 
         if ($result instanceof Driver\ResultInterface && $result->isQueryResult()) {
-            $resultSet = $resultPrototype !== null ? clone $resultPrototype : $this->queryResultSetPrototype;
-            $resultSet->initialize($result);
-            return $resultSet;
+            $resultSet     = $resultPrototype ?? $this->queryResultSetPrototype;
+            $resultSetCopy = clone $resultSet;
+
+            $resultSetCopy->initialize($result);
+
+            return $resultSetCopy;
         }
 
         return $result;

test/unit/Adapter/AdapterTest.php

@@ -31,31 +31,31 @@
 
 class AdapterTest extends TestCase
 {
-    /** @var MockObject */
+    /** @var MockObject&DriverInterface */
     protected $mockDriver;
 
-    /** @var MockObject */
+    /** @var MockObject&PlatformInterface */
     protected $mockPlatform;
 
-    /** @var MockObject */
+    /** @var MockObject&ConnectionInterface */
     protected $mockConnection;
 
-    /** @var MockObject */
+    /** @var MockObject&StatementInterface */
     protected $mockStatement;
 
     /** @var Adapter */
     protected $adapter;
 
     protected function setUp(): void
     {
-        $this->mockDriver     = $this->getMockBuilder(DriverInterface::class)->getMock();
-        $this->mockConnection = $this->getMockBuilder(ConnectionInterface::class)->getMock();
-        $this->mockDriver->expects($this->any())->method('checkEnvironment')->will($this->returnValue(true));
-        $this->mockDriver->expects($this->any())->method('getConnection')
+        $this->mockDriver     = $this->createMock(DriverInterface::class);
+        $this->mockConnection = $this->createMock(ConnectionInterface::class);
+        $this->mockDriver->method('checkEnvironment')->will($this->returnValue(true));
+        $this->mockDriver->method('getConnection')
             ->will($this->returnValue($this->mockConnection));
-        $this->mockPlatform  = $this->getMockBuilder(PlatformInterface::class)->getMock();
-        $this->mockStatement = $this->getMockBuilder(StatementInterface::class)->getMock();
-        $this->mockDriver->expects($this->any())->method('createStatement')
+        $this->mockPlatform  = $this->createMock(PlatformInterface::class);
+        $this->mockStatement = $this->createMock(StatementInterface::class);
+        $this->mockDriver->method('createStatement')
             ->will($this->returnValue($this->mockStatement));
 
         $this->adapter = new Adapter($this->mockDriver, $this->mockPlatform);
@@ -222,6 +222,25 @@ public function testQueryWhenPreparedProducesStatement()
         self::assertSame($this->mockStatement, $s);
     }
 
+    /** @group #210 */
+    public function testProducedResultSetPrototypeIsDifferentForEachQuery()
+    {
+        $statement = $this->createMock(StatementInterface::class);
+        $result    = $this->createMock(ResultInterface::class);
+
+        $this->mockDriver->method('createStatement')
+            ->willReturn($statement);
+        $this->mockStatement->method('execute')
+            ->willReturn($result);
+        $result->method('isQueryResult')
+            ->willReturn(true);
+
+        self::assertNotSame(
+            $this->adapter->query('SELECT foo', []),
+            $this->adapter->query('SELECT foo', [])
+        );
+    }
+
     /**
      * @testdox unit test: Test query() in prepare mode, with array of parameters, produces a result object
      * @covers \Laminas\Db\Adapter\Adapter::query