tt

Author: soyuka

src/Hydra/Serializer/CollectionFiltersNormalizer.php

@@ -107,7 +107,13 @@ public function normalize(mixed $object, ?string $format = null, array $context
 
         if ($currentFilters || ($parameters && \count($parameters))) {
             $hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);
-            $data[$hydraPrefix.'search'] = $this->getSearch($resourceClass, $requestParts, $currentFilters, $parameters, $hydraPrefix);
+            ['mapping' => $mapping, 'keys' => $keys] = $this->getSearchMappingAndKeys($operation, $resourceClass, $currentFilters, $parameters, [$this, 'getFilter']);
+            $data[$hydraPrefix.'search'] = [
+                '@type' => $hydraPrefix.'IriTemplate',
+                $hydraPrefix.'template' => \sprintf('%s{?%s}', $requestParts['path'], implode(',', $keys)),
+                $hydraPrefix.'variableRepresentation' => 'BasicRepresentation',
+                $hydraPrefix.'mapping' => $mapping,
+            ];
         }
 
         return $data;
@@ -123,91 +129,6 @@ public function setNormalizer(NormalizerInterface $normalizer): void
         }
     }
 
-    /**
-     * Returns the content of the Hydra search property.
-     *
-     * @param FilterInterface[] $filters
-     */
-    private function getSearch(string $resourceClass, array $parts, array $filters, ?Parameters $parameters, string $hydraPrefix): array
-    {
-        $variables = [];
-        $mapping = [];
-        foreach ($filters as $filter) {
-            foreach ($filter->getDescription($resourceClass) as $variable => $data) {
-                $variables[] = $variable;
-                $mapping[] = ['@type' => 'IriTemplateMapping', 'variable' => $variable, 'property' => $data['property'] ?? null, 'required' => $data['required'] ?? false];
-            }
-        }
-
-        foreach ($parameters ?? [] as $key => $parameter) {
-            // Each IriTemplateMapping maps a variable used in the template to a property
-            if (!$parameter instanceof QueryParameterInterface || false === $parameter->getHydra()) {
-                continue;
-            }
-
-            if (($filterId = $parameter->getFilter()) && \is_string($filterId) && ($filter = $this->getFilter($filterId))) {
-                $filterDescription = $filter->getDescription($resourceClass);
-
-                foreach ($filterDescription as $variable => $description) {
-                    // // This is a practice induced by PHP and is not necessary when implementing URI template
-                    if (str_ends_with((string) $variable, '[]')) {
-                        continue;
-                    }
-
-                    if (!($descriptionProperty = $description['property'] ?? null)) {
-                        continue;
-                    }
-
-                    if (($prop = $parameter->getProperty()) && $descriptionProperty !== $prop) {
-                        continue;
-                    }
-
-                    // :property is a pattern allowed when defining parameters
-                    $k = str_replace(':property', $descriptionProperty, $key);
-                    $variable = str_replace($descriptionProperty, $k, $variable);
-                    $variables[] = $variable;
-                    $m = ['@type' => 'IriTemplateMapping', 'variable' => $variable, 'property' => $descriptionProperty];
-                    if (null !== ($required = $parameter->getRequired() ?? $description['required'] ?? null)) {
-                        $m['required'] = $required;
-                    }
-                    $mapping[] = $m;
-                }
-
-                if ($filterDescription) {
-                    continue;
-                }
-            }
-
-            if (str_contains($key, ':property') && $parameter->getProperties()) {
-                $required = $parameter->getRequired();
-                foreach ($parameter->getProperties() as $prop) {
-                    $k = str_replace(':property', $prop, $key);
-                    $m = ['@type' => 'IriTemplateMapping', 'variable' => $k, 'property' => $prop];
-                    $variables[] = $k;
-                    if (null !== $required) {
-                        $m['required'] = $required;
-                    }
-                    $mapping[] = $m;
-                }
-
-                continue;
-            }
-
-            if (!($property = $parameter->getProperty())) {
-                continue;
-            }
-
-            $m = ['@type' => 'IriTemplateMapping', 'variable' => $key, 'property' => $property];
-            $variables[] = $key;
-            if (null !== ($required = $parameter->getRequired())) {
-                $m['required'] = $required;
-            }
-            $mapping[] = $m;
-        }
-
-        return ['@type' => $hydraPrefix.'IriTemplate', $hydraPrefix.'template' => \sprintf('%s{?%s}', $parts['path'], implode(',', $variables)), $hydraPrefix.'variableRepresentation' => 'BasicRepresentation', $hydraPrefix.'mapping' => $mapping];
-    }
-
     /**
      * Gets a filter with a backward compatibility.
      */

src/Hydra/State/Util/SearchHelperTrait.php

@@ -25,9 +25,9 @@ trait SearchHelperTrait
     /**
      * @param FilterInterface[] $filters
      */
-    private function getSearch(string $path, ?Operation $operation = null, ?string $resourceClass = null, ?array $filters = [], ?Parameters $parameters = null): IriTemplate
+    private function getSearch(string $path, ?Operation $operation = null, ?string $resourceClass = null, ?array $filters = [], ?Parameters $parameters = null, ?callable $getFilter = null): IriTemplate
     {
-        ['mapping' => $mapping, 'keys' => $keys] = $this->getSearchMappingAndKeys($operation, $resourceClass, $filters, $parameters);
+        ['mapping' => $mapping, 'keys' => $keys] = $this->getSearchMappingAndKeys($operation, $resourceClass, $filters, $parameters, $getFilter);
 
         return new IriTemplate(
             variableRepresentation: 'BasicRepresentation',
@@ -41,7 +41,7 @@ private function getSearch(string $path, ?Operation $operation = null, ?string $
      *
      * @return array{mapping: list<IriTemplateMapping>, keys: list<string>}
      */
-    private function getSearchMappingAndKeys(?Operation $operation = null, ?string $resourceClass = null, ?array $filters = [], ?Parameters $parameters = null): array
+    private function getSearchMappingAndKeys(?Operation $operation = null, ?string $resourceClass = null, ?array $filters = [], ?Parameters $parameters = null, ?callable $getFilter = null): array
     {
         $mapping = [];
         $keys = [];
@@ -62,7 +62,7 @@ private function getSearchMappingAndKeys(?Operation $operation = null, ?string $
                 continue;
             }
 
-            if (($filterId = $parameter->getFilter()) && \is_string($filterId) && ($filter = $this->getFilter($filterId))) {
+            if ($getFilter && ($filterId = $parameter->getFilter()) && \is_string($filterId) && ($filter = $getFilter($filterId))) {
                 $filterDescription = $filter->getDescription($resourceClass);
 
                 foreach ($filterDescription as $variable => $description) {