Fix #327: Fix yii\mongodb\BatchQueryResult to be compatible with PECL MongoDb 1.9.0 driver

Author: Bizley

.github/workflows/build.yml

@@ -7,7 +7,7 @@ env:
 
 jobs:
     phpunit:
-        name: PHP ${{ matrix.php }} on ${{ matrix.os }}
+        name: PHP ${{ matrix.php }} (mongodb ${{ matrix.mongoext }}) on ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
         services:
             mongodb:
@@ -20,6 +20,7 @@ jobs:
                 os: [ubuntu-latest]
                 php: ['7.0', '7.1', '7.2', '7.3', '7.4']
                 mongo: ['3']
+                mongoext: ['1.8.2', '1.9.0']
 
         steps:
             - name: Checkout
@@ -29,7 +30,7 @@ jobs:
               with:
                   php-version: ${{ matrix.php }}
                   tools: pecl
-                  extensions: mongodb
+                  extensions: mongodb-${{ matrix.mongoext }}
                   ini-values: date.timezone='UTC'
             - name: Get composer cache directory
               id: composer-cache

CHANGELOG.md

@@ -4,7 +4,7 @@ Yii Framework 2 mongodb extension Change Log
 2.1.11 under development
 ------------------------
 
-- no changes in this release.
+- Bug #327: Fix `yii\mongodb\BatchQueryResult` to be compatible with PECL MongoDb 1.9.0 driver (bizley)
 
 
 2.1.10 November 10, 2020

src/BatchQueryResult.php

@@ -146,13 +146,11 @@ protected function fetchData()
         $count = 0;
 
         while ($count++ < $this->batchSize) {
-            $row = $this->_iterator->current();
-            if ($row === null) {
+            if (!$this->_iterator->valid()) {
                 break;
             }
+            $rows[] = $this->_iterator->current();
             $this->_iterator->next();
-            //var_dump($row);
-            $rows[] = $row;
         }
         return $this->query->populate($rows);
     }
@@ -186,4 +184,4 @@ public function valid()
     {
         return !empty($this->_batch);
     }
-}
+}