require symfony forms, move to yaml extension

dachcom-digital · Aug 30, 2023 · 6e2f599 · 6e2f599
1 parent e4f1f9b
commit 6e2f599
Show file tree

Hide file tree

Showing 85 changed files with 63 additions and 348 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,10 +1,11 @@
 # Upgrade Notes
 
 ## Migrating from Version 4.x to Version 5.0
+- Execute: `bin/console doctrine:migrations:migrate --prefix 'FormBuilderBundle\Migrations'`
 
 ### Global Changes
 - Recommended folder structure by symfony adopted
-- [FUNNEL] Route include changed from `@FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml` to `@FormBuilderBundle/config/pimcore/routing_funnels.yml`
+- [FUNNEL] Route include changed from `@FormBuilderBundle/Resources/config/pimcore/routing_funnels.yml` to `@FormBuilderBundle/config/pimcore/routing_funnels.yaml`
 
 ### New Features
 TBD

diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
     "require": {
         "php": "^8.2",
         "pimcore/pimcore": "^11.0",
+        "symfony/form": "^6.0",
         "doctrine/orm": "^2.7"
     },
     "require-dev": {

diff --git a/config/backend/base_config.yml → config/backend/base_config.yaml b/config/backend/base_config.yml → config/backend/base_config.yaml
diff --git a/config/pimcore/config.yaml b/config/pimcore/config.yaml
@@ -239,7 +239,6 @@ form_builder:
                         type: workflow_select
                         label: 'form_builder_output_workflow_select'
 imports:
-    - { resource: '../backend/base_config.yml' }
-    - { resource: '../types/field_types.yml' }
-    - { resource: '../types/container_types.yml' }
-    - { resource: '../extension/extension.yml' }
+    - { resource: '../backend/base_config.yaml' }
+    - { resource: '../types/field_types.yaml' }
+    - { resource: '../types/container_types.yaml' }
diff --git a/config/pimcore/routing_funnels.yml → config/pimcore/routing_funnels.yaml b/config/pimcore/routing_funnels.yml → config/pimcore/routing_funnels.yaml
diff --git a/...pimcore/routing_funnels_not_localized.yml → ...imcore/routing_funnels_not_localized.yaml b/...pimcore/routing_funnels_not_localized.yml → ...imcore/routing_funnels_not_localized.yaml
diff --git a/config/serialization/File.yml → config/serialization/File.yaml b/config/serialization/File.yml → config/serialization/File.yaml
diff --git a/config/serialization/FileStack.yml → config/serialization/FileStack.yaml b/config/serialization/FileStack.yml → config/serialization/FileStack.yaml
diff --git a/config/serialization/FormStorageData.yml → config/serialization/FormStorageData.yaml b/config/serialization/FormStorageData.yml → config/serialization/FormStorageData.yaml
diff --git a/.../serialization/FunnelActionDefinition.yml → ...serialization/FunnelActionDefinition.yaml b/.../serialization/FunnelActionDefinition.yml → ...serialization/FunnelActionDefinition.yaml
diff --git a/config/serialization/FunnelActionElement.yml → ...ig/serialization/FunnelActionElement.yaml b/config/serialization/FunnelActionElement.yml → ...ig/serialization/FunnelActionElement.yaml
diff --git a/...g/serialization/OutputWorkflowChannel.yml → .../serialization/OutputWorkflowChannel.yaml b/...g/serialization/OutputWorkflowChannel.yml → .../serialization/OutputWorkflowChannel.yaml
diff --git a/...rialization/OutputWorkflowSignalEvent.yml → ...ialization/OutputWorkflowSignalEvent.yaml b/...rialization/OutputWorkflowSignalEvent.yml → ...ialization/OutputWorkflowSignalEvent.yaml
diff --git a/config/services.yaml b/config/services.yaml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: services/conditional_logic/*.yaml }
+    - { resource: services/mail_editor/*.yaml }
+    - { resource: services/output_workflow/*.yaml }
+    - { resource: services/forms/*.yaml }
+    - { resource: services/transformer/*.yaml }
+    - { resource: services/*.yaml }
diff --git a/config/services.yml b/config/services.yml
diff --git a/config/services/assembler.yml → config/services/assembler.yaml b/config/services/assembler.yml → config/services/assembler.yaml
diff --git a/config/services/brick.yml → config/services/brick.yaml b/config/services/brick.yml → config/services/brick.yaml
diff --git a/config/services/builder.yml → config/services/builder.yaml b/config/services/builder.yml → config/services/builder.yaml
diff --git a/config/services/conditional_logic/action.yml → ...ig/services/conditional_logic/action.yaml b/config/services/conditional_logic/action.yml → ...ig/services/conditional_logic/action.yaml
diff --git a/.../services/conditional_logic/condition.yml → ...services/conditional_logic/condition.yaml b/.../services/conditional_logic/condition.yml → ...services/conditional_logic/condition.yaml
diff --git a/config/services/conditional_logic/config.yml → ...ig/services/conditional_logic/config.yaml b/config/services/conditional_logic/config.yml → ...ig/services/conditional_logic/config.yaml
diff --git a/...services/conditional_logic/dispatcher.yml → ...ervices/conditional_logic/dispatcher.yaml b/...services/conditional_logic/dispatcher.yml → ...ervices/conditional_logic/dispatcher.yaml
diff --git a/config/services/controller.yml → config/services/controller.yaml b/config/services/controller.yml → config/services/controller.yaml
diff --git a/config/services/data_injection.yml → config/services/data_injection.yaml b/config/services/data_injection.yml → config/services/data_injection.yaml
diff --git a/config/services/dynamic_choice.yml → config/services/dynamic_choice.yaml b/config/services/dynamic_choice.yml → config/services/dynamic_choice.yaml
diff --git a/config/services/dynamic_multi_file.yml → config/services/dynamic_multi_file.yaml b/config/services/dynamic_multi_file.yml → config/services/dynamic_multi_file.yaml
diff --git a/config/services/event.yml → config/services/event.yaml b/config/services/event.yml → config/services/event.yaml
diff --git a/config/services/event_subscriber.yml → config/services/event_subscriber.yaml b/config/services/event_subscriber.yml → config/services/event_subscriber.yaml
diff --git a/config/services/factory.yml → config/services/factory.yaml b/config/services/factory.yml → config/services/factory.yaml
diff --git a/config/extension/extension.yml → config/services/form_extension.yaml b/config/extension/extension.yml → config/services/form_extension.yaml
diff --git a/config/services/forms/forms.yml → config/services/forms/forms.yaml b/config/services/forms/forms.yml → config/services/forms/forms.yaml
diff --git a/config/services/mail_editor/config.yml → config/services/mail_editor/config.yaml b/config/services/mail_editor/config.yml → config/services/mail_editor/config.yaml
diff --git a/config/services/mail_editor/widgets.yml → config/services/mail_editor/widgets.yaml b/config/services/mail_editor/widgets.yml → config/services/mail_editor/widgets.yaml
diff --git a/config/services/manager.yml → config/services/manager.yaml b/config/services/manager.yml → config/services/manager.yaml
diff --git a/config/services/output_workflow/api.yml → config/services/output_workflow/api.yaml b/config/services/output_workflow/api.yml → config/services/output_workflow/api.yaml
diff --git a/config/services/output_workflow/channels.yml → ...ig/services/output_workflow/channels.yaml b/config/services/output_workflow/channels.yml → ...ig/services/output_workflow/channels.yaml
diff --git a/...tput_workflow/dynamic_object_resolver.yml → ...put_workflow/dynamic_object_resolver.yaml b/...tput_workflow/dynamic_object_resolver.yml → ...put_workflow/dynamic_object_resolver.yaml
diff --git a/config/services/output_workflow/form.yml → config/services/output_workflow/form.yaml b/config/services/output_workflow/form.yml → config/services/output_workflow/form.yaml
diff --git a/...ervices/output_workflow/funnel_layers.yml → ...rvices/output_workflow/funnel_layers.yaml b/...ervices/output_workflow/funnel_layers.yml → ...rvices/output_workflow/funnel_layers.yaml
diff --git a/config/services/output_workflow/services.yml → ...ig/services/output_workflow/services.yaml b/config/services/output_workflow/services.yml → ...ig/services/output_workflow/services.yaml
diff --git a/config/services/repository.yml → config/services/repository.yaml b/config/services/repository.yml → config/services/repository.yaml
diff --git a/config/services/runtime_data.yml → config/services/runtime_data.yaml b/config/services/runtime_data.yml → config/services/runtime_data.yaml
diff --git a/config/services/storage_provider.yml → config/services/storage_provider.yaml b/config/services/storage_provider.yml → config/services/storage_provider.yaml
diff --git a/config/services/stream.yml → config/services/stream.yaml b/config/services/stream.yml → config/services/stream.yaml
diff --git a/config/services/system.yml → config/services/system.yaml b/config/services/system.yml → config/services/system.yaml
diff --git a/...vices/transformer/options_transformer.yml → ...ices/transformer/options_transformer.yaml b/...vices/transformer/options_transformer.yml → ...ices/transformer/options_transformer.yaml
diff --git a/.../transformer/output_input_transformer.yml → ...transformer/output_input_transformer.yaml b/.../transformer/output_input_transformer.yml → ...transformer/output_input_transformer.yaml
diff --git a/config/services/twig.yml → config/services/twig.yaml b/config/services/twig.yml → config/services/twig.yaml
diff --git a/config/services/validator.yml → config/services/validator.yaml b/config/services/validator.yml → config/services/validator.yaml
diff --git a/config/types/container_types.yml → config/types/container_types.yaml b/config/types/container_types.yml → config/types/container_types.yaml
diff --git a/config/types/field_types.yaml b/config/types/field_types.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: type/*.yaml }
diff --git a/config/types/field_types.yml b/config/types/field_types.yml
diff --git a/config/types/type/birthday.yml → config/types/type/birthday.yaml b/config/types/type/birthday.yml → config/types/type/birthday.yaml
diff --git a/config/types/type/checkbox.yml → config/types/type/checkbox.yaml b/config/types/type/checkbox.yml → config/types/type/checkbox.yaml
diff --git a/config/types/type/choice.yml → config/types/type/choice.yaml b/config/types/type/choice.yml → config/types/type/choice.yaml
diff --git a/config/types/type/choice_dynamic.yml → config/types/type/choice_dynamic.yaml b/config/types/type/choice_dynamic.yml → config/types/type/choice_dynamic.yaml
diff --git a/config/types/type/country.yml → config/types/type/country.yaml b/config/types/type/country.yml → config/types/type/country.yaml
diff --git a/config/types/type/date.yml → config/types/type/date.yaml b/config/types/type/date.yml → config/types/type/date.yaml
diff --git a/config/types/type/date_time.yml → config/types/type/date_time.yaml b/config/types/type/date_time.yml → config/types/type/date_time.yaml
diff --git a/config/types/type/dynamic_multi_file.yml → config/types/type/dynamic_multi_file.yaml b/config/types/type/dynamic_multi_file.yml → config/types/type/dynamic_multi_file.yaml
diff --git a/config/types/type/hidden.yml → config/types/type/hidden.yaml b/config/types/type/hidden.yml → config/types/type/hidden.yaml
diff --git a/config/types/type/html_tag.yml → config/types/type/html_tag.yaml b/config/types/type/html_tag.yml → config/types/type/html_tag.yaml
diff --git a/config/types/type/integer.yml → config/types/type/integer.yaml b/config/types/type/integer.yml → config/types/type/integer.yaml
diff --git a/config/types/type/recaptcha_v3.yml → config/types/type/recaptcha_v3.yaml b/config/types/type/recaptcha_v3.yml → config/types/type/recaptcha_v3.yaml
diff --git a/config/types/type/snippet.yml → config/types/type/snippet.yaml b/config/types/type/snippet.yml → config/types/type/snippet.yaml
diff --git a/config/types/type/submit.yml → config/types/type/submit.yaml b/config/types/type/submit.yml → config/types/type/submit.yaml
diff --git a/config/types/type/text.yml → config/types/type/text.yaml b/config/types/type/text.yml → config/types/type/text.yaml
diff --git a/config/types/type/textarea.yml → config/types/type/textarea.yaml b/config/types/type/textarea.yml → config/types/type/textarea.yaml
diff --git a/config/types/type/time.yml → config/types/type/time.yaml b/config/types/type/time.yml → config/types/type/time.yaml
diff --git a/docs/OutputWorkflow/40_Funnels.md b/docs/OutputWorkflow/40_Funnels.md
@@ -52,11 +52,11 @@ Don't freak out, we're talking about one tiny route only:
 ```yaml
 # config/routes.yaml
 form_builder_routing_funnels:
-    resource: '@FormBuilderBundle/config/pimcore/routing_funnels.yml'
+    resource: '@FormBuilderBundle/config/pimcore/routing_funnels.yaml'
 
 # or import routes without the {locale} flag in routes
 # form_builder_routing_funnels:
-#     resource: '@FormBuilderBundle/config/pimcore/routing_funnels_not_localized.yml'
+#     resource: '@FormBuilderBundle/config/pimcore/routing_funnels_not_localized.yaml'
 ```
 
 ## Further Information

diff --git a/src/Controller/Admin/ExportController.php b/src/Controller/Admin/ExportController.php
@@ -69,7 +69,7 @@ public function exportFormAction(Request $request, ImportExportProcessor $import
         }
 
         $response = new Response($data);
-        $exportName = 'form_export_' . $formId . '.yml';
+        $exportName = 'form_export_' . $formId . '.yaml';
 
         $disposition = $response->headers->makeDisposition(
             ResponseHeaderBag::DISPOSITION_ATTACHMENT,

diff --git a/src/DependencyInjection/FormBuilderExtension.php b/src/DependencyInjection/FormBuilderExtension.php
@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
-        $loader->load('services.yml');
+        $loader->load('services.yaml');
 
         $conditionalLogicDefinition = $container->getDefinition(ConditionalLogicRegistry::class);
 

diff --git a/src/Migrations/Version20211011171530.php b/src/Migrations/Version20211011171530.php
diff --git a/src/Migrations/Version20211208110858.php b/src/Migrations/Version20211208110858.php
diff --git a/src/Migrations/Version20221121130120.php b/src/Migrations/Version20221121130120.php
diff --git a/src/Migrations/Version20230303094642.php b/src/Migrations/Version20230303094642.php