bug #23157 Fix the usage of FrameworkBundle in debug mode without Stopwatch (stof)

fabpot · fabpot · commit 17d23a79e8f7 · 2017-06-13T07:14:35.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix the usage of FrameworkBundle in debug mode without Stopwatch | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a #23148 removed the loading of the debug.xml file when Stopwatch is not installed. While all services defined in it are related to Stopwatch, the parameter was not (it is related to dumping the debug container in the compiler pass), which was breaking the usage of the bundle in debug mode without Stopwatch (exception triggered in the compiler pass) Commits ------- 2ea26c1 Fix the usage of FrameworkBundle in debug mode without Stopwatch
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`	`}`