fix(hydra): "property" may not be defined (#7293)

fixes  #7290

Author: soyuka

src/Hydra/Serializer/CollectionFiltersNormalizer.php

@@ -152,16 +152,20 @@ private function getSearch(string $resourceClass, array $parts, array $filters,
                         continue;
                     }
 
-                    if (($prop = $parameter->getProperty()) && ($description['property'] ?? null) !== $prop) {
+                    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', $description['property'], $key);
-                    $variable = str_replace($description['property'], $k, $variable);
+                    $k = str_replace(':property', $descriptionProperty, $key);
+                    $variable = str_replace($descriptionProperty, $k, $variable);
                     $variables[] = $variable;
-                    $m = ['@type' => 'IriTemplateMapping', 'variable' => $variable, 'property' => $description['property'], 'required' => $description['required']];
-                    if (null !== ($required = $parameter->getRequired())) {
+                    $m = ['@type' => 'IriTemplateMapping', 'variable' => $variable, 'property' => $descriptionProperty];
+                    if (null !== ($required = $parameter->getRequired() ?? $description['required'] ?? null)) {
                         $m['required'] = $required;
                     }
                     $mapping[] = $m;

tests/Fixtures/TestBundle/ApiResource/WithParameter.php

@@ -267,6 +267,14 @@
     ],
     provider: [self::class, 'noopProvider'],
 )]
+#[GetCollection(
+    uriTemplate: 'with_parameters_filter_without_property{._format}',
+    parameters: [
+        'myParam' => new QueryParameter(filter: 'some_custom_filter_without_description'),
+    ],
+    provider: [self::class, 'collectionProvider'],
+)]
+
 #[QueryParameter(key: 'everywhere')]
 class WithParameter
 {

tests/Fixtures/TestBundle/Filter/NoDescriptionFilter.php

@@ -0,0 +1,24 @@
+<?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\Tests\Fixtures\TestBundle\Filter;
+
+use ApiPlatform\Metadata\FilterInterface;
+
+class NoDescriptionFilter implements FilterInterface
+{
+    public function getDescription(string $resourceClass): array
+    {
+        return ['a' => ['required' => true]];
+    }
+}

tests/Fixtures/app/config/config_doctrine.yml

@@ -16,6 +16,10 @@ services:
         arguments: [ { 'id': ~, 'name': 'desc', 'description': ~, 'relatedDummy.name': ~, 'embeddedDummy.dummyName': 'desc', 'relatedDummy.symfony': ~, 'dummyDate': ~} ]
         tags:      [ { name: 'api_platform.filter', id: 'my_dummy.order' } ]
 
+    app.some_custom_filter_without_description:
+        class: 'ApiPlatform\Tests\Fixtures\TestBundle\Filter\NoDescriptionFilter'
+        tags:      [ { name: 'api_platform.filter', id: 'some_custom_filter_without_description' } ]
+
     app.my_dummy_resource.date_filter:
         parent:    'api_platform.doctrine.orm.date_filter'
         arguments: [ { 'dummyDate': ~, 'relatedDummy.dummyDate': ~, 'embeddedDummy.dummyDate': ~ } ]

tests/Functional/Parameters/HydraTest.php

@@ -41,4 +41,14 @@ public function testHydraTemplate(): void
             ],
         ]], $response->toArray());
     }
+
+    public function testNoPropertyDescription(): void
+    {
+        $response = self::createClient()->request('GET', 'with_parameters_filter_without_property.jsonld');
+        $this->assertArraySubset(['hydra:search' => [
+            'hydra:template' => '/with_parameters_filter_without_property.jsonld{?}',
+            'hydra:mapping' => [
+            ],
+        ]], $response->toArray());
+    }
 }