Skip to content

Commit 2c10ea3

Browse files
committed
cs(doctrine): fix typing issues
1 parent fa3a068 commit 2c10ea3

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

src/Doctrine/Odm/Filter/FilterInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface FilterInterface extends BaseFilterInterface
2828
/**
2929
* Applies the filter.
3030
*
31-
* @param array{'parameter'?: Parameter, ...} $context
31+
* @param array|array{filters?: array<string, mixed>|array, parameter?: Parameter, mongodb_odm_sort_fields?: array, ...} $context
3232
*/
3333
public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void;
3434
}

src/Doctrine/Orm/Filter/ExistsFilter.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,11 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
142142
return;
143143
}
144144

145-
foreach ($context['filters'][$this->existsParameterName] ?? [] as $property => $value) {
146-
$this->filterProperty($this->denormalizePropertyName($property), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
145+
$properties = $context['filters'][$this->existsParameterName];
146+
if ([] !== $properties) {
147+
foreach ($properties as $property => $value) {
148+
$this->filterProperty($this->denormalizePropertyName($property), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
149+
}
147150
}
148151
}
149152

src/Doctrine/Orm/Filter/FilterInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface FilterInterface extends BaseFilterInterface
2929
/**
3030
* Applies the filter.
3131
*
32-
* @param array{'parameter'?: Parameter} $context
32+
* @param array{filters?: array<string, mixed>|array, parameter?: Parameter, ...} $context
3333
*/
3434
public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void;
3535
}

tests/Functional/Parameters/ExactFilterTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,8 @@ private function loadFixtures(): void
136136
$chicken2->setName('Henriette');
137137
$chicken2->setChickenCoop($chickenCoop2);
138138

139-
if (method_exists($chickenCoop1, 'addChicken')) {
140-
$chickenCoop1->addChicken($chicken1);
141-
$chickenCoop2->addChicken($chicken2);
142-
}
139+
$chickenCoop1->addChicken($chicken1);
140+
$chickenCoop2->addChicken($chicken2);
143141

144142
$manager->persist($chickenCoop1);
145143
$manager->persist($chickenCoop2);

tests/Functional/Parameters/PartialSearchFilterTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,8 @@ private function loadFixtures(): void
130130
$chicken2->setName('Henriette');
131131
$chicken2->setChickenCoop($chickenCoop2);
132132

133-
if (method_exists($chickenCoop1, 'addChicken')) {
134-
$chickenCoop1->addChicken($chicken1);
135-
$chickenCoop2->addChicken($chicken2);
136-
}
133+
$chickenCoop1->addChicken($chicken1);
134+
$chickenCoop2->addChicken($chicken2);
137135

138136
$manager->persist($chickenCoop1);
139137
$manager->persist($chickenCoop2);

0 commit comments

Comments
 (0)