Fix ignoring zero filters

mohammad-fouladgar · Sep 4, 2020 · 91220dc · 91220dc
1 parent bffceba
commit 91220dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -76,15 +76,15 @@ private function registerMacros()
                 if (is_array($value)) {
                     $result = [];
                     array_walk_recursive($value, static function ($val) use (&$result) {
-                        if (!empty($val)) {
+                        if (isset($val) && strlen($val) !== 0) {
                             $result[] = $val;
                         }
                     });
 
                     return !empty($result);
                 }
 
-                return !is_int($filter) && !empty($value);
+                return !is_int($filter) && (isset($value) && strlen($value) !== 0);
             });
 
             return $filters->all();

diff --git a/tests/CollectionMacrosTest.php b/tests/CollectionMacrosTest.php
@@ -11,6 +11,7 @@ public function it_can_remove_lacking_value()
             'city' => 'isfahan',
             'name',
             'gender' => '',
+            'level' => 0,
             'age'    => null,
             'date'   => [
                 'from' => '',
@@ -21,7 +22,7 @@ public function it_can_remove_lacking_value()
                 'max' => '',
             ],
             'area' => [
-                'min' => 50,
+                'min' => 0,
                 'max' => 100,
             ],
             'rental' => [
@@ -30,17 +31,22 @@ public function it_can_remove_lacking_value()
                     'max' => 500,
                 ],
             ],
+            'weight' => [
+                'min' => 0,
+                'max' => 0,
+            ]
         ]);
 
         $this->assertEquals(
             [
                 'city'  => 'isfahan',
+                'level' => 0,
                 'price' => [
                     'min' => 10000,
                     'max' => '',
                 ],
                 'area' => [
-                    'min' => 50,
+                    'min' => 0,
                     'max' => 100,
                 ],
                 'rental' => [
@@ -49,6 +55,10 @@ public function it_can_remove_lacking_value()
                         'max' => 500,
                     ],
                 ],
+                'weight' => [
+                    'min' => 0,
+                    'max' => 0,
+                ]
             ],
             $inputs->getFilters()
         );