From 3c37924dc18a931461e6158c69288d044e5534c9 Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Mon, 3 Aug 2020 13:18:58 +0200
Subject: [PATCH] sf4, setting new path for all config yaml files, and replace
 'controller' path syntax in routes definitions

---
 DependencyInjection/ChillCustomFieldsExtension.php        | 8 ++++----
 Resources/config/routing.yml                              | 7 -------
 config/routes.yaml                                        | 7 +++++++
 .../customfield.yml => config/routes/customfield.yaml     | 0
 .../routes/customfieldsgroup.yaml                         | 0
 Resources/config/services.yml => config/services.yaml     | 0
 .../fixtures.yml => config/services/fixtures.yaml         | 2 +-
 Resources/config/validation.yml => config/validation.yaml | 0
 8 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 Resources/config/routing.yml
 create mode 100644 config/routes.yaml
 rename Resources/config/routing/customfield.yml => config/routes/customfield.yaml (100%)
 rename Resources/config/routing/customfieldsgroup.yml => config/routes/customfieldsgroup.yaml (100%)
 rename Resources/config/services.yml => config/services.yaml (100%)
 rename Resources/config/services/fixtures.yml => config/services/fixtures.yaml (69%)
 rename Resources/config/validation.yml => config/validation.yaml (100%)

diff --git a/DependencyInjection/ChillCustomFieldsExtension.php b/DependencyInjection/ChillCustomFieldsExtension.php
index 86f2261c1..4d4a26db7 100644
--- a/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/DependencyInjection/ChillCustomFieldsExtension.php
@@ -23,9 +23,9 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-        $loader->load('services/fixtures.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/fixtures.yaml');
         
         //add at least a blank array at 'customizable_entities' options
         //$customizable_entities = (isset($config['customizables_entities']) 
@@ -51,7 +51,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillCustomFieldsBundle/Resources/config/routing.yml'
+                 '@ChillCustomFieldsBundle/config/routes.yaml'
               )
            )
         ));
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
deleted file mode 100644
index a6b554e69..000000000
--- a/Resources/config/routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-chill_customfields_customfieldsgroup:
-    resource: "@ChillCustomFieldsBundle/Resources/config/routing/customfieldsgroup.yml"
-    prefix:   /
-
-chill_customfields_customfield:
-    resource: "@ChillCustomFieldsBundle/Resources/config/routing/customfield.yml"
-    prefix:   /
diff --git a/config/routes.yaml b/config/routes.yaml
new file mode 100644
index 000000000..687518af4
--- /dev/null
+++ b/config/routes.yaml
@@ -0,0 +1,7 @@
+chill_customfields_customfieldsgroup:
+    resource: "@ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml"
+    prefix:   /
+
+chill_customfields_customfield:
+    resource: "@ChillCustomFieldsBundle/config/routes/customfield.yaml"
+    prefix:   /
diff --git a/Resources/config/routing/customfield.yml b/config/routes/customfield.yaml
similarity index 100%
rename from Resources/config/routing/customfield.yml
rename to config/routes/customfield.yaml
diff --git a/Resources/config/routing/customfieldsgroup.yml b/config/routes/customfieldsgroup.yaml
similarity index 100%
rename from Resources/config/routing/customfieldsgroup.yml
rename to config/routes/customfieldsgroup.yaml
diff --git a/Resources/config/services.yml b/config/services.yaml
similarity index 100%
rename from Resources/config/services.yml
rename to config/services.yaml
diff --git a/Resources/config/services/fixtures.yml b/config/services/fixtures.yaml
similarity index 69%
rename from Resources/config/services/fixtures.yml
rename to config/services/fixtures.yaml
index 7a28222b7..72af7593b 100644
--- a/Resources/config/services/fixtures.yml
+++ b/config/services/fixtures.yaml
@@ -1,4 +1,4 @@
 services:
     Chill\CustomFieldsBundle\DataFixtures\ORM\:
-        resource: ../../../DataFixtures/ORM
+        resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/Resources/config/validation.yml b/config/validation.yaml
similarity index 100%
rename from Resources/config/validation.yml
rename to config/validation.yaml