Skip to content

Replace Filter::equal and Filter::unequal with Filter::like and Filter::unlike correspondingly #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilmerg merged 1 commit into from
May 20, 2022
Merged

Replace Filter::equal and Filter::unequal with Filter::like and Filter::unlike correspondingly #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Control/SearchBar/ValidatedOperator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ class ValidatedOperator extends ValidatedTerm
public static function fromFilterCondition(Filter\Condition $condition)
{
switch (true) {
case $condition instanceof Filter\Unlike:
case $condition instanceof Filter\Unequal:
$operator = '!=';
break;
case $condition instanceof Filter\Similar:
case $condition instanceof Filter\Equal:
$operator = '=';
break;
Expand Down
34 changes: 27 additions & 7 deletions src/Control/SearchEditor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,25 +167,45 @@ protected function applyChanges(Filter\Rule $rule, array &$values, array $path =
}

$newValue = $this->popKey($values, $identifier . '-value');
if ($newValue !== null && $rule->getValue() !== $newValue) {
$oldValue = $rule->getValue();
if ($newValue !== null && $oldValue !== $newValue) {
$rule->setValue($newValue);
}

$newOperator = $this->popKey($values, $identifier . '-operator');
if ($newOperator !== null && QueryString::getRuleSymbol($rule) !== $newOperator) {
$value = $rule->getValue();
$column = $rule->getColumn();
switch ($newOperator) {
case '=':
return Filter::equal($rule->getColumn(), $rule->getValue());
if (is_string($value) && strpos($value, '*') !== false) {
return Filter::similar($column, $value);
}

return Filter::equal($column, $value);
case '!=':
return Filter::unequal($rule->getColumn(), $rule->getValue());
if (is_string($value) && strpos($value, '*') !== false) {
return Filter::unlike($column, $value);
}

return Filter::unequal($column, $value);
case '>':
return Filter::greaterThan($rule->getColumn(), $rule->getValue());
return Filter::greaterThan($column, $value);
case '>=':
return Filter::greaterThanOrEqual($rule->getColumn(), $rule->getValue());
return Filter::greaterThanOrEqual($column, $value);
case '<':
return Filter::lessThan($rule->getColumn(), $rule->getValue());
return Filter::lessThan($column, $value);
case '<=':
return Filter::lessThanOrEqual($rule->getColumn(), $rule->getValue());
return Filter::lessThanOrEqual($column, $value);
}
}

$value = $rule->getValue();
if ($oldValue !== $value && is_string($value) && strpos($value, '*') !== false) {
if (QueryString::getRuleSymbol($rule) === '=') {
return Filter::similar($rule->getColumn(), $value);
} elseif (QueryString::getRuleSymbol($rule) === '!=') {
return Filter::unlike($rule->getColumn(), $value);
}
}
} else {
Expand Down
8 changes: 8 additions & 0 deletions src/Filter/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,16 @@ protected function createCondition($column, $operator, $value)

switch ($operator) {
case '=':
if (is_string($value) && strpos($value, "*") !== false) {
return Filter::similar($column, $value);
}

return Filter::equal($column, $value);
case '!=':
if (is_string($value) && strpos($value, '*') !== false) {
return Filter::unlike($column, $value);
}

return Filter::unequal($column, $value);
case '>':
return Filter::greaterThan($column, $value);
Expand Down
2 changes: 2 additions & 0 deletions src/Filter/QueryString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ public static function getRuleSymbol(Filter\Rule $rule)
{
switch (true) {
case $rule instanceof Filter\Unequal:
case $rule instanceof Filter\Unlike:
return '!=';
case $rule instanceof Filter\Equal:
case $rule instanceof Filter\Similar:
return '=';
case $rule instanceof Filter\GreaterThan:
return '>';
Expand Down
2 changes: 2 additions & 0 deletions src/Filter/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,11 @@ protected function renderCondition(Filter\Condition $condition)

switch (true) {
case $condition instanceof Filter\Unequal:
case $condition instanceof Filter\Unlike:
$this->string .= '!=';
break;
case $condition instanceof Filter\Equal:
case $condition instanceof Filter\Similar:
$this->string .= '=';
break;
case $condition instanceof Filter\GreaterThan:
Expand Down
43 changes: 43 additions & 0 deletions tests/FilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,33 @@ public function testParserIdentifiesSingleConditions()
);
}

public function testParserIdentifiesWildCardCharacters()
{
$this->assertInstanceOf(
Filter\Similar::class,
QueryString::parse("foo=ba*"),
"Filter\Parser doesn't parse conditions with wildcard character correctly"
);

$this->assertInstanceOf(
Filter\Equal::class,
QueryString::parse("foo=bar"),
"Filter\Parser doesn't parse conditions without wildcard character correctly"
);

$this->assertInstanceOf(
Filter\Unlike::class,
QueryString::parse("foo!=ba*"),
"Filter\Parser doesn't parse conditions with wildcard character correctly"
);

$this->assertInstanceOf(
Filter\Unequal::class,
QueryString::parse("foo!=bar"),
"Filter\Parser doesn't parse conditions without wildcard character correctly"
);
}

public function testParserIdentifiesBooleanConditions()
{
$expectedTrue = QueryString::render(Filter::equal('active', true));
Expand Down Expand Up @@ -56,13 +83,27 @@ public function testParserIdentifiesRelationalOperators()
"Filter\Parser doesn't parse = comparisons correctly"
);

$expectedSimilar = QueryString::render(Filter::similar('foo', 'ba*'));
$this->assertEquals(
$expectedSimilar,
QueryString::render(QueryString::parse($expectedSimilar)),
"Filter\Parser doesn't parse = comparisons correctly for wildcard characters"
);

$expectedUnequal = QueryString::render(Filter::unequal('foo', 'bar'));
$this->assertEquals(
$expectedUnequal,
QueryString::render(QueryString::parse($expectedUnequal)),
"Filter\Parser doesn't parse != comparisons correctly"
);

$expectedUnlike = QueryString::render(Filter::unlike('foo', 'ba*'));
$this->assertEquals(
$expectedUnlike,
QueryString::render(QueryString::parse($expectedUnlike)),
"Filter\Parser doesn't parse != comparisons correctly for wildcard characters"
);

$expectedGreaterThan = QueryString::render(Filter::greaterThan('length', 3));
$this->assertEquals(
$expectedGreaterThan,
Expand Down Expand Up @@ -342,6 +383,8 @@ public function testParserIdentifiesTheHolyGrail()
Filter::equal('active', false),
/* testParserIdentifiesRelationalOperators */
Filter::unequal('foo', 'bar'),
Filter::similar('foo', 'ba*'),
Filter::unlike('foo', 'ba*'),
Filter::greaterThan('length', 3),
Filter::lessThan('length', 3),
Filter::greaterThanOrEqual('length', 3),
Expand Down