Bug #201: Fixed infinite loop

ActiveDataProvider.php

@@ -86,6 +86,10 @@ protected function prepareModels()
         }
 
         $query = clone $this->query;
+
+        $results = $query->search($this->db);
+        $this->setQueryResults(is_array($results) ? $results : []);
+
         if (($pagination = $this->getPagination()) !== false) {
             // pagination fails to validate page number, because total count is unknown at this stage
             $pagination->validatePage = false;
@@ -95,15 +99,11 @@ protected function prepareModels()
             $query->addOrderBy($sort->getOrders());
         }
 
-        if (is_array(($results = $query->search($this->db)))) {
-            $this->setQueryResults($results);
-            if ($pagination !== false) {
-                $pagination->totalCount = $this->getTotalCount();
-            }
-            return $results['hits']['hits'];
+        if ($pagination !== false) {
+            $pagination->totalCount = $this->getTotalCount();
         }
-        $this->setQueryResults([]);
-        return [];
+
+        return $results['hits']['hits'];
     }
 
     /**

CHANGELOG.md

@@ -4,6 +4,7 @@ Yii Framework 2 elasticsearch extension Change Log
 2.0.6 under development
 -----------------------
 
+- Bug #201: Fixed infinite loop (GHopperMSK)
 - Bug #180: Fixed `count()` compatibility with PHP 7.2 to not call it on scalar values (cebe)