getResults() fix when a black array is provided

mauretto78 · Oct 22, 2019 · 25fd806 · 25fd806
1 parent 941b979
commit 25fd806
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 26 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/array-query.iml b/.idea/array-query.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/Exceptions/EmptyArrayException.php b/src/Exceptions/EmptyArrayException.php
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -10,18 +10,15 @@
 
 namespace ArrayQuery;
 
-use ArrayQuery\Exceptions\EmptyArrayException;
-use ArrayQuery\Exceptions\InvalidArrayException;
 use ArrayQuery\Exceptions\NotConsistentDataException;
 use ArrayQuery\Exceptions\NotExistingElementException;
 use ArrayQuery\Exceptions\NotValidCriterionOperatorException;
-use ArrayQuery\Exceptions\NotValidKeyElementInArrayException;
 use ArrayQuery\Exceptions\NotValidLimitsOfArrayException;
 use ArrayQuery\Exceptions\NotValidSortingOperatorException;
 use ArrayQuery\Filters\CriterionFilter;
 use ArrayQuery\Filters\JoinFilter;
-use ArrayQuery\Filters\SortingFilter;
 use ArrayQuery\Filters\LimitFilter;
+use ArrayQuery\Filters\SortingFilter;
 use ArrayQuery\Helpers\ArrayHelper;
 use ArrayQuery\Helpers\ConsistencyChecker;
 
@@ -54,7 +51,10 @@ class QueryBuilder
 
     /**
      * QueryBuilder constructor.
+     *
      * @param array $array
+     *
+     * @throws NotConsistentDataException
      */
     public function __construct(array $array)
     {
@@ -63,7 +63,9 @@ public function __construct(array $array)
 
     /**
      * @param array $array
+     *
      * @return static
+     * @throws NotConsistentDataException
      */
     public static function create(array $array)
     {
@@ -72,7 +74,8 @@ public static function create(array $array)
 
     /**
      * @param array $array
-     * @throws EmptyArrayException
+     *
+     * @return array
      * @throws NotConsistentDataException
      */
     private function setArray(array $array)
@@ -237,6 +240,10 @@ public function join($array, $arrayName, $parentKey, $foreignKey)
      */
     public function getResults()
     {
+        if(empty($this->array)){
+            return [];
+        }
+
         $results = $this->applySortingFilter($this->applyLimitFilter($this->applyCriteriaFilter($this->applyJoinFilter())));
 
         return array_map([ArrayHelper::class, 'convertToPlainArray'], $results);
@@ -317,7 +324,7 @@ private function applyJoinFilter()
      */
     private function applyCriteriaFilter(array $array)
     {
-        if (count($this->criteria) === 0) {
+        if (empty($this->criteria) or count($this->criteria) === 0) {
             return $array;
         }
 

diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -30,12 +30,12 @@ public function setUp()
 
     /**
      * @test
-     * @expectedException \ArrayQuery\Exceptions\EmptyArrayException
-     * @expectedExceptionMessage Empty array provided.
      */
-    public function it_throws_EmptyCollectionException_if_an_empty_array_is_provided()
+    public function it_return_a_void_array_if_an_empty_array_is_provided()
     {
-        QueryBuilder::create([]);
+        $qb = QueryBuilder::create([]);
+
+        $this->assertEquals([], $qb->getResults());
     }
 
     /**
@@ -195,7 +195,6 @@ public function it_should_get_results_with_no_criteria_applied()
     {
         foreach ($this->usersArrays as $array) {
             $qb = QueryBuilder::create($array);
-
             $this->assertCount(10, $qb->getResults());
         }
     }