From e517c72194311d6bea711df04a94bcef72705ef9 Mon Sep 17 00:00:00 2001 From: Tchama Date: Fri, 31 Jul 2020 14:42:37 +0200 Subject: [PATCH] setting new path for config files --- DependencyInjection/ChillMainExtension.php | 4 ++-- .../test/Fixtures/App/app/config/routing.yml | 2 +- config/routing.yml | 16 ++++++++-------- config/services/controller.yml | 2 +- config/services/fixtures.yml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index af41b2e0a..8fe6907f2 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -100,7 +100,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, array() ); - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config')); $loader->load('services.yml'); $loader->load('services/logger.yml'); $loader->load('services/repositories.yml'); @@ -180,7 +180,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $container->prependExtensionConfig('chill_main', array( 'routing' => array( 'resources' => array( - '@ChillMainBundle/Resources/config/routing.yml' + '@ChillMainBundle/config/routing.yml' ) ) diff --git a/Resources/test/Fixtures/App/app/config/routing.yml b/Resources/test/Fixtures/App/app/config/routing.yml index 2da2876a4..3732d8dc6 100644 --- a/Resources/test/Fixtures/App/app/config/routing.yml +++ b/Resources/test/Fixtures/App/app/config/routing.yml @@ -1,5 +1,5 @@ hello_bundle: - resource: "@ChillMainBundle/Resources/config/routing.yml" + resource: "@ChillMainBundle/config/routing.yml" chill_main_dummy_0: path: /dummy diff --git a/config/routing.yml b/config/routing.yml index 983e5237d..f05f69da6 100644 --- a/config/routing.yml +++ b/config/routing.yml @@ -1,33 +1,33 @@ chill_main_admin_permissionsgroup: - resource: "@ChillMainBundle/Resources/config/routing/permissionsgroup.yml" + resource: "@ChillMainBundle/config/routing/permissionsgroup.yml" prefix: "{_locale}/admin/permissionsgroup" chill_main_admin_user: - resource: "@ChillMainBundle/Resources/config/routing/user.yml" + resource: "@ChillMainBundle/config/routing/user.yml" prefix: "{_locale}/admin/user" chill_main_admin_scope: - resource: "@ChillMainBundle/Resources/config/routing/scope.yml" + resource: "@ChillMainBundle/config/routing/scope.yml" prefix: "{_locale}/admin/scope" chill_main_admin: - resource: "@ChillMainBundle/Resources/config/routing/center.yml" + resource: "@ChillMainBundle/config/routing/center.yml" prefix: "{_locale}/admin/center" chill_main_exports: - resource: "@ChillMainBundle/Resources/config/routing/exports.yml" + resource: "@ChillMainBundle/config/routing/exports.yml" prefix: "{_locale}/exports" chill_postal_code: - resource: "@ChillMainBundle/Resources/config/routing/postal-code.yml" + resource: "@ChillMainBundle/config/routing/postal-code.yml" prefix: "{_locale}/postal-code" chill_password: - resource: "@ChillMainBundle/Resources/config/routing/password.yml" + resource: "@ChillMainBundle/config/routing/password.yml" prefix: "{_locale}/password" chill_password_recover: - resource: "@ChillMainBundle/Resources/config/routing/password_recover.yml" + resource: "@ChillMainBundle/config/routing/password_recover.yml" prefix: "public/{_locale}/password" root: diff --git a/config/services/controller.yml b/config/services/controller.yml index d812117b8..dce74308c 100644 --- a/config/services/controller.yml +++ b/config/services/controller.yml @@ -2,7 +2,7 @@ services: Chill\MainBundle\Controller\: autowire: true - resource: '../../../Controller' + resource: '../../Controller' tags: ['controller.service_arguments'] Chill\MainBundle\Controller\PasswordController: diff --git a/config/services/fixtures.yml b/config/services/fixtures.yml index b3ef847e4..ccae65867 100644 --- a/config/services/fixtures.yml +++ b/config/services/fixtures.yml @@ -1,4 +1,4 @@ services: Chill\MainBundle\DataFixtures\ORM\: - resource: ../../../DataFixtures/ORM + resource: ../../DataFixtures/ORM tags: [ 'doctrine.fixture.orm' ]