move to new bundle structure

UPGRADE.md

@@ -4,6 +4,7 @@
 
 ### 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`
 
 ### New Features
 TBD

composer.json

@@ -15,7 +15,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "FormBuilderBundle\\": "src/FormBuilderBundle"
+            "FormBuilderBundle\\": "src/"
         }
     },
     "autoload-dev": {

src/FormBuilderBundle/Resources/config/pimcore/config.yaml → config/pimcore/config.yaml

@@ -1,6 +1,6 @@
 doctrine_migrations:
     migrations_paths:
-        'FormBuilderBundle\Migrations': '@FormBuilderBundle/Migrations'
+        'FormBuilderBundle\Migrations': '@FormBuilderBundle/src/Migrations'
 
 doctrine:
     orm:

src/FormBuilderBundle/Resources/config/services/controller.yml → config/services/controller.yml

@@ -1,7 +1,7 @@
 services:
 
     FormBuilderBundle\Controller\:
-        resource: '../../Controller'
+        resource: '../../src/Controller'
         public: true
         autowire: true
         autoconfigure: true

docs/90_FrontendTips.md

@@ -75,7 +75,7 @@ Just use the translation html editor to define some html label:
 If you're using some choice meta attributes, you need to adjust your theme:
 
 ```twig
-{# app/Resources/FormBuilderBundle/views/Form/Theme/bootstrap_4_layout.html.twig #}
+{# templates/bundles/FormBuilderBundle/form/theme/bootstrap_4_layout.html.twig #}
 {% extends "@!FormBuilder/Form/Theme/bootstrap_4_layout.html.twig" %}
 
 {% block widget_attributes -%}

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/Resources/config/pimcore/routing_funnels.yml'
+    resource: '@FormBuilderBundle/config/pimcore/routing_funnels.yml'
 
 # or import routes without the {locale} flag in routes
 # form_builder_routing_funnels:
-#     resource: '@FormBuilderBundle/Resources/config/pimcore/routing_funnels_not_localized.yml'
+#     resource: '@FormBuilderBundle/config/pimcore/routing_funnels_not_localized.yml'
 ```
 
 ## Further Information

docs/OutputWorkflow/Funnel/50_RootForm.md

@@ -9,7 +9,7 @@ If you've extended root forms with some complex form types,
 make sure your serializer data is configured within the right group:
 
 ```yaml
-# Resources/config/serialization/MyEntity.yaml
+# config/serialization/MyEntity.yaml
 App\Entity\MyEntity:
     attributes:
         id:

src/FormBuilderBundle/DependencyInjection/FormBuilderExtension.php → src/DependencyInjection/FormBuilderExtension.php

@@ -37,7 +37,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../Resources/config']));
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
         $loader->load('services.yml');
 
         $conditionalLogicDefinition = $container->getDefinition(ConditionalLogicRegistry::class);