[6.x] Fix field filters returning all results when filtering by 0

src/Query/Scopes/Filters/Fields/Date.php

@@ -81,7 +81,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;

src/Query/Scopes/Filters/Fields/Dimensions.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Query\Scopes\Filters\Fields;
 
-use Illuminate\Support\Arr;
+use Statamic\Support\Arr;
 
 use function Statamic\trans as __;
 
@@ -78,7 +78,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         return Arr::hasAll($values, ['dimension', 'operator', 'value']);
     }

src/Query/Scopes/Filters/Fields/FieldtypeFilter.php

@@ -84,7 +84,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;

src/Query/Scopes/Filters/Fields/Terms.php

@@ -70,7 +70,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         if (! $operator = Arr::get($values, 'operator')) {
             return false;

src/Query/Scopes/Filters/Fields/Toggle.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Query\Scopes\Filters\Fields;
 
-use Illuminate\Support\Arr;
+use Statamic\Support\Arr;
 
 use function Statamic\trans as __;
 
@@ -40,7 +40,7 @@ public function badge($values)
 
     public function isComplete($values): bool
     {
-        $values = array_filter($values);
+        $values = Arr::removeNullValues($values);
 
         return Arr::has($values, 'value');
     }

tests/Query/FieldtypeFilterTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Query;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Fields\Field;
+use Statamic\Fieldtypes\Integer as IntegerFieldtype;
+use Statamic\Fieldtypes\Text;
+use Statamic\Query\Scopes\Filters\Fields\Dimensions;
+use Tests\TestCase;
+
+class FieldtypeFilterTest extends TestCase
+{
+    #[Test]
+    #[DataProvider('completenessProvider')]
+    public function it_determines_if_a_filter_is_complete($values, $expected)
+    {
+        $filter = (new Text)->setField(new Field('test', ['type' => 'text']))->filter();
+
+        $this->assertEquals($expected, $filter->isComplete($values));
+    }
+
+    public static function completenessProvider()
+    {
+        return [
+            'no operator' => [['value' => 'foo'], false],
+            'operator but no value' => [['operator' => '='], false],
+            'operator and value' => [['operator' => '=', 'value' => 'foo'], true],
+            'zero string value' => [['operator' => '=', 'value' => '0'], true],
+            'zero integer value' => [['operator' => '=', 'value' => 0], true],
+            'null value' => [['operator' => '=', 'value' => null], false],
+            'empty string value' => [['operator' => '=', 'value' => ''], false],
+            'null operator without value' => [['operator' => 'null'], true],
+            'not-null operator without value' => [['operator' => 'not-null'], true],
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('dimensionsCompletenessProvider')]
+    public function it_determines_if_a_dimensions_filter_is_complete($values, $expected)
+    {
+        $fieldtype = (new IntegerFieldtype)->setField(new Field('test', ['type' => 'integer']));
+        $filter = new Dimensions($fieldtype);
+
+        $this->assertEquals($expected, $filter->isComplete($values));
+    }
+
+    public static function dimensionsCompletenessProvider()
+    {
+        return [
+            'all fields present' => [['dimension' => 'width', 'operator' => '=', 'value' => '100'], true],
+            'zero value' => [['dimension' => 'width', 'operator' => '=', 'value' => 0], true],
+            'zero string value' => [['dimension' => 'width', 'operator' => '=', 'value' => '0'], true],
+            'null value' => [['dimension' => 'width', 'operator' => '=', 'value' => null], false],
+            'missing value' => [['dimension' => 'width', 'operator' => '='], false],
+            'missing dimension' => [['operator' => '=', 'value' => '100'], false],
+        ];
+    }
+}