From a21af88b8f8ea3d788d1c66e34fcf4e377592867 Mon Sep 17 00:00:00 2001 From: Ener-Getick Date: Thu, 23 Jun 2016 19:03:12 +0200 Subject: [PATCH] [FrameworkBundle] Remove redundant code --- .../DependencyInjection/FrameworkExtension.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 16b5431b1acc5..8cd1fea64a0fa 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -140,11 +140,11 @@ public function load(array $configs, ContainerBuilder $container) $this->registerAnnotationsConfiguration($config['annotations'], $container, $loader); $this->registerPropertyAccessConfiguration($config['property_access'], $container); - if (isset($config['serializer'])) { + if ($this->isConfigEnabled($container, $config['serializer'])) { $this->registerSerializerConfiguration($config['serializer'], $container, $loader); } - if (isset($config['property_info'])) { + if ($this->isConfigEnabled($container, $config['property_info'])) { $this->registerPropertyInfoConfiguration($config['property_info'], $container, $loader); } @@ -956,10 +956,6 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild */ private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { - if (!$this->isConfigEnabled($container, $config)) { - return; - } - if (class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) { // Run after serializer.normalizer.object $definition = $container->register('serializer.normalizer.data_uri', DataUriNormalizer::class); @@ -1075,10 +1071,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder */ private function registerPropertyInfoConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { - if (!$this->isConfigEnabled($container, $config)) { - return; - } - $loader->load('property_info.xml'); if (interface_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {