Fix core area loading behaviour (#211)

dachcom-digital · Nov 29, 2023 · 79f1bfa · 79f1bfa
1 parent 087e857
commit 79f1bfa
Show file tree

Hide file tree

Showing 43 changed files with 123 additions and 129 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 5.0.2
+- Fix element config load priority to allow config overwrites
+
 ## 5.0.1
 - Fix config load priority to allow config overwrites
 

diff --git a/config/core_areas/accordion.yaml → config/core_areas/accordion_config.yaml b/config/core_areas/accordion.yaml → config/core_areas/accordion_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Accordion\Accordion:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: accordion }
-
 toolbox:
     areas:
         accordion:

diff --git a/config/core_areas/accordion_service.yaml b/config/core_areas/accordion_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Accordion\Accordion:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: accordion }
diff --git a/config/core_areas/anchor.yaml → config/core_areas/anchor_config.yaml b/config/core_areas/anchor.yaml → config/core_areas/anchor_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Anchor\Anchor:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: anchor }
-
 toolbox:
     areas:
         anchor:

diff --git a/config/core_areas/anchor_service.yaml b/config/core_areas/anchor_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Anchor\Anchor:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: anchor }
diff --git a/config/core_areas/columns.yaml → config/core_areas/columns_config.yaml b/config/core_areas/columns.yaml → config/core_areas/columns_config.yaml
@@ -1,10 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Columns\Columns:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        autowire: true
-        tags:
-            - { name: toolbox.area.brick, id: columns }
-
 toolbox:
     areas:
         columns:

diff --git a/config/core_areas/columns_service.yaml b/config/core_areas/columns_service.yaml
@@ -0,0 +1,6 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Columns\Columns:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        autowire: true
+        tags:
+            - { name: toolbox.area.brick, id: columns }
diff --git a/config/core_areas/container.yaml → config/core_areas/container_config.yaml b/config/core_areas/container.yaml → config/core_areas/container_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Container\Container:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: container }
-
 toolbox:
     areas:
         container:

diff --git a/config/core_areas/container_service.yaml b/config/core_areas/container_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Container\Container:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: container }
diff --git a/config/core_areas/content.yaml → config/core_areas/content_config.yaml b/config/core_areas/content.yaml → config/core_areas/content_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Content\Content:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: content }
-
 toolbox:
     areas:
         content:

diff --git a/config/core_areas/content_service.yaml b/config/core_areas/content_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Content\Content:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: content }
diff --git a/config/core_areas/download.yaml → config/core_areas/download_config.yaml b/config/core_areas/download.yaml → config/core_areas/download_config.yaml
@@ -1,10 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Download\Download:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        autowire: true
-        tags:
-            - { name: toolbox.area.brick, id: download }
-
 toolbox:
     areas:
         download:

diff --git a/config/core_areas/download_service.yaml b/config/core_areas/download_service.yaml
@@ -0,0 +1,6 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Download\Download:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        autowire: true
+        tags:
+            - { name: toolbox.area.brick, id: download }
diff --git a/config/core_areas/gallery.yaml → config/core_areas/gallery_config.yaml b/config/core_areas/gallery.yaml → config/core_areas/gallery_config.yaml
@@ -1,10 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Gallery\Gallery:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        autowire: true
-        tags:
-            - { name: toolbox.area.brick, id: gallery }
-
 toolbox:
     areas:
         gallery:

diff --git a/config/core_areas/gallery_service.yaml b/config/core_areas/gallery_service.yaml
@@ -0,0 +1,6 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Gallery\Gallery:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        autowire: true
+        tags:
+            - { name: toolbox.area.brick, id: gallery }
diff --git a/config/core_areas/googleMap.yaml → config/core_areas/googleMap_config.yaml b/config/core_areas/googleMap.yaml → config/core_areas/googleMap_config.yaml
@@ -1,14 +1,3 @@
-parameters:
-    toolbox_google_maps_host_url: 'https://maps.google.ch'
-
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\GoogleMap\GoogleMap:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        arguments:
-            $googleMapsHostUrl: '%toolbox_google_maps_host_url%'
-        tags:
-            - { name: toolbox.area.brick, id: googleMap }
-
 toolbox:
     areas:
         googleMap:

