Merge branch '2.7' into 2.8

* 2.7:
  [EventDispatcher] Fix ContainerAwareEventDispatcher::hasListeners(null)
  Use namespaced Twig

Author: nicolas-grekas

Tests/Controller/ControllerTest.php

@@ -161,7 +161,7 @@ public function testdenyAccessUnlessGranted()
 
     public function testRenderViewTwig()
     {
-        $twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
         $twig->expects($this->once())->method('render')->willReturn('bar');
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
@@ -177,7 +177,7 @@ public function testRenderViewTwig()
 
     public function testRenderTwig()
     {
-        $twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
         $twig->expects($this->once())->method('render')->willReturn('bar');
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
@@ -193,7 +193,7 @@ public function testRenderTwig()
 
     public function testStreamTwig()
     {
-        $twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->at(0))->method('has')->will($this->returnValue(false));

Tests/Controller/TemplateControllerTest.php

@@ -22,7 +22,7 @@ class TemplateControllerTest extends TestCase
 {
     public function testTwig()
     {
-        $twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
+        $twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
         $twig->expects($this->once())->method('render')->willReturn('bar');
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();

Tests/Fragment/LegacyContainerAwareHIncludeFragmentRendererTest.php

@@ -25,7 +25,7 @@ public function testRender()
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->once())
             ->method('get')
-            ->will($this->returnValue($this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock()))
+            ->will($this->returnValue($this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock()))
         ;
         $renderer = new ContainerAwareHIncludeFragmentRenderer($container);
         $renderer->render('/', Request::create('/'));

composer.json

@@ -25,7 +25,7 @@
         "symfony/event-dispatcher": "~2.8|~3.0.0",
         "symfony/finder": "^2.0.5|~3.0.0",
         "symfony/http-foundation": "~2.7",
-        "symfony/http-kernel": "^2.8.18",
+        "symfony/http-kernel": "^2.8.22",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~2.3|~3.0.0",
         "symfony/routing": "^2.8.17",
@@ -51,7 +51,7 @@
         "symfony/yaml": "^2.0.5|~3.0.0",
         "symfony/property-info": "~2.8|~3.0.0",
         "phpdocumentor/reflection": "^1.0.7",
-        "twig/twig": "~1.23|~2.0",
+        "twig/twig": "~1.34|~2.4",
         "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {