odm

Author: soyuka

tests/Fixtures/TestBundle/Document/SearchFilterParameter.php

@@ -13,6 +13,7 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
 
+use ApiPlatform\Doctrine\Odm\Filter\PartialSearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\GraphQl\QueryCollection;
@@ -33,6 +34,10 @@
         'searchExact[:property]' => new QueryParameter(filter: 'app_odm_search_filter_with_exact'),
         'searchOnTextAndDate[:property]' => new QueryParameter(filter: 'app_odm_filter_date_and_search'),
         'q' => new QueryParameter(property: 'hydra:freetextQuery'),
+        'search[:property]' => new QueryParameter(
+            filter: new PartialSearchFilter(),
+            properties: ['foo', 'createdAt']
+        ),
     ]
 )]
 #[QueryCollection(

tests/Fixtures/TestBundle/Entity/SearchFilterParameter.php

@@ -13,6 +13,7 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\PartialSearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
@@ -36,7 +37,7 @@
         'searchOnTextAndDate[:property]' => new QueryParameter(filter: 'app_filter_date_and_search'),
         'q' => new QueryParameter(property: 'hydra:freetextQuery'),
         'search[:property]' => new QueryParameter(
-            filter: new \ApiPlatform\Doctrine\Orm\Filter\PartialSearchFilter(),
+            filter: new PartialSearchFilter(),
             properties: ['foo', 'createdAt']
         ),
     ]

tests/Fixtures/TestBundle/Filter/ODMSearchFilterValueTransformer.php

@@ -41,7 +41,6 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
             $this->searchFilter->setProperties($this->properties);
         }
 
-        $filterContext = ['filters' => $context['filters'][$this->key]] + $context;
-        $this->searchFilter->apply($aggregationBuilder, $resourceClass, $operation, $filterContext);
+        $this->searchFilter->apply($aggregationBuilder, $resourceClass, $operation, $context);
     }
 }

tests/Fixtures/TestBundle/Filter/ODMSearchTextAndDateFilter.php

@@ -39,8 +39,7 @@ public function getDescription(string $resourceClass): array
 
     public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
-        $filterContext = ['filters' => $context['filters']['searchOnTextAndDate']] + $context;
-        $this->searchFilter->apply($aggregationBuilder, $resourceClass, $operation, $filterContext);
-        $this->dateFilter->apply($aggregationBuilder, $resourceClass, $operation, $filterContext);
+        $this->searchFilter->apply($aggregationBuilder, $resourceClass, $operation, $context);
+        $this->dateFilter->apply($aggregationBuilder, $resourceClass, $operation, $context);
     }
 }

tests/Fixtures/TestBundle/Filter/SearchFilterValueTransformer.php

@@ -42,6 +42,6 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
             $this->searchFilter->setProperties($this->properties);
         }
 
-        $this->searchFilter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, ['filters' => $context['filters']] + $context);
+        $this->searchFilter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
     }
 }