From 0ae803ae118946400526f1fe7c438ab49154db74 Mon Sep 17 00:00:00 2001 From: Ener-Getick Date: Thu, 4 Feb 2016 18:27:46 +0100 Subject: [PATCH 1/2] [FrameworkBundle] Use canBeEnabled() instead of canBeUnset() for consistency --- .../DependencyInjection/Configuration.php | 12 +++--- .../FrameworkExtension.php | 12 +++--- .../DependencyInjection/ConfigurationTest.php | 42 +++++++++++++++++++ 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 27cb7cb29d649..ab55275b20b2c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -204,7 +204,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode) ->booleanNode('only_master_requests')->defaultFalse()->end() ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end() ->arrayNode('matcher') - ->canBeUnset() + ->canBeEnabled() ->performNoDeepMerging() ->fixXmlConfig('ip') ->children() @@ -231,7 +231,7 @@ private function addRouterSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('router') ->info('router configuration') - ->canBeUnset() + ->canBeEnabled() ->children() ->scalarNode('resource')->isRequired()->end() ->scalarNode('type')->end() @@ -258,7 +258,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('session') ->info('session configuration') - ->canBeUnset() + ->canBeEnabled() ->children() ->scalarNode('storage_id')->defaultValue('session.storage.native')->end() ->scalarNode('handler_id')->defaultValue('session.handler.native_file')->end() @@ -289,7 +289,7 @@ private function addRequestSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('request') ->info('request configuration') - ->canBeUnset() + ->canBeEnabled() ->fixXmlConfig('format') ->children() ->arrayNode('formats') @@ -318,7 +318,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('templating') ->info('templating configuration') - ->canBeUnset() + ->canBeEnabled() ->children() ->scalarNode('hinclude_default_template')->defaultNull()->end() ->scalarNode('cache')->end() @@ -373,7 +373,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('assets') ->info('assets configuration') - ->canBeUnset() + ->canBeEnabled() ->fixXmlConfig('base_url') ->children() ->scalarNode('version_strategy')->defaultNull()->end() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index e3ab325541931..38eee809d1b63 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -83,12 +83,12 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('test.xml'); } - if (isset($config['session'])) { + if ($config['session']['enabled']) { $this->sessionConfigEnabled = true; $this->registerSessionConfiguration($config['session'], $container, $loader); } - if (isset($config['request'])) { + if ($config['request']['enabled']) { $this->registerRequestConfiguration($config['request'], $container, $loader); } @@ -104,11 +104,11 @@ public function load(array $configs, ContainerBuilder $container) $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader); - if (isset($config['assets'])) { + if ($config['assets']['enabled']) { $this->registerAssetsConfiguration($config['assets'], $container, $loader); } - if (isset($config['templating'])) { + if ($config['templating']['enabled']) { $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader); } @@ -119,7 +119,7 @@ public function load(array $configs, ContainerBuilder $container) $this->registerTranslatorConfiguration($config['translator'], $container); $this->registerProfilerConfiguration($config['profiler'], $container, $loader); - if (isset($config['router'])) { + if ($config['router']['enabled']) { $this->registerRouterConfiguration($config['router'], $container, $loader); } @@ -309,7 +309,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ $container->setParameter('profiler.storage.dsn', $config['dsn']); - if (isset($config['matcher'])) { + if ($config['matcher']['enabled']) { if (isset($config['matcher']['service'])) { $container->setAlias('profiler.request_matcher', $config['matcher']['service']); } elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index 317970b7b5ff5..9a73e95890d19 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -108,6 +108,7 @@ public function testAssetsCanBeEnabled() $config = $processor->processConfiguration($configuration, array(array('assets' => null))); $defaultConfig = array( + 'enabled' => true, 'version_strategy' => null, 'version' => null, 'version_format' => '%%s?%%s', @@ -193,6 +194,10 @@ protected static function getBundleDefaultConfig() 'only_master_requests' => false, 'dsn' => 'file:%kernel.cache_dir%/profiler', 'collect' => true, + 'matcher' => array( + 'enabled' => false, + 'ips' => array(), + ), ), 'translator' => array( 'enabled' => false, @@ -223,6 +228,43 @@ protected static function getBundleDefaultConfig() 'property_info' => array( 'enabled' => false, ), + 'router' => array( + 'enabled' => false, + 'http_port' => 80, + 'https_port' => 443, + 'strict_requirements' => true, + ), + 'session' => array( + 'enabled' => false, + 'storage_id' => 'session.storage.native', + 'handler_id' => 'session.handler.native_file', + 'cookie_httponly' => true, + 'gc_probability' => 1, + 'save_path' => '%kernel.cache_dir%/sessions', + 'metadata_update_threshold' => '0', + ), + 'request' => array( + 'enabled' => false, + 'formats' => array(), + ), + 'templating' => array( + 'enabled' => false, + 'hinclude_default_template' => null, + 'form' => array( + 'resources' => array('FrameworkBundle:Form'), + ), + 'engines' => array(), + 'loaders' => array(), + ), + 'assets' => array( + 'enabled' => false, + 'version_strategy' => null, + 'version' => null, + 'version_format' => '%%s?%%s', + 'base_path' => '', + 'base_urls' => array(), + 'packages' => array(), + ), ); } } From 467e7458ca8cf4b06fb12bf6fcb02ce1f1a67390 Mon Sep 17 00:00:00 2001 From: Ener-Getick Date: Wed, 2 Mar 2016 14:05:22 +0100 Subject: [PATCH 2/2] Always use isConfigEnabled() --- .../DependencyInjection/FrameworkExtension.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 38eee809d1b63..118b286313677 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -83,12 +83,12 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('test.xml'); } - if ($config['session']['enabled']) { + if ($this->isConfigEnabled($container, $config['session'])) { $this->sessionConfigEnabled = true; $this->registerSessionConfiguration($config['session'], $container, $loader); } - if ($config['request']['enabled']) { + if ($this->isConfigEnabled($container, $config['request'])) { $this->registerRequestConfiguration($config['request'], $container, $loader); } @@ -104,11 +104,11 @@ public function load(array $configs, ContainerBuilder $container) $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader); - if ($config['assets']['enabled']) { + if ($this->isConfigEnabled($container, $config['assets'])) { $this->registerAssetsConfiguration($config['assets'], $container, $loader); } - if ($config['templating']['enabled']) { + if ($this->isConfigEnabled($container, $config['templating'])) { $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader); } @@ -119,7 +119,7 @@ public function load(array $configs, ContainerBuilder $container) $this->registerTranslatorConfiguration($config['translator'], $container); $this->registerProfilerConfiguration($config['profiler'], $container, $loader); - if ($config['router']['enabled']) { + if ($this->isConfigEnabled($container, $config['router'])) { $this->registerRouterConfiguration($config['router'], $container, $loader); } @@ -309,7 +309,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ $container->setParameter('profiler.storage.dsn', $config['dsn']); - if ($config['matcher']['enabled']) { + if ($this->isConfigEnabled($container, $config['matcher'])) { if (isset($config['matcher']['service'])) { $container->setAlias('profiler.request_matcher', $config['matcher']['service']); } elseif (isset($config['matcher']['ip']) || isset($config['matcher']['path']) || isset($config['matcher']['ips'])) { @@ -890,7 +890,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild */ private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { - if (!$config['enabled']) { + if (!$this->isConfigEnabled($container, $config)) { return; } @@ -974,7 +974,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder */ private function registerPropertyInfoConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { - if (!$config['enabled']) { + if (!$this->isConfigEnabled($container, $config)) { return; }