[DebugBundle] add tests for twig and for the bundle

Author: nicolas-grekas

DataCollector/DumpDataCollector.php

@@ -54,7 +54,7 @@ public function dump(Data $data)
 
         $trace = PHP_VERSION_ID >= 50306 ? DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS : true;
         if (PHP_VERSION_ID >= 50400) {
-            $trace = debug_backtrace($trace, 6);
+            $trace = debug_backtrace($trace, 7);
         } else {
             $trace = debug_backtrace($trace);
         }
@@ -72,10 +72,11 @@ public function dump(Data $data)
                 $file = $trace[$i]['file'];
                 $line = $trace[$i]['line'];
 
-                while (++$i < 6) {
-                    if (isset($trace[$i]['function']) && empty($trace[$i]['class'])) {
+                while (++$i < 7) {
+                    if (isset($trace[$i]['function']) && empty($trace[$i]['class']) && 'call_user_func' !== $trace[$i]['function']) {
                         $file = $trace[$i]['file'];
                         $line = $trace[$i]['line'];
+
                         break;
                     } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
                         $info = $trace[$i]['object'];

EventListener/DumpListener.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\VarDumper\VarDumper;
 
 /**
  * Configures dump() handler.
@@ -43,11 +43,11 @@ public function configure()
             $dumper = $this->dumper;
             $this->container = null;
 
-            Debug::setDumpHandler(function ($var) use ($container, $dumper) {
+            VarDumper::setHandler(function ($var) use ($container, $dumper) {
                 $dumper = $container->get($dumper);
                 $cloner = $container->get('var_dumper.cloner');
                 $handler = function ($var) use ($dumper, $cloner) {$dumper->dump($cloner->cloneVar($var));};
-                Debug::setDumpHandler($handler);
+                VarDumper::setHandler($handler);
                 $handler($var);
             });
         }