diff --git a/config/core_areas/googleMap_service.yaml b/config/core_areas/googleMap_service.yaml
@@ -0,0 +1,10 @@
+parameters:
+    toolbox_google_maps_host_url: 'https://maps.google.ch'
+
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\GoogleMap\GoogleMap:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        arguments:
+            $googleMapsHostUrl: '%toolbox_google_maps_host_url%'
+        tags:
+            - { name: toolbox.area.brick, id: googleMap }
diff --git a/config/core_areas/headline.yaml → config/core_areas/headline_config.yaml b/config/core_areas/headline.yaml → config/core_areas/headline_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Headline\Headline:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: headline }
-
 toolbox:
     areas:
         headline:

diff --git a/config/core_areas/headline_service.yaml b/config/core_areas/headline_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Headline\Headline:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: headline }
diff --git a/config/core_areas/iFrame.yaml → config/core_areas/iFrame_config.yaml b/config/core_areas/iFrame.yaml → config/core_areas/iFrame_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\IFrame\IFrame:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: iFrame }
-
 toolbox:
     areas:
         iFrame:

diff --git a/config/core_areas/iFrame_service.yaml b/config/core_areas/iFrame_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\IFrame\IFrame:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: iFrame }
diff --git a/config/core_areas/image.yaml → config/core_areas/image_config.yaml b/config/core_areas/image.yaml → config/core_areas/image_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Image\Image:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: image }
-
 toolbox:
     areas:
         image:

diff --git a/config/core_areas/image_service.yaml b/config/core_areas/image_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Image\Image:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: image }
diff --git a/config/core_areas/linkList.yaml → config/core_areas/linkList_config.yaml b/config/core_areas/linkList.yaml → config/core_areas/linkList_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\LinkList\LinkList:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: linkList }
-
 toolbox:
     areas:
         linkList:

diff --git a/config/core_areas/linkList_service.yaml b/config/core_areas/linkList_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\LinkList\LinkList:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: linkList }
diff --git a/.../core_areas/parallaxContainerSection.yaml → ...reas/parallaxContainerSection_config.yaml b/.../core_areas/parallaxContainerSection.yaml → ...reas/parallaxContainerSection_config.yaml
diff --git a/config/core_areas/parallaxContainerSection_service.yaml b/config/core_areas/parallaxContainerSection_service.yaml
diff --git a/config/core_areas/parallaxContainer.yaml → .../core_areas/parallaxContainer_config.yaml b/config/core_areas/parallaxContainer.yaml → .../core_areas/parallaxContainer_config.yaml
@@ -1,12 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\ParallaxContainer\ParallaxContainer:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        arguments:
-            - '@translator'
-            - '@pimcore.templating.engine.delegating'
-        tags:
-            - { name: toolbox.area.brick, id: parallaxContainer }
-
 toolbox:
     areas:
         parallaxContainer:

diff --git a/config/core_areas/parallaxContainer_service.yaml b/config/core_areas/parallaxContainer_service.yaml
@@ -0,0 +1,8 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\ParallaxContainer\ParallaxContainer:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        arguments:
+            - '@translator'
+            - '@pimcore.templating.engine.delegating'
+        tags:
+            - { name: toolbox.area.brick, id: parallaxContainer }
diff --git a/config/core_areas/separator.yaml → config/core_areas/separator_config.yaml b/config/core_areas/separator.yaml → config/core_areas/separator_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Separator\Separator:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: separator }
-
 toolbox:
     areas:
         separator:

diff --git a/config/core_areas/separator_service.yaml b/config/core_areas/separator_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Separator\Separator:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: separator }
diff --git a/config/core_areas/slideColumns.yaml → config/core_areas/slideColumns_config.yaml b/config/core_areas/slideColumns.yaml → config/core_areas/slideColumns_config.yaml
@@ -1,10 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\SlideColumns\SlideColumns:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        autowire: true
-        tags:
-            - { name: toolbox.area.brick, id: slideColumns }
-
 toolbox:
     areas:
         slideColumns:

