From 3fa697269547cc529718702b08abfcfeaadcff73 Mon Sep 17 00:00:00 2001 From: Nathan Boiron Date: Tue, 23 Dec 2025 11:37:43 +0100 Subject: [PATCH] Refactor du dossier de config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On se rapproche de la structure par défaut d'une app Symfony. --- app/config/config.yml | 4 --- app/config/packages/dev/framework.yaml | 5 ++++ .../dev/monolog.yaml} | 20 ------------- app/config/packages/dev/web_profiler.yaml | 3 ++ app/config/packages/framework.yaml | 1 - .../prod/monolog.yaml} | 9 ------ app/config/packages/test/ewz_recaptcha.yaml | 2 ++ app/config/packages/test/framework.yaml | 4 +++ app/config/packages/test/monolog.yaml | 11 ++++++++ app/config/packages/test/web_profiler.yaml | 3 ++ app/config/{routing.yml => routes.yaml} | 0 app/config/routes/framework.yaml | 12 ++++++++ app/config/routing_dev.yml | 14 ---------- app/config/{services.yml => services.yaml} | 3 ++ app/config/services_dev.yaml | 2 ++ .../{config_test.yml => services_test.yaml} | 28 ------------------- sources/AppBundle/AppKernel.php | 6 ---- 17 files changed, 45 insertions(+), 82 deletions(-) delete mode 100644 app/config/config.yml create mode 100644 app/config/packages/dev/framework.yaml rename app/config/{config_dev.yml => packages/dev/monolog.yaml} (56%) create mode 100644 app/config/packages/dev/web_profiler.yaml rename app/config/{config_prod.yml => packages/prod/monolog.yaml} (72%) create mode 100644 app/config/packages/test/ewz_recaptcha.yaml create mode 100644 app/config/packages/test/framework.yaml create mode 100644 app/config/packages/test/monolog.yaml create mode 100644 app/config/packages/test/web_profiler.yaml rename app/config/{routing.yml => routes.yaml} (100%) create mode 100644 app/config/routes/framework.yaml delete mode 100644 app/config/routing_dev.yml rename app/config/{services.yml => services.yaml} (99%) create mode 100644 app/config/services_dev.yaml rename app/config/{config_test.yml => services_test.yaml} (61%) diff --git a/app/config/config.yml b/app/config/config.yml deleted file mode 100644 index fcf8c9ff5..000000000 --- a/app/config/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -imports: - - { resource: config.php } - - { resource: services.yml } - - { resource: packages/*.yaml } diff --git a/app/config/packages/dev/framework.yaml b/app/config/packages/dev/framework.yaml new file mode 100644 index 000000000..5355b373d --- /dev/null +++ b/app/config/packages/dev/framework.yaml @@ -0,0 +1,5 @@ +framework: + router: + strict_requirements: true + profiler: { only_exceptions: false } + ide: '%env(default::resolve:SYMFONY_IDE)%' diff --git a/app/config/config_dev.yml b/app/config/packages/dev/monolog.yaml similarity index 56% rename from app/config/config_dev.yml rename to app/config/packages/dev/monolog.yaml index e68908a2a..ff59e8473 100644 --- a/app/config/config_dev.yml +++ b/app/config/packages/dev/monolog.yaml @@ -1,17 +1,3 @@ -imports: - - { resource: config.yml } - -framework: - router: - resource: "%kernel.project_dir%/config/routing_dev.yml" - strict_requirements: true - profiler: { only_exceptions: false } - ide: '%env(default::resolve:SYMFONY_IDE)%' - -web_profiler: - toolbar: true - intercept_redirects: false - monolog: handlers: main: @@ -30,9 +16,3 @@ monolog: #chromephp: # type: chromephp # level: info - -parameters: - paybox_ips: [127.0.0.1, 192.168.42.1] - -#swiftmailer: -# delivery_address: me@example.com diff --git a/app/config/packages/dev/web_profiler.yaml b/app/config/packages/dev/web_profiler.yaml new file mode 100644 index 000000000..1f1cb2bb4 --- /dev/null +++ b/app/config/packages/dev/web_profiler.yaml @@ -0,0 +1,3 @@ +web_profiler: + toolbar: true + intercept_redirects: false diff --git a/app/config/packages/framework.yaml b/app/config/packages/framework.yaml index e47d0b9b7..8718acdf4 100644 --- a/app/config/packages/framework.yaml +++ b/app/config/packages/framework.yaml @@ -6,7 +6,6 @@ framework: default_path: "%kernel.project_dir%/../translations" secret: "%secret%" router: - resource: "%kernel.project_dir%/config/routing.yml" strict_requirements: ~ utf8: true form: ~ diff --git a/app/config/config_prod.yml b/app/config/packages/prod/monolog.yaml similarity index 72% rename from app/config/config_prod.yml rename to app/config/packages/prod/monolog.yaml index f9e8f2a04..0ca47e310 100644 --- a/app/config/config_prod.yml +++ b/app/config/packages/prod/monolog.yaml @@ -1,12 +1,3 @@ -imports: - - { resource: config.yml } - -#doctrine: -# orm: -# metadata_cache_driver: apc -# result_cache_driver: apc -# query_cache_driver: apc - monolog: handlers: main: diff --git a/app/config/packages/test/ewz_recaptcha.yaml b/app/config/packages/test/ewz_recaptcha.yaml new file mode 100644 index 000000000..c734fda50 --- /dev/null +++ b/app/config/packages/test/ewz_recaptcha.yaml @@ -0,0 +1,2 @@ +ewz_recaptcha: + enabled: false diff --git a/app/config/packages/test/framework.yaml b/app/config/packages/test/framework.yaml new file mode 100644 index 000000000..1e136c6d1 --- /dev/null +++ b/app/config/packages/test/framework.yaml @@ -0,0 +1,4 @@ +framework: + test: ~ + profiler: + collect: false diff --git a/app/config/packages/test/monolog.yaml b/app/config/packages/test/monolog.yaml new file mode 100644 index 000000000..c00bc1c67 --- /dev/null +++ b/app/config/packages/test/monolog.yaml @@ -0,0 +1,11 @@ +monolog: + handlers: + deprecation_stream: + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log" + + deprecation_filter: + type: filter + handler: deprecation_stream + max_level: info + channels: ["php"] diff --git a/app/config/packages/test/web_profiler.yaml b/app/config/packages/test/web_profiler.yaml new file mode 100644 index 000000000..85319b4a4 --- /dev/null +++ b/app/config/packages/test/web_profiler.yaml @@ -0,0 +1,3 @@ +web_profiler: + toolbar: false + intercept_redirects: false diff --git a/app/config/routing.yml b/app/config/routes.yaml similarity index 100% rename from app/config/routing.yml rename to app/config/routes.yaml diff --git a/app/config/routes/framework.yaml b/app/config/routes/framework.yaml new file mode 100644 index 000000000..37b296613 --- /dev/null +++ b/app/config/routes/framework.yaml @@ -0,0 +1,12 @@ +when@dev: + _wdt: + resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + prefix: /_wdt + + _profiler: + resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + prefix: /_profiler + + _errors: + resource: "@FrameworkBundle/Resources/config/routing/errors.xml" + prefix: /_error diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml deleted file mode 100644 index 72a14c650..000000000 --- a/app/config/routing_dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -_wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" - prefix: /_wdt - -_profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" - prefix: /_profiler - -_errors: - resource: "@FrameworkBundle/Resources/config/routing/errors.xml" - prefix: /_error - -_main: - resource: routing.yml diff --git a/app/config/services.yml b/app/config/services.yaml similarity index 99% rename from app/config/services.yml rename to app/config/services.yaml index b102700f9..63f528edd 100644 --- a/app/config/services.yml +++ b/app/config/services.yaml @@ -1,3 +1,6 @@ +imports: + - { resource: config.php } + # Learn more about services, parameters and containers at # http://symfony.com/doc/current/book/service_container.html parameters: diff --git a/app/config/services_dev.yaml b/app/config/services_dev.yaml new file mode 100644 index 000000000..3d9ecbad1 --- /dev/null +++ b/app/config/services_dev.yaml @@ -0,0 +1,2 @@ +parameters: + paybox_ips: [127.0.0.1, 192.168.42.1] diff --git a/app/config/config_test.yml b/app/config/services_test.yaml similarity index 61% rename from app/config/config_test.yml rename to app/config/services_test.yaml index 80dd0f7e7..a976d5447 100644 --- a/app/config/config_test.yml +++ b/app/config/services_test.yaml @@ -1,15 +1,3 @@ -imports: - - { resource: config_dev.yml } - -framework: - test: ~ - profiler: - collect: false - -web_profiler: - toolbar: false - intercept_redirects: false - parameters: database_host: dbtest database_port: 3306 @@ -38,19 +26,3 @@ services: PlanetePHP\SymfonyFeedClient: arguments: $httpClient: '@planetephp.http_client' - -ewz_recaptcha: - enabled: false - - -monolog: - handlers: - deprecation_stream: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log" - - deprecation_filter: - type: filter - handler: deprecation_stream - max_level: info - channels: ["php"] diff --git a/sources/AppBundle/AppKernel.php b/sources/AppBundle/AppKernel.php index af5ef910c..e17f99846 100644 --- a/sources/AppBundle/AppKernel.php +++ b/sources/AppBundle/AppKernel.php @@ -7,7 +7,6 @@ use AppBundle\DependencyInjection\ControllersWithEventSelectorPass; use AppBundle\DependencyInjection\TingRepositoryPass; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel; @@ -30,11 +29,6 @@ public function getLogDir(): string return __DIR__ . '/../../var/logs'; } - public function registerContainerConfiguration(LoaderInterface $loader): void - { - $loader->load(__DIR__ . '/../../app/config/config_' . $this->getEnvironment() . '.yml'); - } - protected function build(ContainerBuilder $container): void { $container->addCompilerPass(new TingRepositoryPass());