Skip to content

Commit b2680b8

Browse files
committed
fix Behat
1 parent ce64984 commit b2680b8

2 files changed

Lines changed: 2 additions & 31 deletions

File tree

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,8 @@ 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-
$normalizedDefaults = $this->normalizeDefaults($config['defaults'] ?? []);
396-
$container->setParameter('api_platform.defaults', $normalizedDefaults);
397-
$container->setParameter('api_platform.defaults.parameters', $normalizedDefaults['parameters'] ?? []);
395+
$container->setParameter('api_platform.defaults', $this->normalizeDefaults($config['defaults'] ?? []));
396+
$container->setParameter('api_platform.defaults.parameters', []);
398397

399398
if ($container->getParameter('kernel.debug')) {
400399
$container->removeDefinition('api_platform.serializer.mapping.cache_class_metadata_factory');
@@ -422,9 +421,7 @@ private function getPaginationDefaults(array $defaults, array $collectionPaginat
422421
private function normalizeDefaults(array $defaults): array
423422
{
424423
$normalizedDefaults = ['extra_properties' => $defaults['extra_properties'] ?? []];
425-
$normalizedDefaults['parameters'] = $defaults['parameters'] ?? [];
426424
unset($defaults['extra_properties']);
427-
unset($defaults['parameters']);
428425

429426
$rc = new \ReflectionClass(ApiResource::class);
430427
$publicProperties = [];

src/Symfony/Bundle/DependencyInjection/Configuration.php

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -655,32 +655,6 @@ private function addDefaultsSection(ArrayNodeDefinition $rootNode): void
655655
$this->defineDefault($defaultsNode, new \ReflectionClass(ApiResource::class), $nameConverter);
656656
$this->defineDefault($defaultsNode, new \ReflectionClass(Put::class), $nameConverter);
657657
$this->defineDefault($defaultsNode, new \ReflectionClass(Post::class), $nameConverter);
658-
659-
$defaultsNode
660-
->children()
661-
->arrayNode('parameters')
662-
->info('Global parameters to be applied to all resources and operations.')
663-
->useAttributeAsKey('parameter_class')
664-
->normalizeKeys(false)
665-
->prototype('array')
666-
->ignoreExtraKeys(false)
667-
->children()
668-
->scalarNode('key')->info('The parameter key/name.')->end()
669-
->booleanNode('required')->defaultFalse()->info('Whether the parameter is required.')->end()
670-
->scalarNode('description')->defaultNull()->info('The parameter description.')->end()
671-
->scalarNode('property')->defaultNull()->info('The property mapped to this parameter.')->end()
672-
->variableNode('default')->defaultNull()->info('The default value for the parameter.')->end()
673-
->variableNode('schema')->defaultNull()->info('The JSON schema for the parameter.')->end()
674-
->scalarNode('filter')->defaultNull()->info('The filter service ID for the parameter.')->end()
675-
->integerNode('priority')->defaultNull()->info('The parameter priority.')->end()
676-
->booleanNode('hydra')->defaultNull()->info('Whether to include this parameter in Hydra documentation.')->end()
677-
->variableNode('constraints')->defaultNull()->info('The validation constraints for the parameter.')->end()
678-
->scalarNode('security')->defaultNull()->info('The security expression for the parameter.')->end()
679-
->scalarNode('security_message')->defaultNull()->info('The security message for the parameter.')->end()
680-
->end()
681-
->end()
682-
->end()
683-
->end();
684658
}
685659

686660
private function addMakerSection(ArrayNodeDefinition $rootNode): void

0 commit comments

Comments
 (0)