From dbd8023885d92da994719a54c035997599c425ca Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Tue, 4 Aug 2020 13:55:59 +0200
Subject: [PATCH] add thirdparty bundle, fix errors, set new path for all
 config yaml files

---
 DependencyInjection/ChillThirdPartyExtension.php    | 13 ++++++++++---
 DependencyInjection/Configuration.php               |  4 ++--
 Resources/config/services.yml                       | 13 -------------
 Resources/config/routing.yml => config/routes.yaml  |  0
 config/services.yaml                                |  1 +
 .../services/3partytype.yaml                        |  0
 .../services/controller.yaml                        |  0
 .../services/form.yml => config/services/form.yaml  |  0
 .../services/menu.yml => config/services/menu.yaml  |  0
 .../search.yml => config/services/search.yaml       |  0
 .../security.yml => config/services/security.yaml   |  0
 .../services/templating.yaml                        |  0
 12 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 Resources/config/services.yml
 rename Resources/config/routing.yml => config/routes.yaml (100%)
 create mode 100644 config/services.yaml
 rename Resources/config/services/3partytype.yml => config/services/3partytype.yaml (100%)
 rename Resources/config/services/controller.yml => config/services/controller.yaml (100%)
 rename Resources/config/services/form.yml => config/services/form.yaml (100%)
 rename Resources/config/services/menu.yml => config/services/menu.yaml (100%)
 rename Resources/config/services/search.yml => config/services/search.yaml (100%)
 rename Resources/config/services/security.yml => config/services/security.yaml (100%)
 rename Resources/config/services/templating.yml => config/services/templating.yaml (100%)

diff --git a/DependencyInjection/ChillThirdPartyExtension.php b/DependencyInjection/ChillThirdPartyExtension.php
index 79eb7c007..28e3c19df 100644
--- a/DependencyInjection/ChillThirdPartyExtension.php
+++ b/DependencyInjection/ChillThirdPartyExtension.php
@@ -24,8 +24,15 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/controller.yaml');
+        $loader->load('services/form.yaml');
+        $loader->load('services/security.yaml');
+        $loader->load('services/3partytype.yaml');
+        $loader->load('services/search.yaml');
+        $loader->load('services/templating.yaml');
+        $loader->load('services/menu.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -40,7 +47,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillThirdPartyBundle/Resources/config/routing.yml'
+                 '@ChillThirdPartyBundle/config/routes.yaml'
               )
            )
         ));
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 99c6c46c4..ad5aac291 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_third_party');
+        $treeBuilder = new TreeBuilder('chill_third_party');
+        $rootNode = $treeBuilder->getRootNode('chill_third_party');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
deleted file mode 100644
index 044500dbd..000000000
--- a/Resources/config/services.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
-    Chill\ThirdPartyBundle\:
-        resource: '../..'
-        exclude: '../../{Entity,Resources/migrations}'
-
-imports:
-    - { resource: './services/controller.yml' }
-    - { resource: './services/form.yml' }
-    - { resource: './services/security.yml' }
-    - { resource: './services/3partytype.yml' }
-    - { resource: './services/search.yml' }
-    - { resource: './services/templating.yml' }
-    - { resource: './services/menu.yml' }
diff --git a/Resources/config/routing.yml b/config/routes.yaml
similarity index 100%
rename from Resources/config/routing.yml
rename to config/routes.yaml
diff --git a/config/services.yaml b/config/services.yaml
new file mode 100644
index 000000000..0baad4766
--- /dev/null
+++ b/config/services.yaml
@@ -0,0 +1 @@
+services:
diff --git a/Resources/config/services/3partytype.yml b/config/services/3partytype.yaml
similarity index 100%
rename from Resources/config/services/3partytype.yml
rename to config/services/3partytype.yaml
diff --git a/Resources/config/services/controller.yml b/config/services/controller.yaml
similarity index 100%
rename from Resources/config/services/controller.yml
rename to config/services/controller.yaml
diff --git a/Resources/config/services/form.yml b/config/services/form.yaml
similarity index 100%
rename from Resources/config/services/form.yml
rename to config/services/form.yaml
diff --git a/Resources/config/services/menu.yml b/config/services/menu.yaml
similarity index 100%
rename from Resources/config/services/menu.yml
rename to config/services/menu.yaml
diff --git a/Resources/config/services/search.yml b/config/services/search.yaml
similarity index 100%
rename from Resources/config/services/search.yml
rename to config/services/search.yaml
diff --git a/Resources/config/services/security.yml b/config/services/security.yaml
similarity index 100%
rename from Resources/config/services/security.yml
rename to config/services/security.yaml
diff --git a/Resources/config/services/templating.yml b/config/services/templating.yaml
similarity index 100%
rename from Resources/config/services/templating.yml
rename to config/services/templating.yaml