Merge branch '2.6' into 2.7

* 2.6: (36 commits)
  [Debug] fix error message on double exception
  [Validator] make DateTime objects represented as strings in the violation message.
  [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener
  Upgrade information for the Translation component regarding the new LoggingTranslator class.
  [WebProfilerBundle] Remove usage of app.request in search bar template
  Fix initialized() with aliased services
  fix data type in docblock
  Rename Symfony2 to Symfony
  bumped Symfony version to 2.6.0
  updated VERSION for 2.6.0-BETA2
  updated CHANGELOG for 2.6.0-BETA2
  [Debug] fix ENT_SUBSTITUTE usage
  compare version using PHP_VERSION_ID
  backport #12489
  remove an unneeded check
  Remove block submit_widget
  reformat code as suggested by @fabpot
  Fix typo
  Make `\Request::get` more performant.
  properly set request attributes in controller test
  ...

Author: fabpot

EventListener/DumpListener.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
 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;
 
 /**
@@ -27,30 +28,23 @@ class DumpListener implements EventSubscriberInterface
     private $dumper;
 
     /**
-     * @param ContainerInterface $container Service container, for lazy loading.
-     * @param string             $dumper    var_dumper dumper service to use.
+     * @param ClonerInterface      $cloner    Cloner service.
+     * @param DataDumperInterface  $dumper    Dumper service.
      */
-    public function __construct(ContainerInterface $container, $dumper)
+    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper)
     {
-        $this->container = $container;
+        $this->cloner = $cloner;
         $this->dumper = $dumper;
     }
 
     public function configure()
     {
-        if ($this->container) {
-            $container = $this->container;
-            $dumper = $this->dumper;
-            $this->container = null;
-
-            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));};
-                VarDumper::setHandler($handler);
-                $handler($var);
-            });
-        }
+        $cloner = $this->cloner;
+        $dumper = $this->dumper;
+
+        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
+            $dumper->dump($cloner->cloneVar($var));
+        });
     }
 
     public static function getSubscribedEvents()

README.md

@@ -4,7 +4,7 @@ HttpKernel Component
 HttpKernel provides the building blocks to create flexible and fast HTTP-based
 frameworks.
 
-``HttpKernelInterface`` is the core interface of the Symfony2 full-stack
+``HttpKernelInterface`` is the core interface of the Symfony full-stack
 framework:
 
 ```php
@@ -23,11 +23,11 @@ interface HttpKernelInterface
 
 It takes a ``Request`` as an input and should return a ``Response`` as an
 output. Using this interface makes your code compatible with all frameworks
-using the Symfony2 components. And this will give you many cool features for
+using the Symfony components. And this will give you many cool features for
 free.
 
-Creating a framework based on the Symfony2 components is really easy. Here is
-a very simple, but fully-featured framework based on the Symfony2 components:
+Creating a framework based on the Symfony components is really easy. Here is
+a very simple, but fully-featured framework based on the Symfony components:
 
 ```php
 $routes = new RouteCollection();
@@ -54,7 +54,7 @@ $kernel = new HttpKernel($dispatcher, $resolver);
 $kernel->handle($request)->send();
 ```
 
-This is all you need to create a flexible framework with the Symfony2
+This is all you need to create a flexible framework with the Symfony
 components.
 
 Want to add an HTTP reverse proxy and benefit from HTTP caching and Edge Side

Tests/EventListener/DumpListenerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\EventListener\DumpListener;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\VarDumper\Cloner\ClonerInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
 use Symfony\Component\VarDumper\VarDumper;
 
 /**
@@ -34,34 +35,23 @@ public function testSubscribedEvents()
 
     public function testConfigure()
     {
-        $prevDumper = $this->getDumpHandler();
+        $prevDumper = VarDumper::setHandler('var_dump');
+        VarDumper::setHandler($prevDumper);
 
-        $container = new ContainerBuilder();
-        $container->setDefinition('var_dumper.cloner', new Definition('Symfony\Component\HttpKernel\Tests\EventListener\MockCloner'));
-        $container->setDefinition('mock_dumper', new Definition('Symfony\Component\HttpKernel\Tests\EventListener\MockDumper'));
+        $cloner = new MockCloner();
+        $dumper = new MockDumper();
 
         ob_start();
         $exception = null;
-        $listener = new DumpListener($container, 'mock_dumper');
+        $listener = new DumpListener($cloner, $dumper);
 
         try {
             $listener->configure();
 
-            $lazyDumper = $this->getDumpHandler();
             VarDumper::dump('foo');
-
-            $loadedDumper = $this->getDumpHandler();
             VarDumper::dump('bar');
 
             $this->assertSame('+foo-+bar-', ob_get_clean());
-
-            $listenerReflector = new \ReflectionClass($listener);
-            $lazyReflector = new \ReflectionFunction($lazyDumper);
-            $loadedReflector = new \ReflectionFunction($loadedDumper);
-
-            $this->assertSame($listenerReflector->getFilename(), $lazyReflector->getFilename());
-            $this->assertSame($listenerReflector->getFilename(), $loadedReflector->getFilename());
-            $this->assertGreaterThan($lazyReflector->getStartLine(), $loadedReflector->getStartLine());
         } catch (\Exception $exception) {
         }
 
@@ -71,28 +61,22 @@ public function testConfigure()
             throw $exception;
         }
     }
-
-    private function getDumpHandler()
-    {
-        $prevDumper = VarDumper::setHandler('var_dump');
-        VarDumper::setHandler($prevDumper );
-
-        return $prevDumper;
-    }
 }
 
-class MockCloner
+class MockCloner implements ClonerInterface
 {
     public function cloneVar($var)
     {
-        return $var.'-';
+        return new Data(array($var.'-'));
     }
 }
 
-class MockDumper
+class MockDumper implements DataDumperInterface
 {
-    public function dump($var)
+    public function dump(Data $data)
     {
-        echo '+'.$var;
+        $rawData = $data->getRawData();
+
+        echo '+'.$rawData[0];
     }
 }