From 0b775cd8ce9400e60a329ced3bb38796d40a7dad Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Jan 2015 19:21:43 +0100 Subject: [PATCH] [TwigBridge] moved fixtures into their own directory --- .../{ => Fixtures/templates/form}/child_label.html.twig | 0 .../{ => Fixtures/templates/form}/custom_widgets.html.twig | 0 .../templates/form}/page_dynamic_extends.html.twig | 0 .../{ => Fixtures/templates/form}/parent_label.html.twig | 0 .../Extension/{ => Fixtures/templates/form}/theme.html.twig | 0 .../{ => Fixtures/templates/form}/theme_extends.html.twig | 0 .../Extension/{ => Fixtures/templates/form}/theme_use.html.twig | 0 .../Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php | 2 +- .../Twig/Tests/Extension/FormExtensionTableLayoutTest.php | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/child_label.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/custom_widgets.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/page_dynamic_extends.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/parent_label.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme_extends.html.twig (100%) rename src/Symfony/Bridge/Twig/Tests/Extension/{ => Fixtures/templates/form}/theme_use.html.twig (100%) diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig similarity index 100% rename from src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig rename to src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php index f0e2cb3f88..d8ea90c45f 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php @@ -58,7 +58,7 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest $loader = new StubFilesystemLoader(array( __DIR__.'/../../Resources/views/Form', - __DIR__, + __DIR__.'/Fixtures/templates/form', )); $environment = new \Twig_Environment($loader, array('strict_variables' => true)); diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php index 99a782178a..16934440c5 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php @@ -57,7 +57,7 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest $loader = new StubFilesystemLoader(array( __DIR__.'/../../Resources/views/Form', - __DIR__, + __DIR__.'/Fixtures/templates/form', )); $environment = new \Twig_Environment($loader, array('strict_variables' => true));