Skip to content

Commit 06f64fa

Browse files
committed
Merge remote-tracking branch 'origin/issue/RDT-440' into issue/RDT-440
# Conflicts: # src/Filters/FiltersPartial.php
2 parents 57b8290 + e0d1db5 commit 06f64fa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Filters/FiltersPartial.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public function __invoke(Builder $query, $value, string $property)
2525
$databaseDriver = $this->getDatabaseDriver($query);
2626

2727
if (is_array($value)) {
28-
if (count(array_filter($value, fn ($item) => $item != '')) === 0) {
28+
if (count(array_filter($value, fn ($item) => strlen($item) > 0)) === 0) {
2929
return $query;
3030
}
3131

32-
$query->where(function (Builder $query) use ($value, $wrappedProperty, $databaseDriver) {
33-
foreach (array_filter($value, fn ($item) => $item != '') as $partialValue) {
32+
$query->where(function (Builder $query) use ($databaseDriver, $value, $wrappedProperty) {
33+
foreach (array_filter($value, fn ($item) => strlen($item) > 0) as $partialValue) {
3434
[$sql, $bindings] = $this->getWhereRawParameters($partialValue, $wrappedProperty, $databaseDriver);
3535
$query->orWhereRaw($sql, $bindings);
3636
}
@@ -69,7 +69,7 @@ protected static function escapeLike(string $value): string
6969
}
7070

7171
/**
72-
* @param 'sqlite'|'pgsql'|'sqlsrc'|'mysql'|'mariadb' $driver
72+
* @param 'sqlite'|'pgsql'|'sqlsrc'|'mysql' $driver
7373
* @return string
7474
*/
7575
protected static function maybeSpecifyEscapeChar(string $driver): string

0 commit comments

Comments
 (0)