Skip to content

Commit b5c413b

Browse files
authored
fix config load priority to allow config overwrites (#210)
1 parent 4c6e3db commit b5c413b

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

UPGRADE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Upgrade Notes
22

3+
## 5.0.1
4+
- Fix config load priority to allow config overwrites
5+
36
## Migrating from Version 4.x to Version 5.0.0
47

58
### New Features

config/config.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

config/pimcore/config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
imports:
2+
- { resource: ../data_attributes.yaml }
3+
- { resource: ../image_thumbnails.yaml }
4+
- { resource: ../document_editables.yaml }
5+
16
doctrine_migrations:
27
migrations_paths:
38
'ToolboxBundle\Migrations': '@ToolboxBundle/src/Migrations'

src/DependencyInjection/ToolboxExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public function prepend(ContainerBuilder $container): void
2424
}
2525

2626
$coreLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
27-
$coreLoader->load('config.yaml');
2827

2928
$loaded = [];
3029

@@ -186,7 +185,7 @@ private function parseContextConfigs(array $configs): array
186185
}
187186
}
188187

189-
//get context data
188+
// get context data
190189
foreach ($configs as $config) {
191190

192191
if (!isset($config['context'])) {

tests/FunctionalDefault/Controller/SnippetControllerCest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public function testSnippetWithDefaultTeaserController(FunctionalTester $I)
5353
'type' => 'input',
5454
],
5555
'text' => [
56-
'type' => 'wysiwyg',
56+
'type' => 'wysiwyg',
57+
'dataFromResource' => '',
5758
],
5859
];
5960

0 commit comments

Comments
 (0)