fix config load priority to allow config overwrites (#210)

dachcom-digital · Oct 23, 2023 · b5c413b · b5c413b
1 parent 4c6e3db
commit b5c413b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 5.0.1
+- Fix config load priority to allow config overwrites
+
 ## Migrating from Version 4.x to Version 5.0.0
 
 ### New Features

diff --git a/config/config.yaml b/config/config.yaml
diff --git a/config/pimcore/config.yaml b/config/pimcore/config.yaml
@@ -1,3 +1,8 @@
+imports:
+    - { resource: ../data_attributes.yaml }
+    - { resource: ../image_thumbnails.yaml }
+    - { resource: ../document_editables.yaml }
+
 doctrine_migrations:
     migrations_paths:
         'ToolboxBundle\Migrations': '@ToolboxBundle/src/Migrations'
diff --git a/src/DependencyInjection/ToolboxExtension.php b/src/DependencyInjection/ToolboxExtension.php
@@ -24,7 +24,6 @@ public function prepend(ContainerBuilder $container): void
         }
 
         $coreLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
-        $coreLoader->load('config.yaml');
 
         $loaded = [];
 
@@ -186,7 +185,7 @@ private function parseContextConfigs(array $configs): array
             }
         }
 
-        //get context data
+        // get context data
         foreach ($configs as $config) {
 
             if (!isset($config['context'])) {

diff --git a/tests/FunctionalDefault/Controller/SnippetControllerCest.php b/tests/FunctionalDefault/Controller/SnippetControllerCest.php
@@ -53,7 +53,8 @@ public function testSnippetWithDefaultTeaserController(FunctionalTester $I)
                 'type' => 'input',
             ],
             'text'           => [
-                'type' => 'wysiwyg',
+                'type'             => 'wysiwyg',
+                'dataFromResource' => '',
             ],
         ];