diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig b/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig.html similarity index 96% rename from src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig rename to src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig.html index df138a6b6477..4f640b5bf385 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig +++ b/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Database diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig.html similarity index 96% rename from src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig rename to src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig.html index 640b45147d09..ba25d4705f3f 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Mongo diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php index 7f3bdace83bb..bc6d1bc9c52b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php +++ b/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.php'); + return $this->container->get('templating')->renderResponse('FrameworkBundle:Default:index.twig.html'); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php index 15b1f1e2aba9..8d8358e46c24 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php @@ -32,7 +32,7 @@ class ExceptionController extends ContainerAware * * @throws \InvalidArgumentException When the exception template does not exist */ - public function exceptionAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html') + public function showAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html') { $this->container->get('request')->setRequestFormat($format); @@ -43,15 +43,16 @@ public function exceptionAction(FlattenException $exception, DebugLoggerInterfac $code = $this->getStatusCode($exception); - $template = $this->container->get('kernel')->isDebug() ? 'exception' : 'error'; + $name = $this->container->get('kernel')->isDebug() ? 'exception' : 'error'; if ($this->container->get('kernel')->isDebug() && 'html' == $format) { - $template = 'exception_full'; + $name = 'exception_full'; } - $template = 'FrameworkBundle:Exception:'.$template.'.twig'; + $template = 'FrameworkBundle:Exception:'.$name.'.twig.'.$format; $templating = $this->container->get('templating'); if (!$templating->exists($template)) { $this->container->get('request')->setRequestFormat('html'); + $template = 'FrameworkBundle:Exception:'.$name.'.twig.html'; } $response = $templating->renderResponse( diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 0cdb44f62f8c..f5aa4ed97f1d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -193,9 +193,9 @@ protected function registerTemplatingConfiguration(array $config, ContainerBuild } // template paths - $dirs = array('%kernel.root_dir%/views/%%bundle%%/%%controller%%/%%name%%%%format%%.%%renderer%%'); + $dirs = array('%kernel.root_dir%/views/%%bundle%%/%%controller%%/%%name%%.%%renderer%%.%%format%%'); foreach ($container->getParameter('kernel.bundle_dirs') as $dir) { - $dirs[] = $dir.'/%%bundle%%/Resources/views/%%controller%%/%%name%%%%format%%.%%renderer%%'; + $dirs[] = $dir.'/%%bundle%%/Resources/views/%%controller%%/%%name%%.%%renderer%%.%%format%%'; } $container->setParameter('templating.loader.filesystem.path', $dirs); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml index 9aaf9d06bcb0..77c3d3292252 100755 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml @@ -10,7 +10,7 @@ Symfony\Bundle\FrameworkBundle\Controller\ControllerNameConverter Symfony\Component\HttpKernel\ResponseListener Symfony\Component\HttpKernel\Debug\ExceptionListener - Symfony\Bundle\FrameworkBundle\Controller\ExceptionController::exceptionAction + Symfony\Bundle\FrameworkBundle\Controller\ExceptionController::showAction Symfony\Component\HttpKernel\Cache\Esi Symfony\Component\HttpKernel\Cache\EsiListener diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Default/index.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Default/index.twig.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Default/index.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Default/index.twig.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.atom.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.atom.twig deleted file mode 100644 index 3310e87cdc86..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.atom.twig +++ /dev/null @@ -1 +0,0 @@ -{% include 'FrameworkBundle:Exception:error.xml.twig' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.rdf.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.rdf.twig deleted file mode 100644 index 3310e87cdc86..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.rdf.twig +++ /dev/null @@ -1 +0,0 @@ -{% include 'FrameworkBundle:Exception:error.xml.twig' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.atom b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.atom new file mode 100644 index 000000000000..adf88323ecc7 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.atom @@ -0,0 +1 @@ +{% include 'FrameworkBundle:Exception:error.twig.xml' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.css.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.css similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.css.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.css diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.js.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.js similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.js.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.js diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.json.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.json similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.json.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.json diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.rdf b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.rdf new file mode 100644 index 000000000000..adf88323ecc7 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.rdf @@ -0,0 +1 @@ +{% include 'FrameworkBundle:Exception:error.twig.xml' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.txt.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.txt similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.txt.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.txt diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.xml.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.xml similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.xml.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.twig.xml diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.atom.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.atom.twig deleted file mode 100644 index e3218077476e..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.atom.twig +++ /dev/null @@ -1 +0,0 @@ -{% include 'FrameworkBundle:Exception:exception.xml.twig' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.css.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.css.twig deleted file mode 100644 index e96cdc36a2f6..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.css.twig +++ /dev/null @@ -1,3 +0,0 @@ -/* -{% include 'FrameworkBundle:Exception:exception.txt.twig' with { 'exception': exception } %} -*/ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.js.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.js.twig deleted file mode 100644 index e96cdc36a2f6..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.js.twig +++ /dev/null @@ -1,3 +0,0 @@ -/* -{% include 'FrameworkBundle:Exception:exception.txt.twig' with { 'exception': exception } %} -*/ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.rdf.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.rdf.twig deleted file mode 100644 index e3218077476e..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.rdf.twig +++ /dev/null @@ -1 +0,0 @@ -{% include 'FrameworkBundle:Exception:exception.xml.twig' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.atom b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.atom new file mode 100644 index 000000000000..8ab879137347 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.atom @@ -0,0 +1 @@ +{% include 'FrameworkBundle:Exception:exception.twig.xml' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.css b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.css new file mode 100644 index 000000000000..22a6aa2c5022 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.css @@ -0,0 +1,3 @@ +/* +{% include 'FrameworkBundle:Exception:exception.twig.txt' with { 'exception': exception } %} +*/ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.html similarity index 93% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.html index 7568a9bc74da..bed339e868a8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.html @@ -25,7 +25,7 @@

