Template rename fix files

src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php

@@ -28,6 +28,6 @@ class DefaultController extends ContainerAware
      */
     public function indexAction()
     {
-        return $this->container->get('templating')->renderResponse('FrameworkBundle:Default:index.twig.html');
+        return $this->container->get('templating')->renderResponse('FrameworkBundle:Default:index.html.twig');
     }
 }

src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php

@@ -47,12 +47,12 @@ class ExceptionController extends ContainerAware
         if ($this->container->get('kernel')->isDebug() && 'html' == $format) {
             $name = 'exception_full';
         }
-        $template = 'FrameworkBundle:Exception:'.$name.'.twig.'.$format;
+        $template = 'FrameworkBundle:Exception:'.$name.$format.'.twig';
 
         $templating = $this->container->get('templating');
         if (!$templating->exists($template)) {
             $this->container->get('request')->setRequestFormat('html');
-            $template = 'FrameworkBundle:Exception:'.$name.'.twig.html';
+            $template = 'FrameworkBundle:Exception:'.$name.'.html.twig';
         }
 
         $response = $templating->renderResponse(

src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Controller/DefaultController.php

@@ -8,6 +8,6 @@ class DefaultController extends Controller
 {
     public function indexAction()
     {
-        return $this->render('{{ bundle }}:Default:index.twig.html');
+        return $this->render('{{ bundle }}:Default:index.html.twig');
     }
 }

src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig

@@ -25,7 +25,7 @@
     </div>
 
     {% for position, e in exception.toarray %}
-        {% include 'FrameworkBundle:Exception:traces.twig.html' with { 'exception': e, 'position': position, 'count': previous_count } only %}
+        {% include 'FrameworkBundle:Exception:traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %}
     {% endfor %}
 
     {% if logger %}
@@ -38,7 +38,7 @@
             </h3>
 
             <div id="logs" style="display: none">
-                {% include 'FrameworkBundle:Exception:logs.twig.html' with { 'logs': logger.logs } only %}
+                {% include 'FrameworkBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
             </div>
 
         </div>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig

@@ -1,5 +1,5 @@
-{% extends 'FrameworkBundle:Exception:layout.twig.html' %}
+{% extends 'FrameworkBundle:Exception:layout.html.twig' %}
 
 {% block body %}
-    {% include 'FrameworkBundle:Exception:exception.twig.html' %}
+    {% include 'FrameworkBundle:Exception:exception.html.twig' %}
 {% endblock %}

src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.html.twig

@@ -13,7 +13,7 @@
     <ol class="traces" id="traces_{{ position }}" style="display: {{ 0 == position ? 'block' : 'none' }}">
         {% for i, trace in exception.trace %}
             <li>
-                {% include 'FrameworkBundle:Exception:trace.twig.html' with { 'prefix': position, 'i': i, 'trace': trace } only %}
+                {% include 'FrameworkBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}
             </li>
         {% endfor %}
     </ol>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php

@@ -1,4 +1,4 @@
 <?php echo str_replace('{{ widget }}',
-    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html'),
+    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php'),
     $field->getPattern()
 ) ?>

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php

@@ -1 +1 @@
-<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html') ?> %
+<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php') ?> %

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

@@ -115,7 +115,7 @@ class FormHelper extends Helper
     public function row(/*FieldInterface*/ $field, $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:field_row.php.html';
+            $template = 'FrameworkBundle:Form:field_row.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -126,7 +126,7 @@ class FormHelper extends Helper
     public function label(/*FieldInterface */$field, $label = false, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:label.php.html';
+            $template = 'FrameworkBundle:Form:label.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -139,7 +139,7 @@ class FormHelper extends Helper
     public function errors(/*FieldInterface */$field, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:errors.php.html';
+            $template = 'FrameworkBundle:Form:errors.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -151,7 +151,7 @@ class FormHelper extends Helper
     public function hidden(/*FieldGroupInterface */$group, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:hidden.php.html';
+            $template = 'FrameworkBundle:Form:hidden.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -178,7 +178,7 @@ class FormHelper extends Helper
 
             $underscoredName = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($className, '_', '.')));
 
-            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php.html')) {
+            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.html.php')) {
                 $template = $guess;
             }
 
@@ -186,7 +186,7 @@ class FormHelper extends Helper
         } while (null === $template && false !== $currentFqClassName);
 
         if (null === $template && $field instanceof FieldGroupInterface) {
-            $template = 'FrameworkBundle:Form:field_group.php.html';
+            $template = 'FrameworkBundle:Form:field_group.html.php';
         }
 
         self::$cache[$fqClassName] = $template;

src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

@@ -14,7 +14,7 @@
         <parameter key="twig.loader.class">Symfony\Bundle\TwigBundle\Loader\FilesystemLoader</parameter>
         <parameter key="twig.globals.class">Symfony\Bundle\TwigBundle\GlobalVariables</parameter>
         <parameter key="twig.form.resources" type="collection">
-            <parameter>TwigBundle::form.twig.html</parameter>
+            <parameter>TwigBundle::form.html.twig</parameter>
         </parameter>
         <parameter key="templating.engine.twig.class">Symfony\Bundle\TwigBundle\TwigEngine</parameter>
     </parameters>

src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php

@@ -33,7 +33,7 @@ class ExceptionController extends BaseExceptionController
         $code = $this->getStatusCode($exception);
 
         return $this->container->get('templating')->renderResponse(
-            'FrameworkBundle:Exception:'.$template.'.twig.html',
+            'FrameworkBundle:Exception:'.$template.'.html.twig',
             array(
                 'status_code'    => $code,
                 'status_text'    => Response::$statusTexts[$code],

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

@@ -36,7 +36,7 @@ class ProfilerController extends ContainerAware
         $profiler = $this->container->get('profiler')->loadFromToken($token);
 
         if ($profiler->isEmpty()) {
-            return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.twig.html', array('token' => $token));
+            return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.html.twig', array('token' => $token));
         }
 
         if (!$profiler->has($panel)) {
@@ -146,7 +146,7 @@ class ProfilerController extends ContainerAware
             $position = false === strpos($this->container->get('request')->headers->get('user-agent'), 'Mobile') ? 'fixed' : 'absolute';
         }
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.html.twig', array(
             'position'  => $position,
             'profiler'  => $profiler,
             'templates' => $this->getTemplates($profiler),
@@ -168,7 +168,7 @@ class ProfilerController extends ContainerAware
         $url = $session->get('_profiler_search_url');
         $limit = $session->get('_profiler_search_limit');
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.html.twig', array(
             'token'    => $token,
             'profiler' => $profiler,
             'tokens'   => $profiler->find($ip, $url, $limit),
@@ -193,7 +193,7 @@ class ProfilerController extends ContainerAware
         $url = $session->get('_profiler_search_url');
         $limit = $session->get('_profiler_search_limit');
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.html.twig', array(
             'token'    => $token,
             'profiler' => $this->container->get('profiler')->loadFromToken($token),
             'tokens'   => $profiler->find($ip, $url, $limit),
@@ -247,11 +247,11 @@ class ProfilerController extends ContainerAware
             }
 
             list($name, $template) = $arguments;
-            if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.twig.html')) {
+            if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.html.twig')) {
                 continue;
             }
 
-            $templates[$name] = $template.'.twig.html';
+            $templates[$name] = $template.'.html.twig';
         }
 
         return $templates;

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block menu %}
 <img style="margin: 0 5px 0 0; vertical-align: middle; width: 32px" width="32" height="32" alt="Events" src="{{ asset('bundles/webprofiler/images/events.png') }}" />

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block head %}
     <link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="screen" />

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:base.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:base.html.twig' %}
 
 {% block body %}
     <div class="header">
@@ -32,7 +32,7 @@
 
             {% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %}
 
-            {% include 'WebProfilerBundle:Profiler:admin.twig.html' with { 'token': token } only %}
+            {% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
         </td><td class="main">
             <div class="content">
                 {% block panel '' %}

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:base.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:base.html.twig' %}
 
 {% block body %}
     <div class="header">
@@ -15,7 +15,7 @@
         <tr><td class="menu">
             {% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %}
 
-            {% include 'WebProfilerBundle:Profiler:admin.twig.html' with { 'token': token } only %}
+            {% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
         </td><td class="main">
             <div class="content">
                 <h2>Token "{{ token }}" does not exist.</h2>

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig

@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block panel %}
     <h2>Search Results</h2>