Merge branch '2.2' into 2.3

* 2.2:
  fixed request format when forwarding a request
  [HttpKernel] added a comment to warn about possible inconsistencies
  added a functional test for locale handling in sub-requests
  Fixed issue #6932 - Inconsistent locale handling in subrequests
  fixed locale of sub-requests when explicitely set by the developer (refs #8821)

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php

Author: fabpot

Tests/Controller/ControllerTest.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ControllerTest extends TestCase
+{
+    public function testForward()
+    {
+        $request = Request::create('/');
+        $request->setLocale('fr');
+        $request->setRequestFormat('xml');
+
+        $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
+            return new Response($request->getRequestFormat().'--'.$request->getLocale());
+        }));
+
+        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $container->expects($this->at(0))->method('get')->will($this->returnValue($request));
+        $container->expects($this->at(1))->method('get')->will($this->returnValue($kernel));
+
+        $controller = new Controller();
+        $controller->setContainer($container);
+
+        $response = $controller->forward('a_controller');
+        $this->assertEquals('xml--fr', $response->getContent());
+    }
+}

Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\DependencyInjection\ContainerAware;
 
 class FragmentController extends ContainerAware
 {
-    public function indexAction()
+    public function indexAction(Request $request)
     {
         $actions = $this->container->get('templating')->get('actions');
 
@@ -29,7 +30,12 @@ public function indexAction()
 
         $html2 = $actions->render($actions->controller('TestBundle:Fragment:customformat', array('_format' => 'html')));
 
-        return new Response($html1.'--'.$html2);
+        $html3 = $actions->render($actions->controller('TestBundle:Fragment:customlocale', array('_locale' => 'es')));
+
+        $request->setLocale('fr');
+        $html4 = $actions->render($actions->controller('TestBundle:Fragment:forwardlocale'));
+
+        return new Response($html1.'--'.$html2.'--'.$html3.'--'.$html4);
     }
 
     public function inlinedAction($options, $_format)
@@ -41,6 +47,16 @@ public function customFormatAction($_format)
     {
         return new Response($_format);
     }
+
+    public function customLocaleAction(Request $request)
+    {
+        return new Response($request->getLocale());
+    }
+
+    public function forwardLocaleAction(Request $request)
+    {
+        return new Response($request->getLocale());
+    }
 }
 
 class Bar

Tests/Functional/FragmentTest.php

@@ -28,7 +28,7 @@ public function testFragment($insulate)
 
         $client->request('GET', '/fragment_home');
 
-        $this->assertEquals('bar txt--html', $client->getResponse()->getContent());
+        $this->assertEquals('bar txt--html--es--fr', $client->getResponse()->getContent());
     }
 
     public function getConfigs()