Merge branch '2.2' into 2.3

* 2.2:
  Update JsonResponse.php
  [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
  [WebProfiler] fix content-type parameter
  Replace romaji period characters with Japanese style zenkaku period characters
  Passed the config when building the Configuration in ConfigurableExtension

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php

Author: fabpot

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

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+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()
+    {
+        $actions = $this->container->get('templating')->get('actions');
+
+        return new Response($actions->render($actions->controller('TestBundle:Fragment:inlined', array(
+            'options' => array(
+                'bar' => new Bar(),
+                'eleven' => 11,
+            ),
+        ))));
+    }
+
+    public function inlinedAction($options, $_format)
+    {
+        return new Response($options['bar']->getBar().' '.$_format);
+    }
+}
+
+class Bar
+{
+    private $bar = 'bar';
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}

Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml

@@ -36,3 +36,11 @@ subrequest_fragment:
     path:     /subrequest/fragment/{_locale}.{_format}
     defaults: { _controller: TestBundle:SubRequest:fragment, _format: "html" }
     schemes:  [http]
+
+fragment_home:
+    path:     /fragment_home
+    defaults: { _controller: TestBundle:Fragment:index, _format: txt }
+
+fragment_inlined:
+    path:     /fragment_inlined
+    defaults: { _controller: TestBundle:Fragment:inlined }

Tests/Functional/FragmentTest.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+/**
+ * @group functional
+ */
+class FragmentTest extends WebTestCase
+{
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testFragment($insulate)
+    {
+        $client = $this->createClient(array('test_case' => 'Fragment', 'root_config' => 'config.yml'));
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        $client->request('GET', '/fragment_home');
+
+        $this->assertEquals('bar txt', $client->getResponse()->getContent());
+    }
+
+    public function getConfigs()
+    {
+        return array(
+            array(false),
+            array(true),
+        );
+    }
+}

Tests/Functional/app/Fragment/bundles.php

@@ -0,0 +1,9 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return array(
+    new FrameworkBundle(),
+    new TestBundle(),
+);

Tests/Functional/app/Fragment/config.yml

@@ -0,0 +1,7 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    fragments: ~
+    templating:
+        engines: ['php']

Tests/Functional/app/Fragment/routing.yml

@@ -0,0 +1,2 @@
+_fragmenttest_bundle:
+    resource: @TestBundle/Resources/config/routing.yml