yiisoft#10023. Fix codeclimate issue

alexkart · Jul 15, 2019 · 4bee9a4 · 4bee9a4
1 parent 25cf331
commit 4bee9a4
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/framework/db/BatchQueryResult.php b/framework/db/BatchQueryResult.php
@@ -135,13 +135,25 @@ public function next()
     /**
      * Fetches the next batch of data.
      * @return array the data fetched
+     * @throws Exception
      */
     protected function fetchData()
     {
         if ($this->_dataReader === null) {
             $this->_dataReader = $this->query->createCommand($this->db)->query();
         }
 
+        $rows = $this->getRows();
+
+        return $this->query->populate($rows);
+    }
+
+    /**
+     * Reads and collects rows for batch
+     * @return array
+     */
+    protected function getRows()
+    {
         $rows = [];
         $count = 0;
 
@@ -155,7 +167,7 @@ protected function fetchData()
             }
         }
 
-        return $this->query->populate($rows);
+        return $rows;
     }
 
     /**