Make ParameterExtension context more generic

Author: GromNaN

src/Doctrine/Odm/Extension/OrderExtension.php

@@ -97,7 +97,7 @@ protected function getManagerRegistry(): ManagerRegistry
     private function hasSortStage(Builder $aggregationBuilder): bool
     {
         try {
-            for ($index = 0; true; $index++) {
+            for ($index = 0; true; ++$index) {
                 if ($aggregationBuilder->getStage($index) instanceof Sort) {
                     // If at least one stage is sort, then it has sorting
                     return true;

src/Doctrine/Odm/Extension/ParameterExtension.php

@@ -89,18 +89,10 @@ private function applyFilter(Builder $aggregationBuilder, ?string $resourceClass
                 $filter->setProperties($properties ?? []);
             }
 
-            $filterContext = ['filters' => $values, 'parameter' => $parameter, 'match' => $context['match'] ?? null, 'search' => $context['search'] ?? null];
+            $specificContext = ['filters' => $values, 'parameter' => $parameter];
+            $filterContext = array_replace($context, $specificContext);
             $filter->apply($aggregationBuilder, $resourceClass, $operation, $filterContext);
-            // update by reference
-            if (isset($filterContext['mongodb_odm_sort_fields'])) {
-                $context['mongodb_odm_sort_fields'] = $filterContext['mongodb_odm_sort_fields'];
-            }
-            if (isset($filterContext['match'])) {
-                $context['match'] = $filterContext['match'];
-            }
-            if (isset($filterContext['search'])) {
-                $context['search'] = $filterContext['search'];
-            }
+            $context = array_replace($context, array_diff_key($filterContext, $specificContext));
         }
 
         if (isset($context['match'])) {

src/Doctrine/Odm/Filter/AtlasSearchFilter.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace ApiPlatform\Doctrine\Odm\Filter;
@@ -84,7 +93,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
                     ->fuzzy(maxEdits: 1);
                 break;
             default:
-                throw new \InvalidArgumentException(sprintf('Unsupported operator "%s" for AtlasSearchFilter', $this->operator));
+                throw new \InvalidArgumentException(\sprintf('Unsupported operator "%s" for AtlasSearchFilter', $this->operator));
         }
     }
 }