Moved loading default Core settings to prepend stage

ibexa · Dec 21, 2022 · 5cad3cb · 5cad3cb
1 parent cdebc88
commit 5cad3cb
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php b/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php
@@ -121,9 +121,6 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('routing/js_routing.yml');
         }
 
-        // Default settings
-        $this->handleDefaultSettingsLoading($container, $loader);
-
         $this->registerRepositoriesConfiguration($config, $container);
         $this->registerSiteAccessConfiguration($config, $container);
         $this->registerImageMagickConfiguration($config, $container);
@@ -191,6 +188,9 @@ public function prepend(ContainerBuilder $container)
         $this->prependTranslatorConfiguration($container);
         $this->prependDoctrineConfiguration($container);
 
+        // Default settings
+        $this->handleDefaultSettingsLoading($container);
+
         $this->configureGenericSetup($container);
         $this->configurePlatformShSetup($container);
     }
@@ -229,15 +229,14 @@ private function getMainRepositoryConfigParser(): RepositoryConfigParserInterfac
     }
 
     /**
-     * Handle default settings.
-     *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     * @param \Symfony\Component\DependencyInjection\Loader\FileLoader $loader
-     *
      * @throws \Exception
      */
-    private function handleDefaultSettingsLoading(ContainerBuilder $container, FileLoader $loader)
+    private function handleDefaultSettingsLoading(ContainerBuilder $container): void
     {
+        $loader = new Loader\YamlFileLoader(
+            $container,
+            new FileLocator(__DIR__ . '/../Resources/config')
+        );
         $loader->load('default_settings.yml');
 
         foreach ($this->defaultSettingsCollection as $fileLocation => $files) {