Extract call of AddonLoader into App::setupContainerForAddons()

diff --git a/src/App.php b/src/App.php
index 40d8cf092d9b19749a0d4c3b2e94427a6b34c01a..39a1414200927269c4a1185c217a4cbd0a29f88f 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -160,9 +160,8 @@ class App
 
        public function processEjabberd(): void
        {
-               /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-               $addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
-               $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+               $this->setupContainerForAddons();
+
                $this->container = $this->container->addRule(LoggerInterface::class,[
                        'constructParams' => [LogChannel::AUTH_JABBERED],
                ]);
@@ -184,10 +183,8 @@ class App
 
        private function setupContainerForRunningFrontend(ServerRequestInterface $request): void
        {
-               /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-               $addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+               $this->setupContainerForAddons();
 
-               $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
                $this->container = $this->container->addRule(Mode::class, [
                        'call' => [
                                ['determineRunMode', [false, $request->getServerParams()], Dice::CHAIN_CALL],
@@ -197,6 +194,14 @@ class App
                \Friendica\DI::init($this->container);
        }
 
+       private function setupContainerForAddons(): void
+       {
+               /** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+               $addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+
+               $this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+       }
+
        private function registerErrorHandler(): void
        {
                \Friendica\Core\Logger\Handler\ErrorHandler::register($this->container->create(LoggerInterface::class));