From 5c377d29305020bc475ad5f399aa0d0e7def40bb Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Wed, 6 Dec 2023 12:12:12 +0100 Subject: [PATCH 1/2] [Bug]: Fix Static Routes Bundle to follow PIMCORE_CONFIGURATION_DIRECTORY constant (#16331) * Update Configuration.php * apply to custom reports too --- .../src/DependencyInjection/Configuration.php | 2 +- .../src/DependencyInjection/Configuration.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php b/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php index 13995d22ff9..50fb4038305 100644 --- a/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php +++ b/bundles/CustomReportsBundle/src/DependencyInjection/Configuration.php @@ -74,7 +74,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->end() ->end(); - ConfigurationHelper::addConfigLocationWithWriteTargetNodes($rootNode, ['custom_reports' => '/var/config/custom_reports']); + ConfigurationHelper::addConfigLocationWithWriteTargetNodes($rootNode, ['custom_reports' => PIMCORE_CONFIGURATION_DIRECTORY . '/custom_reports']); return $treeBuilder; } diff --git a/bundles/StaticRoutesBundle/src/DependencyInjection/Configuration.php b/bundles/StaticRoutesBundle/src/DependencyInjection/Configuration.php index 991164e847b..358d39d505b 100644 --- a/bundles/StaticRoutesBundle/src/DependencyInjection/Configuration.php +++ b/bundles/StaticRoutesBundle/src/DependencyInjection/Configuration.php @@ -56,7 +56,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->end() ->end(); - ConfigurationHelper::addConfigLocationWithWriteTargetNodes($rootNode, ['staticroutes' => '/var/config/staticroutes']); + ConfigurationHelper::addConfigLocationWithWriteTargetNodes($rootNode, ['staticroutes' => PIMCORE_CONFIGURATION_DIRECTORY . '/staticroutes']); return $treeBuilder; } From 870592a0e4c5769611cb27881f0fb1acd4a68466 Mon Sep 17 00:00:00 2001 From: GeorgII <52407577+GeorgII-web@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:33:44 +0100 Subject: [PATCH 2/2] Update MaintenanceModeHelper.php - spell fix (#16291) Spell fix `maintenace_mode` to `maintenance_mode` --- lib/Tool/MaintenanceModeHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Tool/MaintenanceModeHelper.php b/lib/Tool/MaintenanceModeHelper.php index 24786ef4904..b4c4466efce 100644 --- a/lib/Tool/MaintenanceModeHelper.php +++ b/lib/Tool/MaintenanceModeHelper.php @@ -24,7 +24,7 @@ class MaintenanceModeHelper implements MaintenanceModeHelperInterface { - protected const ENTRY_ID = 'maintenace_mode'; + protected const ENTRY_ID = 'maintenance_mode'; public function __construct(protected RequestStack $requestStack, protected Connection $db) {