[Debug] Swap dumper services at bootstrap

lyrixx · lyrixx · commit 2cc95e5b188f · 2016-08-17T12:11:24.000+02:00
This commit fix a bug when using debug function too soon.
For example, if you call dump function during kernel::boot() the
dump output will be sent to stderr, even in a web context.

With this patch, the data collector is used by default, so the
dump output is send to the WDT. In a CLI context, if dump is used
too soon, the datacollector will buffer it, and release it at the
end of the script. So in this case everything will be visible by the
end used.
diff --git a/src/Symfony/Bundle/DebugBundle/DebugBundle.php b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
@@ -30,7 +30,7 @@ public function boot()
             // configuration for CLI mode is overridden in HTTP mode on
             // 'kernel.request' event
             VarDumper::setHandler(function ($var) use ($container) {
-                $dumper = $container->get('var_dumper.cli_dumper');
+                $dumper = $container->get('data_collector.dump');
                 $cloner = $container->get('var_dumper.cloner');
                 $handler = function ($var) use ($dumper, $cloner) {
                     $dumper->dump($cloner->cloneVar($var));
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -22,7 +22,7 @@
         <service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="var_dumper.cloner" />
-            <argument type="service" id="data_collector.dump" />
+            <argument type="service" id="var_dumper.cli_dumper" />
         </service>
 
         <service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" />
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
 use Symfony\Component\VarDumper\VarDumper;
@@ -50,6 +50,6 @@ public function configure()
     public static function getSubscribedEvents()
     {
         // Register early to have a working dump() as early as possible
-        return array(KernelEvents::REQUEST => array('configure', 1024));
+        return array(ConsoleEvents::COMMAND => array('configure', 1024));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpKernel\EventListener;`
`13`	`13`
	`14`	`+use Symfony\Component\Console\ConsoleEvents;`
`14`	`15`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`15`		`-use Symfony\Component\HttpKernel\KernelEvents;`
`16`	`16`	`use Symfony\Component\VarDumper\Cloner\ClonerInterface;`
`17`	`17`	`use Symfony\Component\VarDumper\Dumper\DataDumperInterface;`
`18`	`18`	`use Symfony\Component\VarDumper\VarDumper;`
`@@ -50,6 +50,6 @@ public function configure()`
`50`	`50`	`public static function getSubscribedEvents()`
`51`	`51`	`{`
`52`	`52`	`// Register early to have a working dump() as early as possible`
`53`		`- return array(KernelEvents::REQUEST => array('configure', 1024));`
	`53`	`+ return array(ConsoleEvents::COMMAND => array('configure', 1024));`
`54`	`54`	`}`
`55`	`55`	`}`