Fixed fetching empty values from a SQL Server statement

doctrine · Mar 16, 2018 · b1953ea · b1953ea
1 parent 1ebc1f0
commit b1953ea
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
@@ -24,6 +24,7 @@
 use Doctrine\DBAL\ParameterType;
 use IteratorAggregate;
 use Doctrine\DBAL\Driver\Statement;
+use function func_get_args;
 
 /**
  * SQL Server Statement.
@@ -348,19 +349,19 @@ public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = n
 
         switch ($fetchMode) {
             case FetchMode::CUSTOM_OBJECT:
-                while ($row = call_user_func_array([$this, 'fetch'], func_get_args())) {
+                while (($row = $this->fetch(...func_get_args())) !== false) {
                     $rows[] = $row;
                 }
                 break;
 
             case FetchMode::COLUMN:
-                while ($row = $this->fetchColumn()) {
+                while (($row = $this->fetchColumn()) !== false) {
                     $rows[] = $row;
                 }
                 break;
 
             default:
-                while ($row = $this->fetch($fetchMode)) {
+                while (($row = $this->fetch($fetchMode)) !== false) {
                     $rows[] = $row;
                 }
         }