From 636353d0f4b64633685979c374759fa9a259ee6e Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Sun, 28 Jun 2015 14:32:01 +0200 Subject: [PATCH] separate folders for bundle- and library-related code --- .gitignore | 2 +- .../CraueFormFlowBundle.php | 0 .../CraueFormFlowExtension.php | 0 .../Resources}/assets/css/buttons.css | 0 .../Resources}/config/form_flow.xml | 0 .../Resources}/config/twig.xml | 0 .../Resources}/config/util.xml | 0 .../translations/CraueFormFlowBundle.cs.yml | 0 .../translations/CraueFormFlowBundle.de.yml | 0 .../translations/CraueFormFlowBundle.en.yml | 0 .../translations/CraueFormFlowBundle.es.yml | 0 .../translations/CraueFormFlowBundle.fa.yml | 0 .../translations/CraueFormFlowBundle.fr.yml | 0 .../translations/CraueFormFlowBundle.nl.yml | 0 .../translations/CraueFormFlowBundle.pl.yml | 0 .../CraueFormFlowBundle.pt_BR.yml | 0 .../translations/CraueFormFlowBundle.ru.yml | 0 .../translations/CraueFormFlowBundle.uk.yml | 0 .../translations/CraueFormFlowBundle.zh.yml | 0 .../Resources}/translations/validators.cs.yml | 0 .../Resources}/translations/validators.de.yml | 0 .../Resources}/translations/validators.en.yml | 0 .../Resources}/translations/validators.es.yml | 0 .../Resources}/translations/validators.fa.yml | 0 .../Resources}/translations/validators.fr.yml | 0 .../Resources}/translations/validators.nl.yml | 0 .../Resources}/translations/validators.pl.yml | 0 .../translations/validators.pt_BR.yml | 0 .../Resources}/translations/validators.ru.yml | 0 .../Resources}/translations/validators.uk.yml | 0 .../Resources}/translations/validators.zh.yml | 0 .../views/FormFlow/buttons.html.twig | 0 .../views/FormFlow/stepList.html.twig | 0 .../views/FormFlow/stepList_blocks.html.twig | 0 .../views/FormFlow/stepList_content.html.twig | 0 .../FormFlow/stepList_customization.html.twig | 0 {Tests => Bundle/Tests}/.gitignore | 0 {Tests => Bundle/Tests}/AppKernel.php | 0 .../Tests}/ConcurrentFlowsTest.php | 0 .../Tests}/CreateTopicFlowTest.php | 0 .../Tests}/CreateVehicleFlowTest.php | 0 {Tests => Bundle/Tests}/Demo1FlowTest.php | 0 .../Tests}/Event/PostBindFlowEventTest.php | 0 .../Tests}/Event/PostBindRequestEventTest.php | 0 .../Event/PostBindSavedDataEventTest.php | 0 .../Tests}/Event/PostValidateEventTest.php | 0 .../Exception/InvalidTypeExceptionTest.php | 0 .../Tests}/Fixtures/blue-pixel.png | Bin .../Tests}/Fixtures/some-text.txt | 0 .../Extension/FormFlowFormExtensionTest.php | 0 .../FormFlowHiddenFieldExtensionTest.php | 0 .../Tests}/Form/FormFlowBcMethodsTest.php | 0 {Tests => Bundle/Tests}/Form/FormFlowTest.php | 0 {Tests => Bundle/Tests}/Form/StepBcTest.php | 0 {Tests => Bundle/Tests}/Form/StepTest.php | 0 .../Controller/FormFlowController.php | 0 .../Entity/Issue149Data.php | 0 .../Entity/Issue149SubData.php | 0 .../Entity/Issue64Data.php | 0 .../Entity/Issue64SubData.php | 0 .../Entity/PhotoUpload.php | 0 .../Entity/RevalidatePreviousStepsData.php | 0 .../IntegrationTestBundle/Entity/Topic.php | 0 .../IntegrationTestBundle/Entity/Vehicle.php | 0 .../Form/CreateTopicFlow.php | 0 .../Form/CreateTopicForm.php | 0 .../Form/CreateVehicleFlow.php | 0 .../Form/CreateVehicleForm.php | 0 .../IntegrationTestBundle/Form/Demo1Flow.php | 0 .../Form/Issue149Flow.php | 0 .../Form/Issue149Form.php | 0 .../Form/Issue64Flow.php | 0 .../Form/Issue64Form.php | 0 .../Form/Issue87Flow.php | 0 .../Form/OnlyOneStepFlow.php | 0 .../Form/PhotoUploadFlow.php | 0 .../Form/PhotoUploadForm.php | 0 .../RemoveSecondStepSkipMarkOnResetFlow.php | 0 .../Form/RevalidatePreviousStepsFlow.php | 0 .../Form/SkipFirstStepUsingClosureFlow.php | 0 .../IntegrationTestBundle.php | 0 .../Resources/config/form.xml | 0 .../Resources/config/form_flow.xml | 0 .../views/FormFlow/photoUpload.html.twig | 0 .../Resources/views/layout.html.twig | 0 .../Resources/views/layout_flow.html.twig | 0 .../Tests}/IntegrationTestCase.php | 0 {Tests => Bundle/Tests}/Issue149Test.php | 0 {Tests => Bundle/Tests}/Issue64Test.php | 0 {Tests => Bundle/Tests}/Issue87Test.php | 0 .../Tests}/OnlyOneStepFlowTest.php | 0 .../Tests}/PhotoUploadFlowTest.php | 0 ...emoveSecondStepSkipMarkOnResetFlowTest.php | 0 .../Resources/TemplateRenderingTest.php | 0 .../RevalidatePreviousStepsFlowTest.php | 0 .../SkipFirstStepUsingClosureFlowTest.php | 0 .../Tests}/Storage/AbstractStorageTest.php | 0 .../Tests}/Storage/DataManagerTest.php | 0 .../Tests}/Storage/SerializableFileTest.php | 0 .../Tests}/Storage/SessionStorageTest.php | 0 .../FormFlowExtensionBcMethodsTest.php | 0 {Tests => Bundle/Tests}/UnitTestCase.php | 0 .../Tests}/Util/FormFlowUtilTest.php | 0 .../Tests}/Util/StringUtilTest.php | 0 {Tests => Bundle/Tests}/bootstrap.php | 2 +- {Tests => Bundle/Tests}/config/config.yml | 0 {Tests => Bundle/Tests}/config/routing.yml | 0 .../Twig}/Extension/FormFlowExtension.php | 0 {Util => Bundle/Util}/FormFlowUtil.php | 0 Component/.gitignore | 6 +++ {Event => Component/Event}/FormFlowEvent.php | 0 {Event => Component/Event}/GetStepsEvent.php | 0 .../Event}/PostBindFlowEvent.php | 0 .../Event}/PostBindRequestEvent.php | 0 .../Event}/PostBindSavedDataEvent.php | 0 .../Event}/PostValidateEvent.php | 0 {Event => Component/Event}/PreBindEvent.php | 0 .../Event}/PreviousStepInvalidEvent.php | 0 .../PreviousStepInvalidEventListener.php | 0 .../Exception}/InvalidTypeException.php | 0 .../Form}/Extension/FormFlowFormExtension.php | 0 .../FormFlowHiddenFieldExtension.php | 0 {Form => Component/Form}/FormFlow.php | 0 {Form => Component/Form}/FormFlowEvents.php | 0 .../Form}/FormFlowInterface.php | 0 {Form => Component/Form}/Step.php | 0 {Form => Component/Form}/StepInterface.php | 0 Component/LICENSE | 2 + Component/README.md | 1 + .../Storage}/DataManager.php | 0 .../Storage}/DataManagerInterface.php | 0 .../Storage}/ExtendedDataManagerInterface.php | 0 .../Storage}/SerializableFile.php | 0 .../Storage}/SessionStorage.php | 0 .../Storage}/StorageInterface.php | 0 {Util => Component/Util}/StringUtil.php | 0 {Util => Component/Util}/TempFileUtil.php | 0 Component/composer.json | 37 ++++++++++++++++++ composer.json | 5 ++- phpunit.xml.dist | 6 +-- 140 files changed, 55 insertions(+), 6 deletions(-) rename CraueFormFlowBundle.php => Bundle/CraueFormFlowBundle.php (100%) rename {DependencyInjection => Bundle/DependencyInjection}/CraueFormFlowExtension.php (100%) rename {Resources => Bundle/Resources}/assets/css/buttons.css (100%) rename {Resources => Bundle/Resources}/config/form_flow.xml (100%) rename {Resources => Bundle/Resources}/config/twig.xml (100%) rename {Resources => Bundle/Resources}/config/util.xml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.cs.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.de.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.en.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.es.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.fa.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.fr.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.nl.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.pl.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.pt_BR.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.ru.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.uk.yml (100%) rename {Resources => Bundle/Resources}/translations/CraueFormFlowBundle.zh.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.cs.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.de.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.en.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.es.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.fa.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.fr.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.nl.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.pl.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.pt_BR.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.ru.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.uk.yml (100%) rename {Resources => Bundle/Resources}/translations/validators.zh.yml (100%) rename {Resources => Bundle/Resources}/views/FormFlow/buttons.html.twig (100%) rename {Resources => Bundle/Resources}/views/FormFlow/stepList.html.twig (100%) rename {Resources => Bundle/Resources}/views/FormFlow/stepList_blocks.html.twig (100%) rename {Resources => Bundle/Resources}/views/FormFlow/stepList_content.html.twig (100%) rename {Resources => Bundle/Resources}/views/FormFlow/stepList_customization.html.twig (100%) rename {Tests => Bundle/Tests}/.gitignore (100%) rename {Tests => Bundle/Tests}/AppKernel.php (100%) rename {Tests => Bundle/Tests}/ConcurrentFlowsTest.php (100%) rename {Tests => Bundle/Tests}/CreateTopicFlowTest.php (100%) rename {Tests => Bundle/Tests}/CreateVehicleFlowTest.php (100%) rename {Tests => Bundle/Tests}/Demo1FlowTest.php (100%) rename {Tests => Bundle/Tests}/Event/PostBindFlowEventTest.php (100%) rename {Tests => Bundle/Tests}/Event/PostBindRequestEventTest.php (100%) rename {Tests => Bundle/Tests}/Event/PostBindSavedDataEventTest.php (100%) rename {Tests => Bundle/Tests}/Event/PostValidateEventTest.php (100%) rename {Tests => Bundle/Tests}/Exception/InvalidTypeExceptionTest.php (100%) rename {Tests => Bundle/Tests}/Fixtures/blue-pixel.png (100%) rename {Tests => Bundle/Tests}/Fixtures/some-text.txt (100%) rename {Tests => Bundle/Tests}/Form/Extension/FormFlowFormExtensionTest.php (100%) rename {Tests => Bundle/Tests}/Form/Extension/FormFlowHiddenFieldExtensionTest.php (100%) rename {Tests => Bundle/Tests}/Form/FormFlowBcMethodsTest.php (100%) rename {Tests => Bundle/Tests}/Form/FormFlowTest.php (100%) rename {Tests => Bundle/Tests}/Form/StepBcTest.php (100%) rename {Tests => Bundle/Tests}/Form/StepTest.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Controller/FormFlowController.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Issue149Data.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Issue149SubData.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Issue64Data.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Issue64SubData.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/PhotoUpload.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/RevalidatePreviousStepsData.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Topic.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Entity/Vehicle.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/CreateTopicFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/CreateTopicForm.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/CreateVehicleFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/CreateVehicleForm.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Demo1Flow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Issue149Flow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Issue149Form.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Issue64Flow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Issue64Form.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/Issue87Flow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/OnlyOneStepFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/PhotoUploadFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/PhotoUploadForm.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/IntegrationTestBundle.php (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Resources/config/form.xml (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Resources/config/form_flow.xml (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Resources/views/FormFlow/photoUpload.html.twig (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Resources/views/layout.html.twig (100%) rename {Tests => Bundle/Tests}/IntegrationTestBundle/Resources/views/layout_flow.html.twig (100%) rename {Tests => Bundle/Tests}/IntegrationTestCase.php (100%) rename {Tests => Bundle/Tests}/Issue149Test.php (100%) rename {Tests => Bundle/Tests}/Issue64Test.php (100%) rename {Tests => Bundle/Tests}/Issue87Test.php (100%) rename {Tests => Bundle/Tests}/OnlyOneStepFlowTest.php (100%) rename {Tests => Bundle/Tests}/PhotoUploadFlowTest.php (100%) rename {Tests => Bundle/Tests}/RemoveSecondStepSkipMarkOnResetFlowTest.php (100%) rename {Tests => Bundle/Tests}/Resources/TemplateRenderingTest.php (100%) rename {Tests => Bundle/Tests}/RevalidatePreviousStepsFlowTest.php (100%) rename {Tests => Bundle/Tests}/SkipFirstStepUsingClosureFlowTest.php (100%) rename {Tests => Bundle/Tests}/Storage/AbstractStorageTest.php (100%) rename {Tests => Bundle/Tests}/Storage/DataManagerTest.php (100%) rename {Tests => Bundle/Tests}/Storage/SerializableFileTest.php (100%) rename {Tests => Bundle/Tests}/Storage/SessionStorageTest.php (100%) rename {Tests => Bundle/Tests}/Twig/Extension/FormFlowExtensionBcMethodsTest.php (100%) rename {Tests => Bundle/Tests}/UnitTestCase.php (100%) rename {Tests => Bundle/Tests}/Util/FormFlowUtilTest.php (100%) rename {Tests => Bundle/Tests}/Util/StringUtilTest.php (100%) rename {Tests => Bundle/Tests}/bootstrap.php (86%) rename {Tests => Bundle/Tests}/config/config.yml (100%) rename {Tests => Bundle/Tests}/config/routing.yml (100%) rename {Twig => Bundle/Twig}/Extension/FormFlowExtension.php (100%) rename {Util => Bundle/Util}/FormFlowUtil.php (100%) create mode 100644 Component/.gitignore rename {Event => Component/Event}/FormFlowEvent.php (100%) rename {Event => Component/Event}/GetStepsEvent.php (100%) rename {Event => Component/Event}/PostBindFlowEvent.php (100%) rename {Event => Component/Event}/PostBindRequestEvent.php (100%) rename {Event => Component/Event}/PostBindSavedDataEvent.php (100%) rename {Event => Component/Event}/PostValidateEvent.php (100%) rename {Event => Component/Event}/PreBindEvent.php (100%) rename {Event => Component/Event}/PreviousStepInvalidEvent.php (100%) rename {EventListener => Component/EventListener}/PreviousStepInvalidEventListener.php (100%) rename {Exception => Component/Exception}/InvalidTypeException.php (100%) rename {Form => Component/Form}/Extension/FormFlowFormExtension.php (100%) rename {Form => Component/Form}/Extension/FormFlowHiddenFieldExtension.php (100%) rename {Form => Component/Form}/FormFlow.php (100%) rename {Form => Component/Form}/FormFlowEvents.php (100%) rename {Form => Component/Form}/FormFlowInterface.php (100%) rename {Form => Component/Form}/Step.php (100%) rename {Form => Component/Form}/StepInterface.php (100%) create mode 100644 Component/LICENSE create mode 100644 Component/README.md rename {Storage => Component/Storage}/DataManager.php (100%) rename {Storage => Component/Storage}/DataManagerInterface.php (100%) rename {Storage => Component/Storage}/ExtendedDataManagerInterface.php (100%) rename {Storage => Component/Storage}/SerializableFile.php (100%) rename {Storage => Component/Storage}/SessionStorage.php (100%) rename {Storage => Component/Storage}/StorageInterface.php (100%) rename {Util => Component/Util}/StringUtil.php (100%) rename {Util => Component/Util}/TempFileUtil.php (100%) create mode 100644 Component/composer.json diff --git a/.gitignore b/.gitignore index af41f6cf..bb1fd8c0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /composer-install.bat /composer-update.bat /composer.lock -.DS_Store /git.bat /phpunit-tests-run-with-coverage.bat /phpunit-tests-run.bat @@ -14,3 +13,4 @@ /vendors-install.bat /vendors-update.bat /vendors-whatsnew.bat +.DS_Store diff --git a/CraueFormFlowBundle.php b/Bundle/CraueFormFlowBundle.php similarity index 100% rename from CraueFormFlowBundle.php rename to Bundle/CraueFormFlowBundle.php diff --git a/DependencyInjection/CraueFormFlowExtension.php b/Bundle/DependencyInjection/CraueFormFlowExtension.php similarity index 100% rename from DependencyInjection/CraueFormFlowExtension.php rename to Bundle/DependencyInjection/CraueFormFlowExtension.php diff --git a/Resources/assets/css/buttons.css b/Bundle/Resources/assets/css/buttons.css similarity index 100% rename from Resources/assets/css/buttons.css rename to Bundle/Resources/assets/css/buttons.css diff --git a/Resources/config/form_flow.xml b/Bundle/Resources/config/form_flow.xml similarity index 100% rename from Resources/config/form_flow.xml rename to Bundle/Resources/config/form_flow.xml diff --git a/Resources/config/twig.xml b/Bundle/Resources/config/twig.xml similarity index 100% rename from Resources/config/twig.xml rename to Bundle/Resources/config/twig.xml diff --git a/Resources/config/util.xml b/Bundle/Resources/config/util.xml similarity index 100% rename from Resources/config/util.xml rename to Bundle/Resources/config/util.xml diff --git a/Resources/translations/CraueFormFlowBundle.cs.yml b/Bundle/Resources/translations/CraueFormFlowBundle.cs.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.cs.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.cs.yml diff --git a/Resources/translations/CraueFormFlowBundle.de.yml b/Bundle/Resources/translations/CraueFormFlowBundle.de.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.de.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.de.yml diff --git a/Resources/translations/CraueFormFlowBundle.en.yml b/Bundle/Resources/translations/CraueFormFlowBundle.en.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.en.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.en.yml diff --git a/Resources/translations/CraueFormFlowBundle.es.yml b/Bundle/Resources/translations/CraueFormFlowBundle.es.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.es.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.es.yml diff --git a/Resources/translations/CraueFormFlowBundle.fa.yml b/Bundle/Resources/translations/CraueFormFlowBundle.fa.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.fa.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.fa.yml diff --git a/Resources/translations/CraueFormFlowBundle.fr.yml b/Bundle/Resources/translations/CraueFormFlowBundle.fr.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.fr.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.fr.yml diff --git a/Resources/translations/CraueFormFlowBundle.nl.yml b/Bundle/Resources/translations/CraueFormFlowBundle.nl.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.nl.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.nl.yml diff --git a/Resources/translations/CraueFormFlowBundle.pl.yml b/Bundle/Resources/translations/CraueFormFlowBundle.pl.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.pl.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.pl.yml diff --git a/Resources/translations/CraueFormFlowBundle.pt_BR.yml b/Bundle/Resources/translations/CraueFormFlowBundle.pt_BR.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.pt_BR.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.pt_BR.yml diff --git a/Resources/translations/CraueFormFlowBundle.ru.yml b/Bundle/Resources/translations/CraueFormFlowBundle.ru.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.ru.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.ru.yml diff --git a/Resources/translations/CraueFormFlowBundle.uk.yml b/Bundle/Resources/translations/CraueFormFlowBundle.uk.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.uk.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.uk.yml diff --git a/Resources/translations/CraueFormFlowBundle.zh.yml b/Bundle/Resources/translations/CraueFormFlowBundle.zh.yml similarity index 100% rename from Resources/translations/CraueFormFlowBundle.zh.yml rename to Bundle/Resources/translations/CraueFormFlowBundle.zh.yml diff --git a/Resources/translations/validators.cs.yml b/Bundle/Resources/translations/validators.cs.yml similarity index 100% rename from Resources/translations/validators.cs.yml rename to Bundle/Resources/translations/validators.cs.yml diff --git a/Resources/translations/validators.de.yml b/Bundle/Resources/translations/validators.de.yml similarity index 100% rename from Resources/translations/validators.de.yml rename to Bundle/Resources/translations/validators.de.yml diff --git a/Resources/translations/validators.en.yml b/Bundle/Resources/translations/validators.en.yml similarity index 100% rename from Resources/translations/validators.en.yml rename to Bundle/Resources/translations/validators.en.yml diff --git a/Resources/translations/validators.es.yml b/Bundle/Resources/translations/validators.es.yml similarity index 100% rename from Resources/translations/validators.es.yml rename to Bundle/Resources/translations/validators.es.yml diff --git a/Resources/translations/validators.fa.yml b/Bundle/Resources/translations/validators.fa.yml similarity index 100% rename from Resources/translations/validators.fa.yml rename to Bundle/Resources/translations/validators.fa.yml diff --git a/Resources/translations/validators.fr.yml b/Bundle/Resources/translations/validators.fr.yml similarity index 100% rename from Resources/translations/validators.fr.yml rename to Bundle/Resources/translations/validators.fr.yml diff --git a/Resources/translations/validators.nl.yml b/Bundle/Resources/translations/validators.nl.yml similarity index 100% rename from Resources/translations/validators.nl.yml rename to Bundle/Resources/translations/validators.nl.yml diff --git a/Resources/translations/validators.pl.yml b/Bundle/Resources/translations/validators.pl.yml similarity index 100% rename from Resources/translations/validators.pl.yml rename to Bundle/Resources/translations/validators.pl.yml diff --git a/Resources/translations/validators.pt_BR.yml b/Bundle/Resources/translations/validators.pt_BR.yml similarity index 100% rename from Resources/translations/validators.pt_BR.yml rename to Bundle/Resources/translations/validators.pt_BR.yml diff --git a/Resources/translations/validators.ru.yml b/Bundle/Resources/translations/validators.ru.yml similarity index 100% rename from Resources/translations/validators.ru.yml rename to Bundle/Resources/translations/validators.ru.yml diff --git a/Resources/translations/validators.uk.yml b/Bundle/Resources/translations/validators.uk.yml similarity index 100% rename from Resources/translations/validators.uk.yml rename to Bundle/Resources/translations/validators.uk.yml diff --git a/Resources/translations/validators.zh.yml b/Bundle/Resources/translations/validators.zh.yml similarity index 100% rename from Resources/translations/validators.zh.yml rename to Bundle/Resources/translations/validators.zh.yml diff --git a/Resources/views/FormFlow/buttons.html.twig b/Bundle/Resources/views/FormFlow/buttons.html.twig similarity index 100% rename from Resources/views/FormFlow/buttons.html.twig rename to Bundle/Resources/views/FormFlow/buttons.html.twig diff --git a/Resources/views/FormFlow/stepList.html.twig b/Bundle/Resources/views/FormFlow/stepList.html.twig similarity index 100% rename from Resources/views/FormFlow/stepList.html.twig rename to Bundle/Resources/views/FormFlow/stepList.html.twig diff --git a/Resources/views/FormFlow/stepList_blocks.html.twig b/Bundle/Resources/views/FormFlow/stepList_blocks.html.twig similarity index 100% rename from Resources/views/FormFlow/stepList_blocks.html.twig rename to Bundle/Resources/views/FormFlow/stepList_blocks.html.twig diff --git a/Resources/views/FormFlow/stepList_content.html.twig b/Bundle/Resources/views/FormFlow/stepList_content.html.twig similarity index 100% rename from Resources/views/FormFlow/stepList_content.html.twig rename to Bundle/Resources/views/FormFlow/stepList_content.html.twig diff --git a/Resources/views/FormFlow/stepList_customization.html.twig b/Bundle/Resources/views/FormFlow/stepList_customization.html.twig similarity index 100% rename from Resources/views/FormFlow/stepList_customization.html.twig rename to Bundle/Resources/views/FormFlow/stepList_customization.html.twig diff --git a/Tests/.gitignore b/Bundle/Tests/.gitignore similarity index 100% rename from Tests/.gitignore rename to Bundle/Tests/.gitignore diff --git a/Tests/AppKernel.php b/Bundle/Tests/AppKernel.php similarity index 100% rename from Tests/AppKernel.php rename to Bundle/Tests/AppKernel.php diff --git a/Tests/ConcurrentFlowsTest.php b/Bundle/Tests/ConcurrentFlowsTest.php similarity index 100% rename from Tests/ConcurrentFlowsTest.php rename to Bundle/Tests/ConcurrentFlowsTest.php diff --git a/Tests/CreateTopicFlowTest.php b/Bundle/Tests/CreateTopicFlowTest.php similarity index 100% rename from Tests/CreateTopicFlowTest.php rename to Bundle/Tests/CreateTopicFlowTest.php diff --git a/Tests/CreateVehicleFlowTest.php b/Bundle/Tests/CreateVehicleFlowTest.php similarity index 100% rename from Tests/CreateVehicleFlowTest.php rename to Bundle/Tests/CreateVehicleFlowTest.php diff --git a/Tests/Demo1FlowTest.php b/Bundle/Tests/Demo1FlowTest.php similarity index 100% rename from Tests/Demo1FlowTest.php rename to Bundle/Tests/Demo1FlowTest.php diff --git a/Tests/Event/PostBindFlowEventTest.php b/Bundle/Tests/Event/PostBindFlowEventTest.php similarity index 100% rename from Tests/Event/PostBindFlowEventTest.php rename to Bundle/Tests/Event/PostBindFlowEventTest.php diff --git a/Tests/Event/PostBindRequestEventTest.php b/Bundle/Tests/Event/PostBindRequestEventTest.php similarity index 100% rename from Tests/Event/PostBindRequestEventTest.php rename to Bundle/Tests/Event/PostBindRequestEventTest.php diff --git a/Tests/Event/PostBindSavedDataEventTest.php b/Bundle/Tests/Event/PostBindSavedDataEventTest.php similarity index 100% rename from Tests/Event/PostBindSavedDataEventTest.php rename to Bundle/Tests/Event/PostBindSavedDataEventTest.php diff --git a/Tests/Event/PostValidateEventTest.php b/Bundle/Tests/Event/PostValidateEventTest.php similarity index 100% rename from Tests/Event/PostValidateEventTest.php rename to Bundle/Tests/Event/PostValidateEventTest.php diff --git a/Tests/Exception/InvalidTypeExceptionTest.php b/Bundle/Tests/Exception/InvalidTypeExceptionTest.php similarity index 100% rename from Tests/Exception/InvalidTypeExceptionTest.php rename to Bundle/Tests/Exception/InvalidTypeExceptionTest.php diff --git a/Tests/Fixtures/blue-pixel.png b/Bundle/Tests/Fixtures/blue-pixel.png similarity index 100% rename from Tests/Fixtures/blue-pixel.png rename to Bundle/Tests/Fixtures/blue-pixel.png diff --git a/Tests/Fixtures/some-text.txt b/Bundle/Tests/Fixtures/some-text.txt similarity index 100% rename from Tests/Fixtures/some-text.txt rename to Bundle/Tests/Fixtures/some-text.txt diff --git a/Tests/Form/Extension/FormFlowFormExtensionTest.php b/Bundle/Tests/Form/Extension/FormFlowFormExtensionTest.php similarity index 100% rename from Tests/Form/Extension/FormFlowFormExtensionTest.php rename to Bundle/Tests/Form/Extension/FormFlowFormExtensionTest.php diff --git a/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php b/Bundle/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php similarity index 100% rename from Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php rename to Bundle/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php diff --git a/Tests/Form/FormFlowBcMethodsTest.php b/Bundle/Tests/Form/FormFlowBcMethodsTest.php similarity index 100% rename from Tests/Form/FormFlowBcMethodsTest.php rename to Bundle/Tests/Form/FormFlowBcMethodsTest.php diff --git a/Tests/Form/FormFlowTest.php b/Bundle/Tests/Form/FormFlowTest.php similarity index 100% rename from Tests/Form/FormFlowTest.php rename to Bundle/Tests/Form/FormFlowTest.php diff --git a/Tests/Form/StepBcTest.php b/Bundle/Tests/Form/StepBcTest.php similarity index 100% rename from Tests/Form/StepBcTest.php rename to Bundle/Tests/Form/StepBcTest.php diff --git a/Tests/Form/StepTest.php b/Bundle/Tests/Form/StepTest.php similarity index 100% rename from Tests/Form/StepTest.php rename to Bundle/Tests/Form/StepTest.php diff --git a/Tests/IntegrationTestBundle/Controller/FormFlowController.php b/Bundle/Tests/IntegrationTestBundle/Controller/FormFlowController.php similarity index 100% rename from Tests/IntegrationTestBundle/Controller/FormFlowController.php rename to Bundle/Tests/IntegrationTestBundle/Controller/FormFlowController.php diff --git a/Tests/IntegrationTestBundle/Entity/Issue149Data.php b/Bundle/Tests/IntegrationTestBundle/Entity/Issue149Data.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Issue149Data.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Issue149Data.php diff --git a/Tests/IntegrationTestBundle/Entity/Issue149SubData.php b/Bundle/Tests/IntegrationTestBundle/Entity/Issue149SubData.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Issue149SubData.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Issue149SubData.php diff --git a/Tests/IntegrationTestBundle/Entity/Issue64Data.php b/Bundle/Tests/IntegrationTestBundle/Entity/Issue64Data.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Issue64Data.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Issue64Data.php diff --git a/Tests/IntegrationTestBundle/Entity/Issue64SubData.php b/Bundle/Tests/IntegrationTestBundle/Entity/Issue64SubData.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Issue64SubData.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Issue64SubData.php diff --git a/Tests/IntegrationTestBundle/Entity/PhotoUpload.php b/Bundle/Tests/IntegrationTestBundle/Entity/PhotoUpload.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/PhotoUpload.php rename to Bundle/Tests/IntegrationTestBundle/Entity/PhotoUpload.php diff --git a/Tests/IntegrationTestBundle/Entity/RevalidatePreviousStepsData.php b/Bundle/Tests/IntegrationTestBundle/Entity/RevalidatePreviousStepsData.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/RevalidatePreviousStepsData.php rename to Bundle/Tests/IntegrationTestBundle/Entity/RevalidatePreviousStepsData.php diff --git a/Tests/IntegrationTestBundle/Entity/Topic.php b/Bundle/Tests/IntegrationTestBundle/Entity/Topic.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Topic.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Topic.php diff --git a/Tests/IntegrationTestBundle/Entity/Vehicle.php b/Bundle/Tests/IntegrationTestBundle/Entity/Vehicle.php similarity index 100% rename from Tests/IntegrationTestBundle/Entity/Vehicle.php rename to Bundle/Tests/IntegrationTestBundle/Entity/Vehicle.php diff --git a/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/CreateTopicFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php diff --git a/Tests/IntegrationTestBundle/Form/CreateTopicForm.php b/Bundle/Tests/IntegrationTestBundle/Form/CreateTopicForm.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/CreateTopicForm.php rename to Bundle/Tests/IntegrationTestBundle/Form/CreateTopicForm.php diff --git a/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php diff --git a/Tests/IntegrationTestBundle/Form/CreateVehicleForm.php b/Bundle/Tests/IntegrationTestBundle/Form/CreateVehicleForm.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/CreateVehicleForm.php rename to Bundle/Tests/IntegrationTestBundle/Form/CreateVehicleForm.php diff --git a/Tests/IntegrationTestBundle/Form/Demo1Flow.php b/Bundle/Tests/IntegrationTestBundle/Form/Demo1Flow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Demo1Flow.php rename to Bundle/Tests/IntegrationTestBundle/Form/Demo1Flow.php diff --git a/Tests/IntegrationTestBundle/Form/Issue149Flow.php b/Bundle/Tests/IntegrationTestBundle/Form/Issue149Flow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Issue149Flow.php rename to Bundle/Tests/IntegrationTestBundle/Form/Issue149Flow.php diff --git a/Tests/IntegrationTestBundle/Form/Issue149Form.php b/Bundle/Tests/IntegrationTestBundle/Form/Issue149Form.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Issue149Form.php rename to Bundle/Tests/IntegrationTestBundle/Form/Issue149Form.php diff --git a/Tests/IntegrationTestBundle/Form/Issue64Flow.php b/Bundle/Tests/IntegrationTestBundle/Form/Issue64Flow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Issue64Flow.php rename to Bundle/Tests/IntegrationTestBundle/Form/Issue64Flow.php diff --git a/Tests/IntegrationTestBundle/Form/Issue64Form.php b/Bundle/Tests/IntegrationTestBundle/Form/Issue64Form.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Issue64Form.php rename to Bundle/Tests/IntegrationTestBundle/Form/Issue64Form.php diff --git a/Tests/IntegrationTestBundle/Form/Issue87Flow.php b/Bundle/Tests/IntegrationTestBundle/Form/Issue87Flow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/Issue87Flow.php rename to Bundle/Tests/IntegrationTestBundle/Form/Issue87Flow.php diff --git a/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php diff --git a/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php diff --git a/Tests/IntegrationTestBundle/Form/PhotoUploadForm.php b/Bundle/Tests/IntegrationTestBundle/Form/PhotoUploadForm.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/PhotoUploadForm.php rename to Bundle/Tests/IntegrationTestBundle/Form/PhotoUploadForm.php diff --git a/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php diff --git a/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php diff --git a/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php b/Bundle/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php similarity index 100% rename from Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php rename to Bundle/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php diff --git a/Tests/IntegrationTestBundle/IntegrationTestBundle.php b/Bundle/Tests/IntegrationTestBundle/IntegrationTestBundle.php similarity index 100% rename from Tests/IntegrationTestBundle/IntegrationTestBundle.php rename to Bundle/Tests/IntegrationTestBundle/IntegrationTestBundle.php diff --git a/Tests/IntegrationTestBundle/Resources/config/form.xml b/Bundle/Tests/IntegrationTestBundle/Resources/config/form.xml similarity index 100% rename from Tests/IntegrationTestBundle/Resources/config/form.xml rename to Bundle/Tests/IntegrationTestBundle/Resources/config/form.xml diff --git a/Tests/IntegrationTestBundle/Resources/config/form_flow.xml b/Bundle/Tests/IntegrationTestBundle/Resources/config/form_flow.xml similarity index 100% rename from Tests/IntegrationTestBundle/Resources/config/form_flow.xml rename to Bundle/Tests/IntegrationTestBundle/Resources/config/form_flow.xml diff --git a/Tests/IntegrationTestBundle/Resources/views/FormFlow/photoUpload.html.twig b/Bundle/Tests/IntegrationTestBundle/Resources/views/FormFlow/photoUpload.html.twig similarity index 100% rename from Tests/IntegrationTestBundle/Resources/views/FormFlow/photoUpload.html.twig rename to Bundle/Tests/IntegrationTestBundle/Resources/views/FormFlow/photoUpload.html.twig diff --git a/Tests/IntegrationTestBundle/Resources/views/layout.html.twig b/Bundle/Tests/IntegrationTestBundle/Resources/views/layout.html.twig similarity index 100% rename from Tests/IntegrationTestBundle/Resources/views/layout.html.twig rename to Bundle/Tests/IntegrationTestBundle/Resources/views/layout.html.twig diff --git a/Tests/IntegrationTestBundle/Resources/views/layout_flow.html.twig b/Bundle/Tests/IntegrationTestBundle/Resources/views/layout_flow.html.twig similarity index 100% rename from Tests/IntegrationTestBundle/Resources/views/layout_flow.html.twig rename to Bundle/Tests/IntegrationTestBundle/Resources/views/layout_flow.html.twig diff --git a/Tests/IntegrationTestCase.php b/Bundle/Tests/IntegrationTestCase.php similarity index 100% rename from Tests/IntegrationTestCase.php rename to Bundle/Tests/IntegrationTestCase.php diff --git a/Tests/Issue149Test.php b/Bundle/Tests/Issue149Test.php similarity index 100% rename from Tests/Issue149Test.php rename to Bundle/Tests/Issue149Test.php diff --git a/Tests/Issue64Test.php b/Bundle/Tests/Issue64Test.php similarity index 100% rename from Tests/Issue64Test.php rename to Bundle/Tests/Issue64Test.php diff --git a/Tests/Issue87Test.php b/Bundle/Tests/Issue87Test.php similarity index 100% rename from Tests/Issue87Test.php rename to Bundle/Tests/Issue87Test.php diff --git a/Tests/OnlyOneStepFlowTest.php b/Bundle/Tests/OnlyOneStepFlowTest.php similarity index 100% rename from Tests/OnlyOneStepFlowTest.php rename to Bundle/Tests/OnlyOneStepFlowTest.php diff --git a/Tests/PhotoUploadFlowTest.php b/Bundle/Tests/PhotoUploadFlowTest.php similarity index 100% rename from Tests/PhotoUploadFlowTest.php rename to Bundle/Tests/PhotoUploadFlowTest.php diff --git a/Tests/RemoveSecondStepSkipMarkOnResetFlowTest.php b/Bundle/Tests/RemoveSecondStepSkipMarkOnResetFlowTest.php similarity index 100% rename from Tests/RemoveSecondStepSkipMarkOnResetFlowTest.php rename to Bundle/Tests/RemoveSecondStepSkipMarkOnResetFlowTest.php diff --git a/Tests/Resources/TemplateRenderingTest.php b/Bundle/Tests/Resources/TemplateRenderingTest.php similarity index 100% rename from Tests/Resources/TemplateRenderingTest.php rename to Bundle/Tests/Resources/TemplateRenderingTest.php diff --git a/Tests/RevalidatePreviousStepsFlowTest.php b/Bundle/Tests/RevalidatePreviousStepsFlowTest.php similarity index 100% rename from Tests/RevalidatePreviousStepsFlowTest.php rename to Bundle/Tests/RevalidatePreviousStepsFlowTest.php diff --git a/Tests/SkipFirstStepUsingClosureFlowTest.php b/Bundle/Tests/SkipFirstStepUsingClosureFlowTest.php similarity index 100% rename from Tests/SkipFirstStepUsingClosureFlowTest.php rename to Bundle/Tests/SkipFirstStepUsingClosureFlowTest.php diff --git a/Tests/Storage/AbstractStorageTest.php b/Bundle/Tests/Storage/AbstractStorageTest.php similarity index 100% rename from Tests/Storage/AbstractStorageTest.php rename to Bundle/Tests/Storage/AbstractStorageTest.php diff --git a/Tests/Storage/DataManagerTest.php b/Bundle/Tests/Storage/DataManagerTest.php similarity index 100% rename from Tests/Storage/DataManagerTest.php rename to Bundle/Tests/Storage/DataManagerTest.php diff --git a/Tests/Storage/SerializableFileTest.php b/Bundle/Tests/Storage/SerializableFileTest.php similarity index 100% rename from Tests/Storage/SerializableFileTest.php rename to Bundle/Tests/Storage/SerializableFileTest.php diff --git a/Tests/Storage/SessionStorageTest.php b/Bundle/Tests/Storage/SessionStorageTest.php similarity index 100% rename from Tests/Storage/SessionStorageTest.php rename to Bundle/Tests/Storage/SessionStorageTest.php diff --git a/Tests/Twig/Extension/FormFlowExtensionBcMethodsTest.php b/Bundle/Tests/Twig/Extension/FormFlowExtensionBcMethodsTest.php similarity index 100% rename from Tests/Twig/Extension/FormFlowExtensionBcMethodsTest.php rename to Bundle/Tests/Twig/Extension/FormFlowExtensionBcMethodsTest.php diff --git a/Tests/UnitTestCase.php b/Bundle/Tests/UnitTestCase.php similarity index 100% rename from Tests/UnitTestCase.php rename to Bundle/Tests/UnitTestCase.php diff --git a/Tests/Util/FormFlowUtilTest.php b/Bundle/Tests/Util/FormFlowUtilTest.php similarity index 100% rename from Tests/Util/FormFlowUtilTest.php rename to Bundle/Tests/Util/FormFlowUtilTest.php diff --git a/Tests/Util/StringUtilTest.php b/Bundle/Tests/Util/StringUtilTest.php similarity index 100% rename from Tests/Util/StringUtilTest.php rename to Bundle/Tests/Util/StringUtilTest.php diff --git a/Tests/bootstrap.php b/Bundle/Tests/bootstrap.php similarity index 86% rename from Tests/bootstrap.php rename to Bundle/Tests/bootstrap.php index ee5f4941..c5d91f40 100644 --- a/Tests/bootstrap.php +++ b/Bundle/Tests/bootstrap.php @@ -4,7 +4,7 @@ use Symfony\Component\Debug\ErrorHandler; use Symfony\Component\HttpKernel\Kernel; -$loader = require __DIR__.'/../vendor/autoload.php'; +$loader = require __DIR__ . '/../../vendor/autoload.php'; AnnotationRegistry::registerLoader(array($loader, 'loadClass')); if (Kernel::VERSION_ID >= 20600) { diff --git a/Tests/config/config.yml b/Bundle/Tests/config/config.yml similarity index 100% rename from Tests/config/config.yml rename to Bundle/Tests/config/config.yml diff --git a/Tests/config/routing.yml b/Bundle/Tests/config/routing.yml similarity index 100% rename from Tests/config/routing.yml rename to Bundle/Tests/config/routing.yml diff --git a/Twig/Extension/FormFlowExtension.php b/Bundle/Twig/Extension/FormFlowExtension.php similarity index 100% rename from Twig/Extension/FormFlowExtension.php rename to Bundle/Twig/Extension/FormFlowExtension.php diff --git a/Util/FormFlowUtil.php b/Bundle/Util/FormFlowUtil.php similarity index 100% rename from Util/FormFlowUtil.php rename to Bundle/Util/FormFlowUtil.php diff --git a/Component/.gitignore b/Component/.gitignore new file mode 100644 index 00000000..3f9236b3 --- /dev/null +++ b/Component/.gitignore @@ -0,0 +1,6 @@ +/.buildpath +/.project +/.settings +/git-subtree-split.bat +/git.bat +.DS_Store diff --git a/Event/FormFlowEvent.php b/Component/Event/FormFlowEvent.php similarity index 100% rename from Event/FormFlowEvent.php rename to Component/Event/FormFlowEvent.php diff --git a/Event/GetStepsEvent.php b/Component/Event/GetStepsEvent.php similarity index 100% rename from Event/GetStepsEvent.php rename to Component/Event/GetStepsEvent.php diff --git a/Event/PostBindFlowEvent.php b/Component/Event/PostBindFlowEvent.php similarity index 100% rename from Event/PostBindFlowEvent.php rename to Component/Event/PostBindFlowEvent.php diff --git a/Event/PostBindRequestEvent.php b/Component/Event/PostBindRequestEvent.php similarity index 100% rename from Event/PostBindRequestEvent.php rename to Component/Event/PostBindRequestEvent.php diff --git a/Event/PostBindSavedDataEvent.php b/Component/Event/PostBindSavedDataEvent.php similarity index 100% rename from Event/PostBindSavedDataEvent.php rename to Component/Event/PostBindSavedDataEvent.php diff --git a/Event/PostValidateEvent.php b/Component/Event/PostValidateEvent.php similarity index 100% rename from Event/PostValidateEvent.php rename to Component/Event/PostValidateEvent.php diff --git a/Event/PreBindEvent.php b/Component/Event/PreBindEvent.php similarity index 100% rename from Event/PreBindEvent.php rename to Component/Event/PreBindEvent.php diff --git a/Event/PreviousStepInvalidEvent.php b/Component/Event/PreviousStepInvalidEvent.php similarity index 100% rename from Event/PreviousStepInvalidEvent.php rename to Component/Event/PreviousStepInvalidEvent.php diff --git a/EventListener/PreviousStepInvalidEventListener.php b/Component/EventListener/PreviousStepInvalidEventListener.php similarity index 100% rename from EventListener/PreviousStepInvalidEventListener.php rename to Component/EventListener/PreviousStepInvalidEventListener.php diff --git a/Exception/InvalidTypeException.php b/Component/Exception/InvalidTypeException.php similarity index 100% rename from Exception/InvalidTypeException.php rename to Component/Exception/InvalidTypeException.php diff --git a/Form/Extension/FormFlowFormExtension.php b/Component/Form/Extension/FormFlowFormExtension.php similarity index 100% rename from Form/Extension/FormFlowFormExtension.php rename to Component/Form/Extension/FormFlowFormExtension.php diff --git a/Form/Extension/FormFlowHiddenFieldExtension.php b/Component/Form/Extension/FormFlowHiddenFieldExtension.php similarity index 100% rename from Form/Extension/FormFlowHiddenFieldExtension.php rename to Component/Form/Extension/FormFlowHiddenFieldExtension.php diff --git a/Form/FormFlow.php b/Component/Form/FormFlow.php similarity index 100% rename from Form/FormFlow.php rename to Component/Form/FormFlow.php diff --git a/Form/FormFlowEvents.php b/Component/Form/FormFlowEvents.php similarity index 100% rename from Form/FormFlowEvents.php rename to Component/Form/FormFlowEvents.php diff --git a/Form/FormFlowInterface.php b/Component/Form/FormFlowInterface.php similarity index 100% rename from Form/FormFlowInterface.php rename to Component/Form/FormFlowInterface.php diff --git a/Form/Step.php b/Component/Form/Step.php similarity index 100% rename from Form/Step.php rename to Component/Form/Step.php diff --git a/Form/StepInterface.php b/Component/Form/StepInterface.php similarity index 100% rename from Form/StepInterface.php rename to Component/Form/StepInterface.php diff --git a/Component/LICENSE b/Component/LICENSE new file mode 100644 index 00000000..bf54824b --- /dev/null +++ b/Component/LICENSE @@ -0,0 +1,2 @@ +Copyright (c) 2011-2015 Christian Raue +Licensed under the MIT License: http://opensource.org/licenses/mit-license.php diff --git a/Component/README.md b/Component/README.md new file mode 100644 index 00000000..54024579 --- /dev/null +++ b/Component/README.md @@ -0,0 +1 @@ +For further information refer to https://github.com/craue/CraueFormFlowBundle. diff --git a/Storage/DataManager.php b/Component/Storage/DataManager.php similarity index 100% rename from Storage/DataManager.php rename to Component/Storage/DataManager.php diff --git a/Storage/DataManagerInterface.php b/Component/Storage/DataManagerInterface.php similarity index 100% rename from Storage/DataManagerInterface.php rename to Component/Storage/DataManagerInterface.php diff --git a/Storage/ExtendedDataManagerInterface.php b/Component/Storage/ExtendedDataManagerInterface.php similarity index 100% rename from Storage/ExtendedDataManagerInterface.php rename to Component/Storage/ExtendedDataManagerInterface.php diff --git a/Storage/SerializableFile.php b/Component/Storage/SerializableFile.php similarity index 100% rename from Storage/SerializableFile.php rename to Component/Storage/SerializableFile.php diff --git a/Storage/SessionStorage.php b/Component/Storage/SessionStorage.php similarity index 100% rename from Storage/SessionStorage.php rename to Component/Storage/SessionStorage.php diff --git a/Storage/StorageInterface.php b/Component/Storage/StorageInterface.php similarity index 100% rename from Storage/StorageInterface.php rename to Component/Storage/StorageInterface.php diff --git a/Util/StringUtil.php b/Component/Util/StringUtil.php similarity index 100% rename from Util/StringUtil.php rename to Component/Util/StringUtil.php diff --git a/Util/TempFileUtil.php b/Component/Util/TempFileUtil.php similarity index 100% rename from Util/TempFileUtil.php rename to Component/Util/TempFileUtil.php diff --git a/Component/composer.json b/Component/composer.json new file mode 100644 index 00000000..c87ba028 --- /dev/null +++ b/Component/composer.json @@ -0,0 +1,37 @@ +{ + "name": "craue/formflow", + "type": "library", + "description": "Subtree split of the core library of CraueFormFlowBundle for standalone usage.", + "keywords": ["form", "wizard", "step"], + "homepage": "https://github.com/craue/CraueFormFlow", + "license": "MIT", + "authors": [ + { + "name": "Christian Raue", + "email": "christian.raue@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://github.com/craue/CraueFormFlowBundle/contributors" + } + ], + "require": { + "php": ">=5.3.2", + "symfony/form": "~2.3", + "symfony/http-kernel": "~2.3", + "symfony/translation": "~2.3", + "symfony/yaml": "~2.3" + }, + "minimum-stability": "stable", + "prefer-stable": true, + "autoload": { + "psr-4": { + "Craue\\FormFlowBundle\\": "" + } + }, + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + } +} diff --git a/composer.json b/composer.json index 53374ab9..78f88047 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,14 @@ "sensio/framework-extra-bundle": "~2.1|~3.0", "symfony/symfony": "~2.3" }, + "replace": { + "craue/formflow": "self.version" + }, "minimum-stability": "stable", "prefer-stable": true, "autoload": { "psr-4": { - "Craue\\FormFlowBundle\\": "" + "Craue\\FormFlowBundle\\": ["Bundle/", "Component/"] } }, "extra": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 77242cea..4f553034 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" - bootstrap="Tests/bootstrap.php" + bootstrap="Bundle/Tests/bootstrap.php" colors="true"> - Tests + Bundle/Tests . - Tests + Bundle/Tests vendor phpunit.php