Skip to content

Commit d8ede9e

Browse files
committed
fix
1 parent ae9cb39 commit d8ede9e

2 files changed

Lines changed: 14 additions & 21 deletions

File tree

src/Metadata/Tests/Resource/Factory/DefaultParametersResourceMetadataCollectionFactoryTest.php

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,25 @@
2828
*/
2929
final class DefaultParametersResourceMetadataCollectionFactoryTest extends TestCase
3030
{
31+
private const DEFAULT_PARAMETERS = [
32+
HeaderParameter::class => [
33+
'key' => 'X-API-Version',
34+
'required' => true,
35+
'description' => 'API Version',
36+
],
37+
];
38+
3139
public function testDefaultParametersAppliedToRealResource(): void
3240
{
33-
$defaultParameters = [
34-
HeaderParameter::class => [
35-
'key' => 'X-API-Version',
36-
'required' => true,
37-
'description' => 'API Version',
38-
],
39-
];
40-
4141
$attributesFactory = new AttributesResourceMetadataCollectionFactory();
42-
$defaultParametersFactory = new DefaultParametersResourceMetadataCollectionFactory($defaultParameters, $attributesFactory);
42+
$defaultParametersFactory = new DefaultParametersResourceMetadataCollectionFactory(self::DEFAULT_PARAMETERS, $attributesFactory);
4343

4444
$resourceClass = TestProductResource::class;
4545

4646
$collection = $defaultParametersFactory->create($resourceClass);
4747

4848
$this->assertCount(1, $collection);
49-
5049
$resource = $collection[0];
51-
5250
$operations = $resource->getOperations();
5351
$this->assertNotNull($operations);
5452

@@ -74,16 +72,8 @@ public function testDefaultParametersAppliedToRealResource(): void
7472

7573
public function testDefaultParametersWithOperationOverride(): void
7674
{
77-
$defaultParameters = [
78-
HeaderParameter::class => [
79-
'key' => 'X-API-Version',
80-
'required' => true,
81-
'description' => 'API Version',
82-
],
83-
];
84-
8575
$attributesFactory = new AttributesResourceMetadataCollectionFactory();
86-
$defaultParametersFactory = new DefaultParametersResourceMetadataCollectionFactory($defaultParameters, $attributesFactory);
76+
$defaultParametersFactory = new DefaultParametersResourceMetadataCollectionFactory(self::DEFAULT_PARAMETERS, $attributesFactory);
8777

8878
$resourceClass = TestProductResourceWithParameters::class;
8979

@@ -92,6 +82,7 @@ public function testDefaultParametersWithOperationOverride(): void
9282
$this->assertCount(1, $collection);
9383
$resource = $collection[0];
9484
$operations = $resource->getOperations();
85+
$this->assertNotNull($operations);
9586

9687
$collectionOperation = null;
9788
foreach ($operations as $operation) {

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,9 @@ private function registerCommonConfiguration(ContainerBuilder $container, array
392392
$container->setAlias('api_platform.name_converter', $config['name_converter']);
393393
}
394394
$container->setParameter('api_platform.asset_package', $config['asset_package']);
395-
$container->setParameter('api_platform.defaults', $this->normalizeDefaults($config['defaults'] ?? []));
395+
$normalizedDefaults = $this->normalizeDefaults($config['defaults'] ?? []);
396+
$container->setParameter('api_platform.defaults', $normalizedDefaults);
397+
$container->setParameter('api_platform.defaults.parameters', $normalizedDefaults['parameters'] ?? []);
396398

397399
if ($container->getParameter('kernel.debug')) {
398400
$container->removeDefinition('api_platform.serializer.mapping.cache_class_metadata_factory');

0 commit comments

Comments
 (0)