From b982883a8583cd7bd4ae9b28b70598611c92cd13 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Tue, 31 Jul 2012 16:35:46 +0200 Subject: [PATCH] [Form] Moved FormHelper back to FrameworkBundle --- .../FrameworkBundle/Resources/config/templating_php.xml | 2 +- .../FrameworkBundle/Templating/Helper}/FormHelper.php | 2 +- .../Templating/Helper}/Fixtures/StubTemplateNameParser.php | 2 +- .../Tests/Templating/Helper}/Fixtures/StubTranslator.php | 2 +- .../Tests/Templating/Helper}/FormHelperDivLayoutTest.php | 6 +++--- .../Tests/Templating/Helper}/FormHelperTableLayoutTest.php | 6 +++--- .../Templating/Helper}/Resources/Child/form_label.html.php | 0 .../Helper}/Resources/Custom/_name_entry_label.html.php | 0 .../Helper}/Resources/Custom/_text_id_widget.html.php | 0 .../Templating/Helper}/Resources/Parent/form_label.html.php | 0 .../Helper}/Resources/Parent/form_widget_simple.html.php | 0 .../Form/Extension/Templating/TemplatingExtension.php | 1 + 12 files changed, 11 insertions(+), 10 deletions(-) rename src/Symfony/{Component/Form/Extension/Templating => Bundle/FrameworkBundle/Templating/Helper}/FormHelper.php (99%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Fixtures/StubTemplateNameParser.php (93%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Fixtures/StubTranslator.php (90%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/FormHelperDivLayoutTest.php (93%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/FormHelperTableLayoutTest.php (93%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Resources/Child/form_label.html.php (100%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Resources/Custom/_name_entry_label.html.php (100%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Resources/Custom/_text_id_widget.html.php (100%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Resources/Parent/form_label.html.php (100%) rename src/Symfony/{Component/Form/Tests/Extension/Templating => Bundle/FrameworkBundle/Tests/Templating/Helper}/Resources/Parent/form_widget_simple.html.php (100%) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml index 5e3d2674a2..ea1795455f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml @@ -14,7 +14,7 @@ Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper - Symfony\Component\Form\Extension\Templating\FormHelper + Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine Symfony\Component\Form\FormRenderer Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables diff --git a/src/Symfony/Component/Form/Extension/Templating/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php similarity index 99% rename from src/Symfony/Component/Form/Extension/Templating/FormHelper.php rename to src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 59d57986d3..e271bc56c3 100644 --- a/src/Symfony/Component/Form/Extension/Templating/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Form\Extension\Templating; +namespace Symfony\Bundle\FrameworkBundle\Templating\Helper; use Symfony\Component\Templating\Helper\Helper; use Symfony\Component\Form\FormRendererInterface; diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php similarity index 93% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTemplateNameParser.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php index 447944a428..3a66454947 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTemplateNameParser.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Form\Tests\Extension\Templating\Fixtures; +namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures; use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\Templating\TemplateReference; diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTranslator.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php similarity index 90% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTranslator.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php index 6e0db360a3..17d1fd4fc6 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Templating/Fixtures/StubTranslator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Fixtures/StubTranslator.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Form\Tests\Extension\Templating\Fixtures; +namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures; use Symfony\Component\Translation\TranslatorInterface; diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php similarity index 93% rename from src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperDivLayoutTest.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php index 66c2eafb99..9c077f39da 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperDivLayoutTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Form\Tests\Extension\Templating; +namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper; use Symfony\Component\Form\FormView; use Symfony\Component\Form\Extension\Templating\TemplatingExtension; use Symfony\Component\Form\Tests\AbstractDivLayoutTest; -use Symfony\Component\Form\Tests\Extension\Templating\Fixtures\StubTemplateNameParser; -use Symfony\Component\Form\Tests\Extension\Templating\Fixtures\StubTranslator; +use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser; +use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator; use Symfony\Component\Templating\PhpEngine; use Symfony\Component\Templating\Loader\FilesystemLoader; diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php similarity index 93% rename from src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperTableLayoutTest.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php index b084379015..1f5292bc7e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Templating/FormHelperTableLayoutTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Form\Tests\Extension\Templating; +namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper; use Symfony\Component\Form\FormView; use Symfony\Component\Form\Extension\Templating\TemplatingExtension; use Symfony\Component\Form\Tests\AbstractTableLayoutTest; -use Symfony\Component\Form\Tests\Extension\Templating\Fixtures\StubTemplateNameParser; -use Symfony\Component\Form\Tests\Extension\Templating\Fixtures\StubTranslator; +use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTemplateNameParser; +use Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper\Fixtures\StubTranslator; use Symfony\Component\Templating\PhpEngine; use Symfony\Component\Templating\Loader\FilesystemLoader; diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Child/form_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php similarity index 100% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Child/form_label.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Custom/_name_entry_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php similarity index 100% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Custom/_name_entry_label.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Custom/_text_id_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php similarity index 100% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Custom/_text_id_widget.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_text_id_widget.html.php diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Parent/form_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php similarity index 100% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Parent/form_label.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_label.html.php diff --git a/src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Parent/form_widget_simple.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php similarity index 100% rename from src/Symfony/Component/Form/Tests/Extension/Templating/Resources/Parent/form_widget_simple.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php index ea31370b5d..573cb518d4 100644 --- a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php +++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php @@ -15,6 +15,7 @@ use Symfony\Component\Form\AbstractExtension; use Symfony\Component\Form\FormRenderer; use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface; use Symfony\Component\Templating\PhpEngine; +use Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper; /** * Integrates the Templating component with the Form library.