Replace AddonLoader with AddonHelper in App

diff --git a/src/App.php b/src/App.php
index ffcbfd15449cf683f0f4538f6d8eafec4bfcc74c..b10e474885e9da5b1314325ab67a84cc17afbce3 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -18,7 +18,6 @@ use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Capabilities\ICanHandleRequests;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon\AddonHelper;
-use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Container;
 use Friendica\Core\Hooks\HookEventBridge;
@@ -278,11 +277,15 @@ class App
 
        private function setupContainerForAddons(): void
        {
-               /** @var ICanLoadAddons $addonLoader */
-               $addonLoader = $this->container->create(ICanLoadAddons::class);
+               /** @var AddonHelper $addonHelper */
+               $addonHelper = $this->container->create(AddonHelper::class);
+
+               $addonHelper->loadAddons();
 
-               foreach ($addonLoader->getActiveAddonConfig('dependencies') as $name => $rule) {
-                       $this->container->addRule($name, $rule);
+               foreach ($addonHelper->getEnabledAddons() as $addonId) {
+                       foreach ($addonHelper->getAddonDependencyConfig($addonId) as $name => $rule) {
+                               $this->container->addRule($name, $rule);
+                       }
                }
        }
 

diff --git a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
index f06e0b09e9af55371d6b16463cc9bf684cf7134f..3349f36fd6bf3c603b5a6edc3bc93eed6947aea9 100644 (file)
--- a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
+++ b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Test\src\Core\Hooks\Util;
 
-use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookConfigException;