fix: filter may not use FilterInterface (#6858)

* fix: filter may not use FilterInterface

* add tests

Author: soyuka

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

@@ -149,6 +149,10 @@ private function addFilterMetadata(Parameter $parameter): Parameter
             return $parameter;
         }
 
+        if (!\is_object($filterId) && !$this->filterLocator->has($filterId)) {
+            return $parameter;
+        }
+
         $filter = \is_object($filterId) ? $filterId : $this->filterLocator->get($filterId);
 
         if (!$filter) {
@@ -159,7 +163,7 @@ private function addFilterMetadata(Parameter $parameter): Parameter
             $parameter = $parameter->withSchema($schema);
         }
 
-        if (null === $parameter->getOpenApi() && $filter instanceof OpenApiParameterFilterInterface && ($openApiParameter = $filter->getOpenApiParameters($parameter)) && $openApiParameter instanceof OpenApiParameter) {
+        if (null === $parameter->getOpenApi() && $filter instanceof OpenApiParameterFilterInterface && ($openApiParameter = $filter->getOpenApiParameters($parameter))) {
             $parameter = $parameter->withOpenApi($openApiParameter);
         }
 
@@ -190,6 +194,10 @@ private function setDefaults(string $key, Parameter $parameter, string $resource
             $parameter = $parameter->withSchema($schema);
         }
 
+        if (($openapi = $description[$key]['openapi'] ?? null) && null === $parameter->getOpenApi() && $openapi instanceof OpenApiParameter) {
+            $parameter = $parameter->withOpenApi($openapi);
+        }
+
         $currentKey = $key;
         if (null === $parameter->getProperty() && isset($properties[$key])) {
             $parameter = $parameter->withProperty($key);

src/Metadata/Tests/Resource/Factory/ParameterResourceMetadataCollectionFactoryTests.php renamed to src/Metadata/Tests/Resource/Factory/ParameterResourceMetadataCollectionFactoryTest.php

@@ -13,10 +13,12 @@
 
 namespace ApiPlatform\Metadata\Tests\Resource\Factory;
 
+use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\FilterInterface;
 use ApiPlatform\Metadata\Parameters;
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
+use ApiPlatform\Metadata\Property\PropertyNameCollection;
 use ApiPlatform\Metadata\QueryParameter;
 use ApiPlatform\Metadata\Resource\Factory\AttributesResourceMetadataCollectionFactory;
 use ApiPlatform\Metadata\Resource\Factory\ParameterResourceMetadataCollectionFactory;
@@ -25,12 +27,14 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
-class ParameterResourceMetadataCollectionFactoryTests extends TestCase
+class ParameterResourceMetadataCollectionFactoryTest extends TestCase
 {
     public function testParameterFactory(): void
     {
         $nameCollection = $this->createStub(PropertyNameCollectionFactoryInterface::class);
+        $nameCollection->method('create')->willReturn(new PropertyNameCollection(['id', 'hydra', 'everywhere']));
         $propertyMetadata = $this->createStub(PropertyMetadataFactoryInterface::class);
+        $propertyMetadata->method('create')->willReturnOnConsecutiveCalls(new ApiProperty(identifier: true), new ApiProperty(readable: true), new ApiProperty(readable: true));
         $filterLocator = $this->createStub(ContainerInterface::class);
         $filterLocator->method('has')->willReturn(true);
         $filterLocator->method('get')->willReturn(new class implements FilterInterface {
@@ -64,6 +68,24 @@ public function getDescription(string $resourceClass): array
         $this->assertEquals(['type' => 'foo'], $hydraParameter->getSchema());
         $this->assertEquals(new Parameter('test', 'query'), $hydraParameter->getOpenApi());
         $everywhere = $parameters->get('everywhere', QueryParameter::class);
-        $this->assertEquals(new Parameter('everywhere', 'query', allowEmptyValue: true), $everywhere->getOpenApi());
+        $this->assertNull($everywhere->getOpenApi());
+    }
+
+    public function testParameterFactoryNoFilter(): void
+    {
+        $nameCollection = $this->createStub(PropertyNameCollectionFactoryInterface::class);
+        $nameCollection->method('create')->willReturn(new PropertyNameCollection(['id', 'hydra', 'everywhere']));
+        $propertyMetadata = $this->createStub(PropertyMetadataFactoryInterface::class);
+        $propertyMetadata->method('create')->willReturnOnConsecutiveCalls(new ApiProperty(identifier: true), new ApiProperty(readable: true), new ApiProperty(readable: true));
+        $filterLocator = $this->createStub(ContainerInterface::class);
+        $filterLocator->method('has')->willReturn(false);
+        $parameter = new ParameterResourceMetadataCollectionFactory(
+            $nameCollection,
+            $propertyMetadata,
+            new AttributesResourceMetadataCollectionFactory(),
+            $filterLocator
+        );
+        $operation = $parameter->create(WithParameter::class)->getOperation('collection');
+        $this->assertInstanceOf(Parameters::class, $parameters = $operation->getParameters());
     }
 }

src/OpenApi/Factory/OpenApiFactory.php

@@ -269,15 +269,18 @@ private function collectPaths(ApiResource $resource, ResourceMetadataCollection
 
                 if (($f = $p->getFilter()) && \is_string($f) && $this->filterLocator && $this->filterLocator->has($f)) {
                     $filter = $this->filterLocator->get($f);
-                    foreach ($filter->getDescription($entityClass) as $name => $description) {
-                        if ($prop = $p->getProperty()) {
-                            $name = str_replace($prop, $key, $name);
+
+                    if ($d = $filter->getDescription($entityClass)) {
+                        foreach ($d as $name => $description) {
+                            if ($prop = $p->getProperty()) {
+                                $name = str_replace($prop, $key, $name);
+                            }
+
+                            $openapiParameters[] = $this->getFilterParameter($name, $description, $operation->getShortName(), $f);
                         }
 
-                        $openapiParameters[] = $this->getFilterParameter($name, $description, $operation->getShortName(), $f);
+                        continue;
                     }
-
-                    continue;
                 }
 
                 $in = $p instanceof HeaderParameterInterface ? 'header' : 'query';