Skip to content

Commit 110857b

Browse files
committed
refactor: some more style changes to adhere more to original code style
Fixes #7478
1 parent 17571a2 commit 110857b

File tree

3 files changed

+17
-32
lines changed

3 files changed

+17
-32
lines changed

src/Doctrine/Orm/Filter/PartialSearchFilter.php

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ final class PartialSearchFilter implements FilterInterface, OpenApiParameterFilt
2929
use BackwardCompatibleFilterDescriptionTrait;
3030
use OpenApiFilterTrait;
3131

32-
public function apply(
33-
QueryBuilder $queryBuilder,
34-
QueryNameGeneratorInterface $queryNameGenerator,
35-
string $resourceClass,
36-
?Operation $operation = null,
37-
array $context = [],
32+
public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = [],
3833
): void {
3934
$parameter = $context['parameter'];
4035
$alias = $queryBuilder->getRootAliases()[0];
@@ -44,34 +39,26 @@ public function apply(
4439
$parameterName = $queryNameGenerator->generateParameterName($property);
4540
$values = $parameter->getValue();
4641

47-
if (!\is_iterable($values)) {
48-
$queryBuilder->setParameter($parameterName, '%'.\strtolower($values).'%');
42+
if (!is_iterable($values)) {
43+
$queryBuilder->setParameter($parameterName, '%'.strtolower($values).'%');
4944

50-
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
51-
$queryBuilder
52-
->expr()
53-
->like(
54-
'LOWER('.$field.')',
55-
':'.$parameterName,
56-
),
57-
);
45+
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}($queryBuilder->expr()->like(
46+
'LOWER('.$field.')',
47+
':'.$parameterName,
48+
));
5849
} else {
5950
$likeExpressions = [];
6051
foreach ($values as $val) {
6152
$parameterName = $queryNameGenerator->generateParameterName($property);
62-
$likeExpressions[] = $queryBuilder
63-
->expr()
64-
->like(
65-
'LOWER('.$field.')',
66-
':'.$parameterName,
67-
);
68-
$queryBuilder->setParameter($parameterName, '%'.\strtolower($val).'%');
53+
$likeExpressions[] = $queryBuilder->expr()->like(
54+
'LOWER('.$field.')',
55+
':'.$parameterName,
56+
);
57+
$queryBuilder->setParameter($parameterName, '%'.strtolower($val).'%');
6958
}
7059

7160
$queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
72-
$queryBuilder
73-
->expr()
74-
->orX(...$likeExpressions),
61+
$queryBuilder->expr()->orX(...$likeExpressions),
7562
);
7663
}
7764
}

tests/Fixtures/TestBundle/Entity/SearchFilterParameter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'searchOnTextAndDate[:property]' => new QueryParameter(filter: 'app_filter_date_and_search'),
3838
'searchParameter[:property]' => new QueryParameter(
3939
filter : new PartialSearchFilter(),
40-
properties: ['foo']
40+
properties: ['foo'],
4141
),
4242
'q' => new QueryParameter(property: 'hydra:freetextQuery'),
4343
]

tests/Functional/Parameters/DoctrineTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,9 @@ public function testPartialSearchFilter(): void
124124
$resource = $this->isMongoDB() ? SearchFilterParameterDocument::class : SearchFilterParameter::class;
125125
$this->recreateSchema([$resource]);
126126
$this->loadFixtures($resource);
127-
$route = 'search_filter_parameter';
128-
$response = self::createClient()
129-
->request('GET', $route . '?searchParameter[foo]=baz')
130-
;
131-
$a = $response->toArray();
127+
$route = 'search_filter_parameter';
128+
$response = self::createClient()->request('GET', $route.'?searchParameter[foo]=baz');
129+
$a = $response->toArray();
132130
$this->assertEquals($a['hydra:member'][0]['foo'], 'baz');
133131
}
134132

0 commit comments

Comments
 (0)