Replace AddonLoader with AddonHelper in App

This commit is contained in:
Art4 2025-05-16 08:20:58 +00:00
parent 3f1082400a
commit f8b1770efa
2 changed files with 8 additions and 6 deletions

View file

@ -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);
foreach ($addonLoader->getActiveAddonConfig('dependencies') as $name => $rule) {
$this->container->addRule($name, $rule);
$addonHelper->loadAddons();
foreach ($addonHelper->getEnabledAddons() as $addonId) {
foreach ($addonHelper->getAddonDependencyConfig($addonId) as $name => $rule) {
$this->container->addRule($name, $rule);
}
}
}

View file

@ -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;