From 79f1bfac75c56c4c7716f8a9fe2baa73c0679267 Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Wed, 29 Nov 2023 14:19:52 +0100 Subject: [PATCH] Fix core area loading behaviour (#211) --- UPGRADE.md | 3 +++ .../{accordion.yaml => accordion_config.yaml} | 6 ------ config/core_areas/accordion_service.yaml | 5 +++++ .../core_areas/{anchor.yaml => anchor_config.yaml} | 6 ------ config/core_areas/anchor_service.yaml | 5 +++++ .../core_areas/{columns.yaml => columns_config.yaml} | 7 ------- config/core_areas/columns_service.yaml | 6 ++++++ .../{container.yaml => container_config.yaml} | 6 ------ config/core_areas/container_service.yaml | 5 +++++ .../core_areas/{content.yaml => content_config.yaml} | 6 ------ config/core_areas/content_service.yaml | 5 +++++ .../{download.yaml => download_config.yaml} | 7 ------- config/core_areas/download_service.yaml | 6 ++++++ .../core_areas/{gallery.yaml => gallery_config.yaml} | 7 ------- config/core_areas/gallery_service.yaml | 6 ++++++ .../{googleMap.yaml => googleMap_config.yaml} | 11 ----------- config/core_areas/googleMap_service.yaml | 10 ++++++++++ .../{headline.yaml => headline_config.yaml} | 6 ------ config/core_areas/headline_service.yaml | 5 +++++ .../core_areas/{iFrame.yaml => iFrame_config.yaml} | 6 ------ config/core_areas/iFrame_service.yaml | 5 +++++ config/core_areas/{image.yaml => image_config.yaml} | 6 ------ config/core_areas/image_service.yaml | 5 +++++ .../{linkList.yaml => linkList_config.yaml} | 6 ------ config/core_areas/linkList_service.yaml | 5 +++++ ...ion.yaml => parallaxContainerSection_config.yaml} | 0 .../core_areas/parallaxContainerSection_service.yaml | 0 ...xContainer.yaml => parallaxContainer_config.yaml} | 9 --------- config/core_areas/parallaxContainer_service.yaml | 8 ++++++++ .../{separator.yaml => separator_config.yaml} | 6 ------ config/core_areas/separator_service.yaml | 5 +++++ .../{slideColumns.yaml => slideColumns_config.yaml} | 7 ------- config/core_areas/slideColumns_service.yaml | 6 ++++++ config/core_areas/snippet_config.yaml | 6 ++++++ .../{snippet.yaml => snippet_service.yaml} | 7 ------- .../core_areas/{spacer.yaml => spacer_config.yaml} | 6 ------ config/core_areas/spacer_service.yaml | 5 +++++ .../core_areas/{teaser.yaml => teaser_config.yaml} | 6 ------ config/core_areas/teaser_service.yaml | 5 +++++ config/core_areas/{video.yaml => video_config.yaml} | 6 ------ config/core_areas/video_service.yaml | 5 +++++ src/Command/AreaConfigurationCommand.php | 2 +- src/DependencyInjection/ToolboxExtension.php | 12 +++++++++++- 43 files changed, 123 insertions(+), 129 deletions(-) rename config/core_areas/{accordion.yaml => accordion_config.yaml} (89%) create mode 100644 config/core_areas/accordion_service.yaml rename config/core_areas/{anchor.yaml => anchor_config.yaml} (56%) create mode 100644 config/core_areas/anchor_service.yaml rename config/core_areas/{columns.yaml => columns_config.yaml} (83%) create mode 100644 config/core_areas/columns_service.yaml rename config/core_areas/{container.yaml => container_config.yaml} (73%) create mode 100644 config/core_areas/container_service.yaml rename config/core_areas/{content.yaml => content_config.yaml} (52%) create mode 100644 config/core_areas/content_service.yaml rename config/core_areas/{download.yaml => download_config.yaml} (78%) create mode 100644 config/core_areas/download_service.yaml rename config/core_areas/{gallery.yaml => gallery_config.yaml} (76%) create mode 100644 config/core_areas/gallery_service.yaml rename config/core_areas/{googleMap.yaml => googleMap_config.yaml} (79%) create mode 100644 config/core_areas/googleMap_service.yaml rename config/core_areas/{headline.yaml => headline_config.yaml} (82%) create mode 100644 config/core_areas/headline_service.yaml rename config/core_areas/{iFrame.yaml => iFrame_config.yaml} (64%) create mode 100644 config/core_areas/iFrame_service.yaml rename config/core_areas/{image.yaml => image_config.yaml} (80%) create mode 100644 config/core_areas/image_service.yaml rename config/core_areas/{linkList.yaml => linkList_config.yaml} (68%) create mode 100644 config/core_areas/linkList_service.yaml rename config/core_areas/{parallaxContainerSection.yaml => parallaxContainerSection_config.yaml} (100%) create mode 100644 config/core_areas/parallaxContainerSection_service.yaml rename config/core_areas/{parallaxContainer.yaml => parallaxContainer_config.yaml} (90%) create mode 100644 config/core_areas/parallaxContainer_service.yaml rename config/core_areas/{separator.yaml => separator_config.yaml} (74%) create mode 100644 config/core_areas/separator_service.yaml rename config/core_areas/{slideColumns.yaml => slideColumns_config.yaml} (83%) create mode 100644 config/core_areas/slideColumns_service.yaml create mode 100644 config/core_areas/snippet_config.yaml rename config/core_areas/{snippet.yaml => snippet_service.yaml} (61%) rename config/core_areas/{spacer.yaml => spacer_config.yaml} (66%) create mode 100644 config/core_areas/spacer_service.yaml rename config/core_areas/{teaser.yaml => teaser_config.yaml} (86%) create mode 100644 config/core_areas/teaser_service.yaml rename config/core_areas/{video.yaml => video_config.yaml} (84%) create mode 100644 config/core_areas/video_service.yaml diff --git a/UPGRADE.md b/UPGRADE.md index 9a130ec1..51fe0cf8 100644 --- 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 b/config/core_areas/accordion_config.yaml similarity index 89% rename from config/core_areas/accordion.yaml rename to config/core_areas/accordion_config.yaml index 2d1511e3..aaa1e41b 100644 --- a/config/core_areas/accordion.yaml +++ b/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 new file mode 100644 index 00000000..71c451c3 --- /dev/null +++ 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 b/config/core_areas/anchor_config.yaml similarity index 56% rename from config/core_areas/anchor.yaml rename to config/core_areas/anchor_config.yaml index 1a3b815f..74432758 100644 --- a/config/core_areas/anchor.yaml +++ b/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 new file mode 100644 index 00000000..137d9445 --- /dev/null +++ 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 } \ No newline at end of file diff --git a/config/core_areas/columns.yaml b/config/core_areas/columns_config.yaml similarity index 83% rename from config/core_areas/columns.yaml rename to config/core_areas/columns_config.yaml index 0f0a91b6..d81946c5 100644 --- a/config/core_areas/columns.yaml +++ b/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 new file mode 100644 index 00000000..f7aa0723 --- /dev/null +++ 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 } \ No newline at end of file diff --git a/config/core_areas/container.yaml b/config/core_areas/container_config.yaml similarity index 73% rename from config/core_areas/container.yaml rename to config/core_areas/container_config.yaml index e20a5331..09224640 100644 --- a/config/core_areas/container.yaml +++ b/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 new file mode 100644 index 00000000..3fb5022d --- /dev/null +++ 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 } \ No newline at end of file diff --git a/config/core_areas/content.yaml b/config/core_areas/content_config.yaml similarity index 52% rename from config/core_areas/content.yaml rename to config/core_areas/content_config.yaml index 437c329a..1929578a 100644 --- a/config/core_areas/content.yaml +++ b/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 new file mode 100644 index 00000000..178c85bf --- /dev/null +++ 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 } \ No newline at end of file diff --git a/config/core_areas/download.yaml b/config/core_areas/download_config.yaml similarity index 78% rename from config/core_areas/download.yaml rename to config/core_areas/download_config.yaml index dc5aa3a6..67998a0a 100644 --- a/config/core_areas/download.yaml +++ b/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 new file mode 100644 index 00000000..277b1d21 --- /dev/null +++ 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 b/config/core_areas/gallery_config.yaml similarity index 76% rename from config/core_areas/gallery.yaml rename to config/core_areas/gallery_config.yaml index b2d4bfbb..9aaed836 100644 --- a/config/core_areas/gallery.yaml +++ b/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 new file mode 100644 index 00000000..2e2b6254 --- /dev/null +++ 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 b/config/core_areas/googleMap_config.yaml similarity index 79% rename from config/core_areas/googleMap.yaml rename to config/core_areas/googleMap_config.yaml index cb9a8c2c..f2ce951d 100644 --- a/config/core_areas/googleMap.yaml +++ b/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 new file mode 100644 index 00000000..d1aa5288 --- /dev/null +++ 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 b/config/core_areas/headline_config.yaml similarity index 82% rename from config/core_areas/headline.yaml rename to config/core_areas/headline_config.yaml index 9c64e89e..c7e7b515 100644 --- a/config/core_areas/headline.yaml +++ b/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 new file mode 100644 index 00000000..8e8839bc --- /dev/null +++ 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 b/config/core_areas/iFrame_config.yaml similarity index 64% rename from config/core_areas/iFrame.yaml rename to config/core_areas/iFrame_config.yaml index 476018f8..d9d2d711 100644 --- a/config/core_areas/iFrame.yaml +++ b/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 new file mode 100644 index 00000000..bf631a59 --- /dev/null +++ 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 b/config/core_areas/image_config.yaml similarity index 80% rename from config/core_areas/image.yaml rename to config/core_areas/image_config.yaml index a58c2dab..2a9fae57 100644 --- a/config/core_areas/image.yaml +++ b/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 new file mode 100644 index 00000000..708714d8 --- /dev/null +++ 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 b/config/core_areas/linkList_config.yaml similarity index 68% rename from config/core_areas/linkList.yaml rename to config/core_areas/linkList_config.yaml index 312471a2..ae9e03cd 100644 --- a/config/core_areas/linkList.yaml +++ b/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 new file mode 100644 index 00000000..38c7ff08 --- /dev/null +++ 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/config/core_areas/parallaxContainerSection.yaml b/config/core_areas/parallaxContainerSection_config.yaml similarity index 100% rename from config/core_areas/parallaxContainerSection.yaml rename to config/core_areas/parallaxContainerSection_config.yaml diff --git a/config/core_areas/parallaxContainerSection_service.yaml b/config/core_areas/parallaxContainerSection_service.yaml new file mode 100644 index 00000000..e69de29b diff --git a/config/core_areas/parallaxContainer.yaml b/config/core_areas/parallaxContainer_config.yaml similarity index 90% rename from config/core_areas/parallaxContainer.yaml rename to config/core_areas/parallaxContainer_config.yaml index 66656362..1d41eee7 100644 --- a/config/core_areas/parallaxContainer.yaml +++ b/config/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 new file mode 100644 index 00000000..ae02a01b --- /dev/null +++ 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 b/config/core_areas/separator_config.yaml similarity index 74% rename from config/core_areas/separator.yaml rename to config/core_areas/separator_config.yaml index 18bf6ca6..5b943cef 100644 --- a/config/core_areas/separator.yaml +++ b/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 new file mode 100644 index 00000000..cfee06c0 --- /dev/null +++ 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 b/config/core_areas/slideColumns_config.yaml similarity index 83% rename from config/core_areas/slideColumns.yaml rename to config/core_areas/slideColumns_config.yaml index fb8505a2..57828ad9 100644 --- a/config/core_areas/slideColumns.yaml +++ b/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 new file mode 100644 index 00000000..d2732802 --- /dev/null +++ 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 new file mode 100644 index 00000000..07168563 --- /dev/null +++ b/config/core_areas/snippet_config.yaml @@ -0,0 +1,6 @@ +toolbox: + areas: + snippet: + inline_config_elements: + snippet: + type: snippet \ No newline at end of file diff --git a/config/core_areas/snippet.yaml b/config/core_areas/snippet_service.yaml similarity index 61% rename from config/core_areas/snippet.yaml rename to config/core_areas/snippet_service.yaml index abc579cf..64d33727 100644 --- a/config/core_areas/snippet.yaml +++ b/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 \ No newline at end of file diff --git a/config/core_areas/spacer.yaml b/config/core_areas/spacer_config.yaml similarity index 66% rename from config/core_areas/spacer.yaml rename to config/core_areas/spacer_config.yaml index 9dfbd1b9..840a8215 100644 --- a/config/core_areas/spacer.yaml +++ b/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 new file mode 100644 index 00000000..8db1bd7a --- /dev/null +++ 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 b/config/core_areas/teaser_config.yaml similarity index 86% rename from config/core_areas/teaser.yaml rename to config/core_areas/teaser_config.yaml index 2891bb94..abda8fc8 100644 --- a/config/core_areas/teaser.yaml +++ b/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 new file mode 100644 index 00000000..04e77f09 --- /dev/null +++ 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 b/config/core_areas/video_config.yaml similarity index 84% rename from config/core_areas/video.yaml rename to config/core_areas/video_config.yaml index 5c4c0066..7e4c4b2b 100644 --- a/config/core_areas/video.yaml +++ b/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 new file mode 100644 index 00000000..2555e639 --- /dev/null +++ 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 index ea65545e..f7f229c8 100644 --- 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 index f2259c7a..37aedc3f 100644 --- 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; } }