From 4e9cd421ba78e7a40e4cf8a10a37cc84c7c511f2 Mon Sep 17 00:00:00 2001 From: Oleksandr Peresypkin Date: Wed, 22 May 2024 14:37:49 +0200 Subject: [PATCH] Fix generator multi store store specific executor conditions (#496) * Fix conditions where a non-existing structure is examined and therefore it's always true --- .../Executor/StoreSpecific/StoreSpecificBrokerExecutor.php | 2 +- .../StoreSpecific/StoreSpecificKeyValueStoreExecutor.php | 2 +- .../Executor/StoreSpecific/StoreSpecificSessionExecutor.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificBrokerExecutor.php b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificBrokerExecutor.php index 693510182..be5d5382c 100644 --- a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificBrokerExecutor.php +++ b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificBrokerExecutor.php @@ -26,7 +26,7 @@ public function exec(array $projectData): array foreach ($projectData[ProjectDataRegionsConstants::REGIONS_KEY] as $regionName => $regionData) { $regionServices = $regionData[ProjectDataServicesConstants::SERVICES_KEY] ?? []; - if (!isset($services[ProjectDataServicesConstants::BROKER_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { + if (!isset($regionServices[ProjectDataServicesConstants::BROKER_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { continue; } diff --git a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificKeyValueStoreExecutor.php b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificKeyValueStoreExecutor.php index 77e4d428b..630b09ee6 100644 --- a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificKeyValueStoreExecutor.php +++ b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificKeyValueStoreExecutor.php @@ -26,7 +26,7 @@ public function exec(array $projectData): array foreach ($projectData[ProjectDataRegionsConstants::REGIONS_KEY] as $regionName => $regionData) { $regionServices = $regionData[ProjectDataServicesConstants::SERVICES_KEY] ?? []; - if (!isset($services[ProjectDataServicesConstants::KEY_VALUE_STORE_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { + if (!isset($regionServices[ProjectDataServicesConstants::KEY_VALUE_STORE_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { continue; } diff --git a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificSessionExecutor.php b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificSessionExecutor.php index 218e1ea8d..0a32d0dfc 100644 --- a/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificSessionExecutor.php +++ b/generator/project-data/src/DataBuilder/MultiStore/Executor/StoreSpecific/StoreSpecificSessionExecutor.php @@ -26,7 +26,7 @@ public function exec(array $projectData): array foreach ($projectData[ProjectDataRegionsConstants::REGIONS_KEY] as $regionName => $regionData) { $regionServices = $regionData[ProjectDataServicesConstants::SERVICES_KEY] ?? []; - if (!isset($services[ProjectDataServicesConstants::SESSION_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { + if (!isset($regionServices[ProjectDataServicesConstants::SESSION_KEY][ProjectDataServicesConstants::SERVICES_NAMESPACE_KEY])) { continue; }