From c42bc1b5aa9f85de2d9e199e1dead118e92d144b Mon Sep 17 00:00:00 2001 From: Iain Mckay Date: Thu, 15 Jun 2017 10:44:29 +0200 Subject: [PATCH 1/2] Adds an option to disable the data collector --- src/DependencyInjection/CacheExtension.php | 6 +++++- src/DependencyInjection/Configuration.php | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/DependencyInjection/CacheExtension.php b/src/DependencyInjection/CacheExtension.php index 72f9b21..35bfd16 100644 --- a/src/DependencyInjection/CacheExtension.php +++ b/src/DependencyInjection/CacheExtension.php @@ -57,7 +57,11 @@ public function load(array $configs, ContainerBuilder $container) $this->registerServices($container, $config); // Add toolbar and data collector if we are debuging - if ($container->getParameter('kernel.debug')) { + if (!isset($config['data_collector']['enabled'])) { + $config['data_collector']['enabled'] = $container->getParameter('kernel.debug'); + } + + if ($config['data_collector']['enabled']) { $loader->load('data-collector.yml'); } diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 9d35f6f..17c57f6 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -40,6 +40,7 @@ public function getConfigTreeBuilder() ->append($this->addSerializerSection()) ->append($this->addValidationSection()) ->append($this->addLoggingSection()) + ->append($this->addDataCollectorSection()) ->end(); return $treeBuilder; @@ -236,4 +237,21 @@ private function addRouterSection() return $node; } + + + /** + * @return ArrayNodeDefinition + */ + private function addDataCollectorSection() + { + $tree = new TreeBuilder(); + $node = $tree->root('data_collector'); + + $node + ->children() + ->booleanNode('enabled')->end() + ->end(); + + return $node; + } } From 87884433fd2d64d6fbaab33780d90d9433e2ee42 Mon Sep 17 00:00:00 2001 From: Iain Mckay Date: Fri, 16 Jun 2017 08:29:31 +0200 Subject: [PATCH 2/2] Fixing style violation --- src/DependencyInjection/Configuration.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 17c57f6..7da184b 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -238,7 +238,6 @@ private function addRouterSection() return $node; } - /** * @return ArrayNodeDefinition */