diff --git a/config/core_areas/slideColumns_service.yaml b/config/core_areas/slideColumns_service.yaml
@@ -0,0 +1,6 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\SlideColumns\SlideColumns:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        autowire: true
+        tags:
+            - { name: toolbox.area.brick, id: slideColumns }
diff --git a/config/core_areas/snippet_config.yaml b/config/core_areas/snippet_config.yaml
@@ -0,0 +1,6 @@
+toolbox:
+    areas:
+        snippet:
+            inline_config_elements:
+                snippet:
+                    type: snippet
diff --git a/config/core_areas/snippet.yaml → config/core_areas/snippet_service.yaml b/config/core_areas/snippet.yaml → config/core_areas/snippet_service.yaml
@@ -3,10 +3,3 @@ services:
         parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
         tags:
             - { name: toolbox.area.brick, id: snippet }
-
-toolbox:
-    areas:
-        snippet:
-            inline_config_elements:
-                snippet:
-                    type: snippet
diff --git a/config/core_areas/spacer.yaml → config/core_areas/spacer_config.yaml b/config/core_areas/spacer.yaml → config/core_areas/spacer_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Spacer\Spacer:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: spacer }
-
 toolbox:
     areas:
         spacer:

diff --git a/config/core_areas/spacer_service.yaml b/config/core_areas/spacer_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Spacer\Spacer:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: spacer }
diff --git a/config/core_areas/teaser.yaml → config/core_areas/teaser_config.yaml b/config/core_areas/teaser.yaml → config/core_areas/teaser_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Teaser\Teaser:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: teaser }
-
 toolbox:
     areas:
         teaser:

diff --git a/config/core_areas/teaser_service.yaml b/config/core_areas/teaser_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Teaser\Teaser:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: teaser }
diff --git a/config/core_areas/video.yaml → config/core_areas/video_config.yaml b/config/core_areas/video.yaml → config/core_areas/video_config.yaml
@@ -1,9 +1,3 @@
-services:
-    ToolboxBundle\Document\ToolboxAreabrick\Video\Video:
-        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
-        tags:
-            - { name: toolbox.area.brick, id: video }
-
 toolbox:
     areas:
         video:

diff --git a/config/core_areas/video_service.yaml b/config/core_areas/video_service.yaml
@@ -0,0 +1,5 @@
+services:
+    ToolboxBundle\Document\ToolboxAreabrick\Video\Video:
+        parent: ToolboxBundle\Document\Areabrick\AbstractAreabrick
+        tags:
+            - { name: toolbox.area.brick, id: video }
diff --git a/src/Command/AreaConfigurationCommand.php b/src/Command/AreaConfigurationCommand.php
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $configElements = $brickConfig['config_elements'];
-        $configParameter = $brickConfig['config_parameter'];
+        $configParameter = $brickConfig['config_parameter'] ?? [];
 
         if (empty($configElements)) {
             $output->writeln('');

diff --git a/src/DependencyInjection/ToolboxExtension.php b/src/DependencyInjection/ToolboxExtension.php
@@ -7,6 +7,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Yaml\Yaml;
 use ToolboxBundle\Manager\ConfigManager;
 use ToolboxBundle\Manager\LayoutManagerInterface;
 use ToolboxBundle\Resolver\ContextResolver;
@@ -44,7 +45,16 @@ public function prepend(ContainerBuilder $container): void
                     continue;
                 }
 
-                $coreLoader->load(sprintf('core_areas/%s.yaml', $areaName));
+                $coreLoader->load(sprintf('core_areas/%s_service.yaml', $areaName));
+
+                // @see https://github.com/symfony/symfony/issues/52789
+                $data = $coreLoader->getLocator()->locate(sprintf('core_areas/%s_config.yaml', $areaName));
+                $parsedData = Yaml::parseFile($data);
+
+                if (array_key_exists('toolbox', $parsedData)) {
+                    $container->prependExtensionConfig('toolbox', $parsedData['toolbox']);
+                }
+
                 $loaded[] = $areaName;
             }
         }