[FrameworkBundle] Renderer is once more the last of the templates

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php

@@ -54,10 +54,10 @@ public function locate($name)
         }
 
         $parameters = $this->parser->parse($name);
-        $resource = $parameters['bundle'].'/Resources/views/'.$parameters['controller'].'/'.$parameters['name'].'.'.$parameters['renderer'].'.'.$parameters['format'];
+        $resource = $parameters['bundle'].'/Resources/views/'.$parameters['controller'].'/'.$parameters['name'].'.'.$parameters['format'].'.'.$parameters['renderer'];
 
         if (!$parameters['bundle']) {
-            if (is_file($file = $this->path.'/views/'.$parameters['controller'].'/'.$parameters['name'].'.'.$parameters['renderer'].'.'.$parameters['format'])) {
+            if (is_file($file = $this->path.'/views/'.$parameters['controller'].'/'.$parameters['name'].'.'.$parameters['format'].'.'.$parameters['renderer'])) {
                 return $this->cache[$name] = $file;
             }
 

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateNameParser.php

@@ -54,8 +54,8 @@ public function parse($name)
             'bundle'     => $parts[0],
             'controller' => $parts[1],
             'name'       => $elements[0],
-            'renderer'   => $elements[1],
-            'format'     => $elements[2],
+            'format'     => $elements[1],
+            'renderer'   => $elements[2],
         );
 
         if ($parameters['bundle']) {

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateNameParserTest.php

@@ -32,13 +32,13 @@ public function testParse($name, $parameters)
     public function getParseTests()
     {
         return array(
-            array('FooBundle:Post:index.php.html', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
-            array('FooBundle:Post:index.twig.html', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'twig', 'format' => 'html')),
-            array('FooBundle:Post:index.php.xml', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'xml')),
-            array('SensioFooBundle:Post:index.php.html', array('name' => 'index', 'bundle' => 'SensioFooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
-            array('SensioCmsFooBundle:Post:index.php.html', array('name' => 'index', 'bundle' => 'SensioCmsFooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
-            array(':Post:index.php.html',array('name' => 'index', 'bundle' => '', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
-            array('::index.php.html', array('name' => 'index', 'bundle' => '', 'controller' => '', 'renderer' => 'php', 'format' => 'html')),
+            array('FooBundle:Post:index.html.php', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
+            array('FooBundle:Post:index.html.twig', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'twig', 'format' => 'html')),
+            array('FooBundle:Post:index.xml.php', array('name' => 'index', 'bundle' => 'FooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'xml')),
+            array('SensioFooBundle:Post:index.html.php', array('name' => 'index', 'bundle' => 'SensioFooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
+            array('SensioCmsFooBundle:Post:index.html.php', array('name' => 'index', 'bundle' => 'SensioCmsFooBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
+            array(':Post:index.html.php',array('name' => 'index', 'bundle' => '', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html')),
+            array('::index.html.php', array('name' => 'index', 'bundle' => '', 'controller' => '', 'renderer' => 'php', 'format' => 'html')),
         );
     }
 
@@ -58,7 +58,7 @@ public function testParseInvalid($name)
     public function getParseInvalidTests()
     {
         return array(
-            array('BarBundle:Post:index.php.html'),
+            array('BarBundle:Post:index.html.php'),
             array('FooBundle:Post:index'),
             array('FooBundle:Post'),
             array('FooBundle:Post:foo:bar'),