Skip to content

Commit c49f028

Browse files
alongoszkonradoboza
authored andcommitted
Moved loading default Core settings to prepend stage
1 parent 3a3315f commit c49f028

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/bundle/Core/DependencyInjection/IbexaCoreExtension.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ public function load(array $configs, ContainerBuilder $container)
127127
$loader->load('routing/js_routing.yml');
128128
}
129129

130-
// Default settings
131-
$this->handleDefaultSettingsLoading($container, $loader);
132-
133130
$this->registerRepositoriesConfiguration($config, $container);
134131
$this->registerSiteAccessConfiguration($config, $container);
135132
$this->registerImageMagickConfiguration($config, $container);
@@ -198,6 +195,9 @@ public function prepend(ContainerBuilder $container)
198195
$this->prependDoctrineConfiguration($container);
199196
$this->prependJMSTranslation($container);
200197

198+
// Default settings
199+
$this->handleDefaultSettingsLoading($container);
200+
201201
$this->configureGenericSetup($container);
202202
$this->configurePlatformShSetup($container);
203203
}
@@ -236,15 +236,14 @@ private function getMainRepositoryConfigParser(): RepositoryConfigParserInterfac
236236
}
237237

238238
/**
239-
* Handle default settings.
240-
*
241-
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
242-
* @param \Symfony\Component\DependencyInjection\Loader\FileLoader $loader
243-
*
244239
* @throws \Exception
245240
*/
246-
private function handleDefaultSettingsLoading(ContainerBuilder $container, FileLoader $loader)
241+
private function handleDefaultSettingsLoading(ContainerBuilder $container): void
247242
{
243+
$loader = new Loader\YamlFileLoader(
244+
$container,
245+
new FileLocator(__DIR__ . '/../Resources/config')
246+
);
248247
$loader->load('default_settings.yml');
249248

250249
foreach ($this->defaultSettingsCollection as $fileLocation => $files) {

0 commit comments

Comments
 (0)