Skip to content

Commit ff42209

Browse files
committed
test
1 parent 46bb4db commit ff42209

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

src/Doctrine/Orm/Filter/FreeTextQueryFilter.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,22 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
5252
$qb->resetDQLPart('where');
5353
$qb->setParameters(new ArrayCollection());
5454
foreach ($this->properties ?? $parameter->getProperties() ?? [] as $property) {
55+
$subParameter = $parameter->withProperty($property);
56+
57+
$nestedPropertiesInfo = $parameter->getExtraProperties()['nested_properties_info'] ?? [];
58+
if (isset($nestedPropertiesInfo[$property])) {
59+
$subParameter = $subParameter->withExtraProperties([
60+
...$subParameter->getExtraProperties(),
61+
'nested_property_info' => $nestedPropertiesInfo[$property],
62+
]);
63+
}
64+
5565
$this->filter->apply(
5666
$qb,
5767
$queryNameGenerator,
5868
$resourceClass,
5969
$operation,
60-
['parameter' => $parameter->withProperty($property)] + $context
70+
['parameter' => $subParameter] + $context
6171
);
6272
}
6373

src/Doctrine/Orm/NestedPropertyHelperTrait.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ protected function addJoinsForNestedProperty(
3838
\ApiPlatform\Metadata\Parameter $parameter,
3939
): array {
4040
$extraProperties = $parameter->getExtraProperties();
41-
$nestedInfo = $extraProperties['nested_property_info']
42-
?? $extraProperties['nested_properties_info'][$property] ?? null;
41+
$nestedInfo = $extraProperties['nested_property_info'] ?? null;
4342

4443
if (!$nestedInfo) {
4544
return [$alias, $property];

src/Laravel/Eloquent/Metadata/ModelMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ private function attributeIsHidden(string $attribute, Model $model): bool
325325
*/
326326
public function getRelatedModelClass(string $modelClass, string $property): ?string
327327
{
328-
if (!is_subclass_of($modelClass, Model::class)) {
328+
if (!class_exists($modelClass)) {
329329
return null;
330330
}
331331

0 commit comments

Comments
 (0)