Merge branch 'develop' into new-addonproxy

diff --cc src/App.php
index 366d20fbdbe836da8c1e695617826c993980266f,7f8e03b5e8b7344737f9230137698a51b56073eb..d42f63436c9c6f684464daa8048079c3e8fb16b4
--- 1/src/App.php
--- 2/src/App.php
+++ b/src/App.php
@@@ -175,8 -178,8 +181,9 @@@ class Ap
                        $this->mode,
                        $this->config,
                        $this->profiler,
+                       $this->container->create(EventDispatcherInterface::class),
                        $this->appHelper,
 +                      $addonHelper,
                );
  
                $this->registerTemplateEngine();
@@@ -214,8 -219,8 +224,9 @@@
                        $this->container->create(Mode::class),
                        $this->container->create(IManageConfigValues::class),
                        $this->container->create(Profiler::class),
+                       $this->container->create(EventDispatcherInterface::class),
                        $this->container->create(AppHelper::class),
 +                      $this->container->create(AddonHelper::class),
                );
  
                $this->registerTemplateEngine();
@@@ -243,8 -250,8 +256,9 @@@
                        $this->container->create(Mode::class),
                        $this->container->create(IManageConfigValues::class),
                        $this->container->create(Profiler::class),
+                       $this->container->create(EventDispatcherInterface::class),
                        $this->container->create(AppHelper::class),
 +                      $this->container->create(AddonHelper::class),
                );
  
                /** @var BasePath */
@@@ -323,8 -340,8 +347,9 @@@
                Mode $mode,
                IManageConfigValues $config,
                Profiler $profiler,
 -              AppHelper $appHelper
+               EventDispatcherInterface $eventDispatcher,
 +              AppHelper $appHelper,
 +              AddonHelper $addonHelper
        ): void {
                if ($config->get('system', 'ini_max_execution_time') !== false) {
                        set_time_limit((int) $config->get('system', 'ini_max_execution_time'));
@@@ -346,8 -363,9 +371,9 @@@
  
                if ($mode->has(Mode::DBAVAILABLE)) {
                        Core\Hook::loadHooks();
 -                      $loader = (new Config())->createConfigFileManager($appHelper->getBasePath(), $serverParams);
 +                      $loader = (new Config())->createConfigFileManager($appHelper->getBasePath(), $addonHelper->getAddonPath(), $serverParams);
-                       Core\Hook::callAll('load_config', $loader);
+ 
+                       $eventDispatcher->dispatch(new ConfigLoadedEvent(ConfigLoadedEvent::CONFIG_LOADED, $loader));
  
                        // Hooks are now working, reload the whole definitions with hook enabled
                        $dbaDefinition->load(true);

diff --cc src/DI.php
Simple merge

diff --cc static/dependencies.config.php
Simple merge