Merge pull request #3893 from duncan3dc/pdo-custom-class-constructor

Ensure the constructor arguments are passed to custom classes

lib/Doctrine/DBAL/Statement.php

@@ -249,11 +249,7 @@ class Statement implements IteratorAggregate, DriverStatement
      */
     public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null)
     {
-        if ($fetchArgument) {
-            return $this->stmt->fetchAll($fetchMode, $fetchArgument);
-        }
-
-        return $this->stmt->fetchAll($fetchMode);
+        return $this->stmt->fetchAll($fetchMode, $fetchArgument, $ctorArgs);
     }
 
     /**

tests/Doctrine/Tests/DBAL/StatementTest.php

@@ -7,6 +7,7 @@ use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
+use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\Logging\SQLLogger;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Statement;
@@ -28,7 +29,7 @@ class StatementTest extends DbalTestCase
     protected function setUp() : void
     {
         $this->pdoStatement = $this->getMockBuilder(PDOStatement::class)
-            ->onlyMethods(['execute', 'bindParam', 'bindValue'])
+            ->onlyMethods(['execute', 'bindParam', 'bindValue', 'fetchAll'])
             ->getMock();
 
         $driverConnection = $this->createMock(DriverConnection::class);
@@ -150,4 +151,15 @@ class StatementTest extends DbalTestCase
 
         $statement->execute();
     }
+
+    public function testPDOCustomClassConstructorArgs() : void
+    {
+        $statement = new Statement('', $this->conn);
+
+        $this->pdoStatement->expects($this->once())
+            ->method('fetchAll')
+            ->with(self::equalTo(FetchMode::CUSTOM_OBJECT), self::equalTo('Example'), self::equalTo(['arg1']));
+
+        $statement->fetchAll(FetchMode::CUSTOM_OBJECT, 'Example', ['arg1']);
+    }
 }