Skip to content

Commit 5d0a4f6

Browse files
committed
refactor: simplify control flow
Fixes #7478
1 parent 6777dee commit 5d0a4f6

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/Doctrine/Orm/Filter/PartialSearchFilter.php

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,23 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
4646
'LOWER('.$field.')',
4747
':'.$parameterName,
4848
));
49-
} else {
50-
$likeExpressions = [];
51-
foreach ($values as $val) {
52-
$parameterName = $queryNameGenerator->generateParameterName($property);
53-
$likeExpressions[] = $queryBuilder->expr()->like(
54-
'LOWER('.$field.')',
55-
':'.$parameterName,
56-
);
57-
$queryBuilder->setParameter($parameterName, '%'.strtolower($val).'%');
58-
}
5949

60-
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
61-
$queryBuilder->expr()->orX(...$likeExpressions),
50+
continue;
51+
}
52+
53+
$likeExpressions = [];
54+
foreach ($values as $val) {
55+
$parameterName = $queryNameGenerator->generateParameterName($property);
56+
$likeExpressions[] = $queryBuilder->expr()->like(
57+
'LOWER('.$field.')',
58+
':'.$parameterName,
6259
);
60+
$queryBuilder->setParameter($parameterName, '%'.strtolower($val).'%');
6361
}
62+
63+
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
64+
$queryBuilder->expr()->orX(...$likeExpressions),
65+
);
6466
}
6567
}
6668
}

0 commit comments

Comments
 (0)