{{ status_code }} {{ status_text }} - {{ exception.class|ab {% for position, e in exception.toarray %} - {% include 'FrameworkBundle:Exception:traces.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %} + {% include 'FrameworkBundle:Exception:traces.twig.html' with { 'exception': e, 'position': position, 'count': previous_count } only %} {% endfor %} {% if logger %} @@ -38,7 +38,7 @@

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.js b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.js new file mode 100644 index 000000000000..22a6aa2c5022 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.js @@ -0,0 +1,3 @@ +/* +{% include 'FrameworkBundle:Exception:exception.twig.txt' with { 'exception': exception } %} +*/ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.json.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.json similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.json.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.json diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.rdf b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.rdf new file mode 100644 index 000000000000..8ab879137347 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.rdf @@ -0,0 +1 @@ +{% include 'FrameworkBundle:Exception:exception.twig.xml' with { 'exception': exception } %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.txt similarity index 78% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.txt index dacecebd3a59..573eb7582f03 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.txt @@ -2,6 +2,6 @@ [message] {{ exception.message }} {% for i, e in exception.toarray %} [{{ i + 1 }}] {{ e.class }}: {{ e.message }} -{% include 'FrameworkBundle:Exception:traces.txt.twig' with { 'exception': e } only %} +{% include 'FrameworkBundle:Exception:traces.twig.txt' with { 'exception': e } only %} {% endfor %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.xml.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.xml similarity index 73% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.xml.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.xml index 220da194abef..9baa05ff8215 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.xml.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.twig.xml @@ -3,7 +3,7 @@ {% for e in exception.toarray %} -{% include 'FrameworkBundle:Exception:traces.twig' with { 'exception': e } only %} +{% include 'FrameworkBundle:Exception:traces.twig.xml' with { 'exception': e } only %} {% endfor %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig deleted file mode 100644 index 2946b3227890..000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'FrameworkBundle:Exception:layout.twig' %} - -{% block body %} - {% include 'FrameworkBundle:Exception:exception.twig' %} -{% endblock %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig.html new file mode 100644 index 000000000000..468ef58e0ae0 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.twig.html @@ -0,0 +1,5 @@ +{% extends 'FrameworkBundle:Exception:layout.twig.html' %} + +{% block body %} + {% include 'FrameworkBundle:Exception:exception.twig.html' %} +{% endblock %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.twig.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.twig.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.twig.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/logs.twig.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig.txt similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.twig.txt diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.html similarity index 91% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.html index 12e8dfb485ce..f5c3b16f6834 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.html @@ -13,7 +13,7 @@

Stack Trace

    {% for i, trace in exception.trace %}
  1. - {% include 'FrameworkBundle:Exception:trace.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %} + {% include 'FrameworkBundle:Exception:trace.twig.html' with { 'prefix': position, 'i': i, 'trace': trace } only %}
    2. {% endfor %}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.txt.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.txt similarity index 64% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.txt.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.txt index 39180cb01240..69d6622dd8d1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.txt.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.txt @@ -1,6 +1,6 @@ {% if exception.trace|length %} {% for trace in exception.trace %} -{% include 'FrameworkBundle:Exception:trace.txt.twig' with { 'trace': trace } only %} +{% include 'FrameworkBundle:Exception:trace.twig.txt' with { 'trace': trace } only %} {% endfor %} {% endif %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.xml.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.xml similarity index 69% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.xml.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.xml index de08cc61e5c6..d66cc387d623 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.xml.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.twig.xml @@ -1,7 +1,7 @@ {% for trace in exception.trace %} -{% include 'FrameworkBundle:Exception:trace.txt.twig' with { 'trace': trace } only %} +{% include 'FrameworkBundle:Exception:trace.twig.txt' with { 'trace': trace } only %} {% endfor %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_time_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/errors.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_row.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/file_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/label.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/radio_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/text_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/textarea_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.php.html similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.php rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_field.php.html diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php index be94e3102b2c..9884caf5c0d3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php @@ -15,7 +15,7 @@ /** * TemplateNameParser parsers template name from the short notation - * "bundle:section:template.format.renderer" to a template name + * "bundle:section:template.renderer.format" to a template name * and an array of options. * * @author Fabien Potencier @@ -34,7 +34,7 @@ public function parse($name, array $defaults = array()) { $parts = explode(':', $name); if (3 !== count($parts)) { - throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid.', $name)); + throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid (format is "bundle:section:template.renderer.format").', $name)); } $options = array_replace( @@ -49,17 +49,14 @@ public function parse($name, array $defaults = array()) ); $elements = explode('.', $parts[2]); - if (3 === count($elements)) { - $parts[2] = $elements[0]; - $options['format'] = '.'.$elements[1]; - $options['renderer'] = $elements[2]; - } elseif (2 === count($elements)) { - $parts[2] = $elements[0]; - $options['renderer'] = $elements[1]; - } else { - throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid.', $name)); + if (3 !== count($elements)) { + throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid (format is "bundle:section:template.renderer.format").', $name)); } + $parts[2] = $elements[0]; + $options['renderer'] = $elements[1]; + $options['format'] = $elements[2]; + return array($parts[2], $options); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php index 18747fea95f9..55c8baa95c7d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php @@ -29,9 +29,9 @@ public function testParse($name, $parameters) public function getParseTests() { return array( - array('BlogBundle:Post:index.php', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => ''))), - array('BlogBundle:Post:index.twig', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'twig', 'format' => ''))), - array('BlogBundle:Post:index.xml.php', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => '.xml'))), + array('BlogBundle:Post:index.php.html', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'html'))), + array('BlogBundle:Post:index.twig.html', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'twig', 'format' => 'html'))), + array('BlogBundle:Post:index.php.xml', array('index', array('bundle' => 'BlogBundle', 'controller' => 'Post', 'renderer' => 'php', 'format' => 'xml'))), ); } diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml index 7e2df321ce0b..32eb4c453150 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml +++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml @@ -14,7 +14,7 @@ Symfony\Bundle\TwigBundle\Loader\FilesystemLoader Symfony\Bundle\TwigBundle\GlobalVariables - TwigBundle::form.twig + TwigBundle::form.twig.html Symfony\Bundle\TwigBundle\TwigEngine diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/form.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/form.twig.html similarity index 100% rename from src/Symfony/Bundle/TwigBundle/Resources/views/form.twig rename to src/Symfony/Bundle/TwigBundle/Resources/views/form.twig.html diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php index f3fada16519d..abed99aa59d6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php @@ -4,6 +4,9 @@ use Symfony\Component\DependencyInjection\ContainerAware; use Symfony\Component\HttpKernel\Exception\FlattenException; +use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Bundle\FrameworkBundle\Controller\ExceptionController as BaseExceptionController; /* * This file is part of the Symfony framework. @@ -19,22 +22,21 @@ * * @author Fabien Potencier */ -class ExceptionController extends ContainerAware +class ExceptionController extends BaseExceptionController { /** - * Converts an Exception to a Response. - * - * @param \Exception $exception An Exception instance - * - * @throws \InvalidArgumentException When the exception template does not exist + * {@inheritdoc} */ - public function showAction(FlattenException $exception, $format) + public function showAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html') { $template = $this->container->get('kernel')->isDebug() ? 'exception' : 'error'; + $code = $this->getStatusCode($exception); return $this->container->get('templating')->renderResponse( - 'FrameworkBundle:Exception:'.$template.'.twig', + 'FrameworkBundle:Exception:'.$template.'.twig.html', array( + 'status_code' => $code, + 'status_text' => Response::$statusTexts[$code], 'exception' => $exception, 'logger' => null, 'currentContent' => '', diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index a7bbb99f6a23..e17a2476221c 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -36,7 +36,7 @@ public function panelAction($token, $panel = 'request') $profiler = $this->container->get('profiler')->loadFromToken($token); if ($profiler->isEmpty()) { - return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.twig', array('token' => $token)); + return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.twig.html', array('token' => $token)); } if (!$profiler->has($panel)) { @@ -146,7 +146,7 @@ public function toolbarAction($token = null, $position = null) $position = false === strpos($this->container->get('request')->headers->get('user-agent'), 'Mobile') ? 'fixed' : 'absolute'; } - return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.twig', array( + return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.twig.html', array( 'position' => $position, 'profiler' => $profiler, 'templates' => $this->getTemplates($profiler), @@ -168,7 +168,7 @@ public function searchBarAction($token) $url = $session->get('_profiler_search_url'); $limit = $session->get('_profiler_search_limit'); - return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.twig', array( + return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.twig.html', array( 'token' => $token, 'profiler' => $profiler, 'tokens' => $profiler->find($ip, $url, $limit), @@ -193,7 +193,7 @@ public function searchResultsAction($token) $url = $session->get('_profiler_search_url'); $limit = $session->get('_profiler_search_limit'); - return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.twig', array( + return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.twig.html', array( 'token' => $token, 'profiler' => $this->container->get('profiler')->loadFromToken($token), 'tokens' => $profiler->find($ip, $url, $limit), @@ -246,11 +246,11 @@ protected function getTemplateNames($profiler) $name = $this->container->get($id)->getName(); $template = $tags[0]['template']; if ($profiler->has($name)) { - if (!$this->container->get('templating')->exists($template.'.twig')) { + if (!$this->container->get('templating')->exists($template.'.twig.html')) { continue; } - $templates[$name] = $template.'.twig'; + $templates[$name] = $template.'.twig.html'; } } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig.html similarity index 98% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig.html index 4af776a85f93..ca4ac37ffaa9 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Symfony diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig.html similarity index 95% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig.html index f7906683941d..39508bfa1777 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block menu %} Events diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig.html similarity index 92% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig.html index a3f5bed875c5..d9af950b8190 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block head %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig.html similarity index 97% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig.html index 622d05d491eb..1cea9f822a70 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Logs diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig.html similarity index 93% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig.html index 711c0870129b..75bf69ddfe13 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Memory Usage diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig.html similarity index 82% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig.html index 8c6f591e4eed..3bd97546e3ff 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Request @@ -14,7 +14,7 @@

Request GET Parameters

{% if collector.requestquery.all|length %} - {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestquery } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestquery } only %} {% else %} No GET parameters {% endif %} @@ -22,7 +22,7 @@

Request GET Parameters

Request POST Parameters

{% if collector.requestrequest.all|length %} - {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestrequest } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestrequest } only %} {% else %} No POST parameters {% endif %} @@ -30,7 +30,7 @@

Request POST Parameters

Request Attributes

{% if collector.requestattributes.all|length %} - {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestattributes } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestattributes } only %} {% else %} No attributes {% endif %} @@ -38,22 +38,22 @@

Request Attributes

Request Cookies

{% if collector.requestcookies.all|length %} - {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestcookies } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestcookies } only %} {% else %} No cookies {% endif %}

Requests Headers

- {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestheaders } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestheaders } only %}

Requests Server Parameters

- {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.requestserver } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestserver } only %}

Response Headers

- {% include 'WebProfilerBundle:Profiler:bag.twig' with { 'bag': collector.responseheaders } only %} + {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.responseheaders } only %}

