Fix the usage of FrameworkBundle in debug mode without Stopwatch

stof · stof · commit 2ea26c1ffe76 · 2017-06-13T10:29:19.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -647,6 +647,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
 
         $debug = $container->getParameter('kernel.debug');
 
+        if ($debug) {
+            $container->setParameter('debug.container.dump', '%kernel.cache_dir%/%kernel.container_class%.xml');
+        }
+
         if ($debug && class_exists(Stopwatch::class)) {
             $loader->load('debug.xml');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -4,10 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
-    </parameters>
-
     <services>
         <defaults public="false" />
 

Original file line number	Diff line number	Diff line change
`@@ -647,6 +647,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con`
`647`	`647`
`648`	`648`	`$debug = $container->getParameter('kernel.debug');`
`649`	`649`
	`650`	`+ if ($debug) {`
	`651`	`+ $container->setParameter('debug.container.dump', '%kernel.cache_dir%/%kernel.container_class%.xml');`
	`652`	`+ }`
	`653`	`+`
`650`	`654`	`if ($debug && class_exists(Stopwatch::class)) {`
`651`	`655`	`$loader->load('debug.xml');`
`652`	`656`	`}`