Merge branch...

Merge branch 'fix/#2500-#2497-return-false-from-mysqli-statement-when-nothing-is-fetched-2.5' into 2.5

Close #2500
Close #2497

lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php

@@ -242,7 +242,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
     {
         $values = $this->_fetch();
         if (null === $values) {
-            return null;
+            return false;
         }
 
         if (false === $values) {
@@ -282,7 +282,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
                 $rows[] = $row;
             }
         } else {
-            while (($row = $this->fetch($fetchMode)) !== null) {
+            while (($row = $this->fetch($fetchMode)) !== false) {
                 $rows[] = $row;
             }
         }
@@ -296,7 +296,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
     public function fetchColumn($columnIndex = 0)
     {
         $row = $this->fetch(PDO::FETCH_NUM);
-        if (null === $row) {
+        if (false === $row) {
             return false;
         }
 

tests/Doctrine/Tests/DBAL/Functional/DataAccessTest.php

@@ -239,6 +239,13 @@ class DataAccessTest extends \Doctrine\Tests\DbalFunctionalTestCase
         $this->assertEquals('foo', $row[1]);
     }
 
+    public function testFetchNoResult()
+    {
+        self::assertFalse(
+            $this->_conn->executeQuery('SELECT test_int FROM fetch_table WHERE test_int = ?', [-1])->fetch()
+        );
+    }
+
     public function testFetchAssoc()
     {
         $sql = "SELECT test_int, test_string FROM fetch_table WHERE test_int = ? AND test_string = ?";