improve context config build

dachcom-digital · Jul 25, 2023 · 076cd6b · 076cd6b
1 parent cb6d75e
commit 076cd6b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/src/ToolboxBundle/DependencyInjection/ToolboxExtension.php b/src/ToolboxBundle/DependencyInjection/ToolboxExtension.php
@@ -161,43 +161,51 @@ private function validateToolboxContextConfig(array $config): void
 
     private function parseContextConfigs(array $configs): array
     {
+        $data = [];
         $rootConfigs = [];
+        $contextConfigData = [];
+        $contextMergeCandidates = [];
+
         foreach ($configs as $rootConfig) {
             unset($rootConfig['context'], $rootConfig['context_resolver'], $rootConfig['enabled_core_areas']);
             $rootConfigs[] = $rootConfig;
         }
 
-        $contextMerge = [];
         foreach ($configs as $config) {
-            if (isset($config['context'])) {
-                foreach ($config['context'] as $contextName => $contextConfig) {
-                    if (isset($contextConfig['settings']['merge_with_root'])) {
-                        $contextMerge[$contextName] = $contextConfig['settings']['merge_with_root'];
-                    }
-                }
+
+            if (!isset($config['context'])) {
+                continue;
             }
-        }
 
-        $data = [];
-        $contextConfigData = [];
+            foreach ($config['context'] as $contextName => $contextConfig) {
+                $contextMergeCandidates[$contextName] = $contextConfig['settings']['merge_with_root'] ?? false;
+            }
+        }
 
         //get context data
         foreach ($configs as $config) {
-            if (isset($config['context'])) {
-                foreach ($config['context'] as $contextName => $contextConfig) {
-                    if (!isset($contextMerge[$contextName]) || $contextMerge[$contextName] !== true) {
-                        continue;
-                    }
-
-                    $cleanContextConfig = $contextConfig;
-                    unset($cleanContextConfig['settings']);
-                    $contextConfigData[$contextName][] = $cleanContextConfig;
+
+            if (!isset($config['context'])) {
+                continue;
+            }
+
+            foreach ($config['context'] as $contextName => $contextConfig) {
+
+                if ($contextMergeCandidates[$contextName] === false) {
+                    continue;
                 }
+
+                $cleanContextConfig = $contextConfig;
+
+                unset($cleanContextConfig['settings']);
+
+                $contextConfigData[$contextName][] = $cleanContextConfig;
             }
         }
 
-        //get context merge data
-        foreach ($contextMerge as $contextName => $merge) {
+        // get context merge data
+        foreach ($contextMergeCandidates as $contextName => $merge) {
+
             if ($merge === false) {
                 continue;
             }
@@ -211,12 +219,12 @@ private function parseContextConfigs(array $configs): array
             }
         }
 
-        //append merge data
+        // append merge data
         foreach ($data as $append) {
             $configs[] = $append;
         }
 
-        //append custom context data
+        // append custom context data
         foreach ($contextConfigData as $contextName => $contextConfigs) {
             foreach ($contextConfigs as $el) {
                 $configs[] = [

diff --git a/tests/_etc/config/bundle/config_context.yaml b/tests/_etc/config/bundle/config_context.yaml
@@ -72,6 +72,10 @@ toolbox:
             settings:
                 merge_with_root: false
             theme:
+                layout: 'Bootstrap4'
+                calculators:
+                    column_calculator: ToolboxBundle\Calculator\Bootstrap4\ColumnCalculator
+                    slide_calculator: ToolboxBundle\Calculator\Bootstrap4\SlideColumnCalculator
                 grid:
                     grid_size: 8
                     breakpoints: