From 08618e7f15820a5647f63708b5bbdc463bbdb16e Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 17 Oct 2024 08:22:31 +1100 Subject: [PATCH] [#1419] Moved `services.local.php` inclusion into `settings.local.php`. --- web/sites/default/default.settings.local.php | 4 ++++ web/sites/default/settings.php | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/sites/default/default.settings.local.php b/web/sites/default/default.settings.local.php index 85f6a6474..f0931a2a9 100644 --- a/web/sites/default/default.settings.local.php +++ b/web/sites/default/default.settings.local.php @@ -7,6 +7,10 @@ declare(strict_types=1); +if (file_exists($app_root . '/' . $site_path . '/services.local.yml')) { + $settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.local.yml'; +} + // Show all error messages on the site. $config['system.logging']['error_level'] = 'all'; diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 5799835f3..a9ca2d0ea 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -192,13 +192,11 @@ // // Copy default.settings.local.php and default.services.local.yml to // settings.local.php and services.local.yml respectively. +// services.local.yml is loaded in in settings.local.php. // // Keep this code block at the end of this file to take full effect. // @codeCoverageIgnoreStart if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { require $app_root . '/' . $site_path . '/settings.local.php'; } -if (file_exists($app_root . '/' . $site_path . '/services.local.yml')) { - $settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.local.yml'; -} // @codeCoverageIgnoreEnd