Merge pull request #2 from yarlson/master

Fixes a notice in count and countBy methods
micheleangioni · May 30, 2018 · 374bb9e · 374bb9e
2 parents 4912dc7 + f2aedea
commit 374bb9e
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/PhalconRepositories/AbstractCollectionRepository.php b/src/PhalconRepositories/AbstractCollectionRepository.php
@@ -224,7 +224,7 @@ public function getIn(string $whereInKey, array $whereIn = [], string $orderBy =
 
         return $this->model->find($input);
     }
-    
+
     /**
      * Return the first ordered $limit records querying input parameters.
      * $limit = 0 means no limits.
@@ -272,7 +272,7 @@ public function getInAndWhereByPage(int $page = 1, int $limit = 10, string $wher
         }
 
         return $this->model->find($input);
-    }   
+    }
 
     /**
      * Return the first ordered $limit records querying input parameters.
@@ -726,15 +726,8 @@ public function truncate()
      */
     public function count()
     {
-        $aggregateArray = [
-            [
-                '$count' => 'number'
-            ]
-        ];
 
-        $result = $this->model::aggregate($aggregateArray);
-
-        return $result->toArray()[0]['number'];
+        return $this->countBy([]);
     }
 
     /**
@@ -759,9 +752,13 @@ public function countBy(array $match = [])
             '$count' => 'number'
         ];
 
-        $result = $this->model::aggregate($aggregateArray);
+        $result = $this->model::aggregate($aggregateArray)->toArray();
+
+        if (count($result)) {
+            return $result[0]['number'];
+        }
 
-        return $result->toArray()[0]['number'];
+        return 0;
     }
 
     /**