From a7974ff43c294e7f239ec1f76ca63cb1d037ab82 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 15:18:25 +0200 Subject: [PATCH] renamed Form Twig templates to be more explicit --- UPDATE.md | 2 +- .../Form/{div_layout.html.twig => form_div_layout.html.twig} | 0 .../{table_layout.html.twig => form_table_layout.html.twig} | 2 +- .../Bundle/TwigBundle/DependencyInjection/Configuration.php | 4 ++-- .../Tests/DependencyInjection/TwigExtensionTest.php | 4 ++-- .../Bridge/Twig/Extension/FormExtensionDivLayoutTest.php | 2 +- .../Bridge/Twig/Extension/FormExtensionTableLayoutTest.php | 2 +- .../Tests/Bridge/Twig/Extension/theme_extends.html.twig | 2 +- tests/Symfony/Tests/Bridge/Twig/Extension/theme_use.html.twig | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename src/Symfony/Bridge/Twig/Resources/views/Form/{div_layout.html.twig => form_div_layout.html.twig} (100%) rename src/Symfony/Bridge/Twig/Resources/views/Form/{table_layout.html.twig => form_table_layout.html.twig} (95%) diff --git a/UPDATE.md b/UPDATE.md index 0a80e5d10e5b..4a7c4fc81301 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -83,7 +83,7 @@ beta4 to beta5 After: - `div_layout.html.twig` + `form_div_layout.html.twig` * All settings regarding the cache warmers have been removed. diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig rename to src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/table_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig similarity index 95% rename from src/Symfony/Bridge/Twig/Resources/views/Form/table_layout.html.twig rename to src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig index d775abe893aa..30c06f22574a 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/table_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig @@ -1,4 +1,4 @@ -{% use "div_layout.html.twig" %} +{% use "form_div_layout.html.twig" %} {% block field_row %} {% spaceless %} diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php index 97ddab1fbe29..30f16b9dc964 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php @@ -49,11 +49,11 @@ private function addFormSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('resources') ->addDefaultsIfNotSet() - ->defaultValue(array('div_layout.html.twig')) + ->defaultValue(array('form_div_layout.html.twig')) ->validate() ->always() ->then(function($v){ - return array_merge(array('div_layout.html.twig'), $v); + return array_merge(array('form_div_layout.html.twig'), $v); }) ->end() ->prototype('scalar')->end() diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php index 85f5c3112086..1456cbb46347 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php @@ -31,7 +31,7 @@ public function testLoadEmptyConfiguration() $this->compileContainer($container); $this->assertEquals('Twig_Environment', $container->getParameter('twig.class'), '->load() loads the twig.xml file'); - $this->assertContains('div_layout.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources'); + $this->assertContains('form_div_layout.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources'); // Twig options $options = $container->getParameter('twig.options'); @@ -54,7 +54,7 @@ public function testLoadFullConfiguration($format) // Form resources $resources = $container->getParameter('twig.form.resources'); - $this->assertContains('div_layout.html.twig', $resources, '->load() includes default template for form resources'); + $this->assertContains('form_div_layout.html.twig', $resources, '->load() includes default template for form resources'); $this->assertContains('MyBundle::form.html.twig', $resources, '->load() merges new templates into form resources'); // Globals diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php index aa2c38814c7f..2c9a2783f18f 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php @@ -37,7 +37,7 @@ protected function setUp() )); $this->extension = new FormExtension(array( - 'div_layout.html.twig', + 'form_div_layout.html.twig', 'custom_widgets.html.twig', )); diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php index 1373a7ebec0d..23dc2f177568 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php @@ -37,7 +37,7 @@ protected function setUp() )); $this->extension = new FormExtension(array( - 'table_layout.html.twig', + 'form_table_layout.html.twig', 'custom_widgets.html.twig', )); diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/theme_extends.html.twig b/tests/Symfony/Tests/Bridge/Twig/Extension/theme_extends.html.twig index 68e973bdaefc..96bfea20dc0e 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/theme_extends.html.twig +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/theme_extends.html.twig @@ -1,4 +1,4 @@ -{% extends 'div_layout.html.twig' %} +{% extends 'form_div_layout.html.twig' %} {% block field_widget %} {% spaceless %} diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/theme_use.html.twig b/tests/Symfony/Tests/Bridge/Twig/Extension/theme_use.html.twig index de61a65188cf..5aee4708a2cb 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/theme_use.html.twig +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/theme_use.html.twig @@ -1,4 +1,4 @@ -{% use 'div_layout.html.twig' %} +{% use 'form_div_layout.html.twig' %} {% block field_widget %} {% spaceless %}