Skip to content

ApiPlatformExtension cleanup #2269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dunglas merged 1 commit into from
Oct 25, 2018
Merged

ApiPlatformExtension cleanup #2269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ public function load(array $configs, ContainerBuilder $container)
$useDoctrine = isset($bundles['DoctrineBundle']) && class_exists(Version::class);

$this->registerMetadataConfiguration($container, $config, $loader);
$this->registerOAuthConfiguration($container, $config, $loader);
$this->registerApiKeysConfiguration($container, $config, $loader);
$this->registerOAuthConfiguration($container, $config);
$this->registerApiKeysConfiguration($container, $config);
$this->registerSwaggerConfiguration($container, $config, $loader);
$this->registerJsonApiConfiguration($formats, $loader);
$this->registerJsonLdConfiguration($container, $formats, $loader, $config['enable_docs']);
Expand All @@ -141,9 +141,9 @@ public function load(array $configs, ContainerBuilder $container)
$this->registerBundlesConfiguration($bundles, $config, $loader, $useDoctrine);
$this->registerCacheConfiguration($container);
$this->registerDoctrineExtensionConfiguration($container, $config, $useDoctrine);
$this->registerHttpCache($container, $config, $loader, $useDoctrine);
$this->registerValidatorConfiguration($container, $config, $loader);
$this->registerDataCollector($container, $config, $loader);
$this->registerHttpCacheConfiguration($container, $config, $loader, $useDoctrine);
$this->registerValidatorConfiguration($container, $config);
$this->registerDataCollectorConfiguration($config, $loader);
}

/**
Expand Down Expand Up @@ -290,7 +290,7 @@ private function getResourcesToWatch(ContainerBuilder $container, array $resourc
/**
* Registers the OAuth configuration.
*/
private function registerOAuthConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader)
private function registerOAuthConfiguration(ContainerBuilder $container, array $config)
{
if (!$config['oauth']) {
return;
Expand All @@ -309,7 +309,7 @@ private function registerOAuthConfiguration(ContainerBuilder $container, array $
/**
* Registers the api keys configuration.
*/
private function registerApiKeysConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader)
private function registerApiKeysConfiguration(ContainerBuilder $container, array $config)
{
$container->setParameter('api_platform.swagger.api_keys', $config['swagger']['api_keys']);
}
Expand Down Expand Up @@ -456,7 +456,7 @@ private function registerDoctrineExtensionConfiguration(ContainerBuilder $contai
$container->removeDefinition('api_platform.doctrine.orm.query_extension.filter_eager_loading');
}

private function registerHttpCache(ContainerBuilder $container, array $config, XmlFileLoader $loader, bool $useDoctrine)
private function registerHttpCacheConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader, bool $useDoctrine)
{
$loader->load('http_cache.xml');

Expand Down Expand Up @@ -500,7 +500,7 @@ private function getFormats(array $configFormats): array
/**
* Registers the Validator configuration.
*/
private function registerValidatorConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader)
private function registerValidatorConfiguration(ContainerBuilder $container, array $config)
{
if (!$config['validator']) {
return;
Expand All @@ -512,7 +512,7 @@ private function registerValidatorConfiguration(ContainerBuilder $container, arr
/**
* Registers the DataCollector configuration.
*/
private function registerDataCollector(ContainerBuilder $container, array $config, XmlFileLoader $loader)
private function registerDataCollectorConfiguration(array $config, XmlFileLoader $loader)
{
if (!$config['enable_profiler']) {
return;
Expand Down