Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Query/Scopes/Filters/Fields/FieldtypeFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ public function badge($values)

public function isComplete($values): bool
{
$values = array_filter($values);

if (! $operator = Arr::get($values, 'operator')) {
return false;
}
Expand All @@ -94,6 +92,8 @@ public function isComplete($values): bool
return true;
}

return Arr::has($values, 'value');
$value = Arr::get($values, 'value');

return $value !== null && $value !== '';
}
}
36 changes: 36 additions & 0 deletions tests/Query/FieldtypeFilterTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

namespace Tests\Query;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Fields\Field;
use Statamic\Fieldtypes\Text;
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],
];
}
}
Loading