Response Session Attributes

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig.html similarity index 96% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig.html index 3461c85feb91..9221d12c1ebc 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/security.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Security diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig.html similarity index 96% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig.html index f3d0fdcdb9e2..17210a61aee6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block toolbar %} Timers diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.twig.html similarity index 100% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.twig.html diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.twig.html similarity index 100% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.twig.html diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.twig.html similarity index 100% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.twig.html diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig.html similarity index 90% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig.html index 88a24bed19b4..9fc78b23952e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:base.twig' %} +{% extends 'WebProfilerBundle:Profiler:base.twig.html' %} {% block body %}
@@ -32,7 +32,7 @@

{% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %} - {% include 'WebProfilerBundle:Profiler:admin.twig' with { 'token': token } only %} + {% include 'WebProfilerBundle:Profiler:admin.twig.html' with { 'token': token } only %}
{% block panel '' %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig.html similarity index 79% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig.html index e5602b0d22b4..892068986866 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:base.twig' %} +{% extends 'WebProfilerBundle:Profiler:base.twig.html' %} {% block body %}
@@ -15,7 +15,7 @@

{% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %} - {% include 'WebProfilerBundle:Profiler:admin.twig' with { 'token': token } only %} + {% include 'WebProfilerBundle:Profiler:admin.twig.html' with { 'token': token } only %}

Token "{{ token }}" does not exist.

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig.html similarity index 90% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig.html index ed350a42de94..70cc627bd1b6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.twig.html @@ -1,4 +1,4 @@ -{% extends 'WebProfilerBundle:Profiler:layout.twig' %} +{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %} {% block panel %}

Search Results

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.twig.html similarity index 100% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.twig.html diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.twig.html similarity index 100% rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.twig rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.twig.html