Move Addon class into Service namespace

This commit is contained in:
Art4 2025-01-03 09:28:21 +00:00
parent 5647d8aef4
commit 92505dca7b
5 changed files with 7 additions and 7 deletions

View file

@ -274,8 +274,8 @@ class App
{ {
$config = $this->container->create(IManageConfigValues::class); $config = $this->container->create(IManageConfigValues::class);
/** @var \Friendica\Addon\AddonManager $addonManager */ /** @var \Friendica\Service\Addon\AddonManager $addonManager */
$addonManager = $this->container->create(\Friendica\Addon\AddonManager::class); $addonManager = $this->container->create(\Friendica\Service\Addon\AddonManager::class);
$addonManager->bootstrapAddons($config->get('addons') ?? []); $addonManager->bootstrapAddons($config->get('addons') ?? []);

View file

@ -7,8 +7,9 @@
declare(strict_types=1); declare(strict_types=1);
namespace Friendica\Addon; namespace Friendica\Service\Addon;
use Friendica\Addon\AddonBootstrap;
use Friendica\Addon\Event\AddonStartEvent; use Friendica\Addon\Event\AddonStartEvent;
/** /**

View file

@ -9,7 +9,6 @@ declare(strict_types=1);
namespace Friendica\Service\Addon; namespace Friendica\Service\Addon;
use Friendica\Addon\Addon;
use Friendica\Addon\AddonBootstrap; use Friendica\Addon\AddonBootstrap;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -36,7 +35,7 @@ final class AddonManager
try { try {
$this->bootstrapAddon($addonName); $this->bootstrapAddon($addonName);
} catch (\Throwable $th) { } catch (\Throwable $th) {
throw $th; // throw $th;
} }
} }
} }

View file

@ -165,7 +165,7 @@ return (function(string $basepath, array $getVars, array $serverVars, array $coo
\Psr\EventDispatcher\EventDispatcherInterface::class => [ \Psr\EventDispatcher\EventDispatcherInterface::class => [
'instanceOf' => \Friendica\Event\EventDispatcher::class, 'instanceOf' => \Friendica\Event\EventDispatcher::class,
], ],
\Friendica\Addon\AddonManager::class => [ \Friendica\Service\Addon\AddonManager::class => [
'constructParams' => [ 'constructParams' => [
$basepath . '/addon', $basepath . '/addon',
], ],

View file

@ -9,9 +9,9 @@ declare(strict_types=1);
namespace Friendica\Test\Unit\Addon; namespace Friendica\Test\Unit\Addon;
use Friendica\Addon\Addon;
use Friendica\Addon\AddonBootstrap; use Friendica\Addon\AddonBootstrap;
use Friendica\Addon\Event\AddonStartEvent; use Friendica\Addon\Event\AddonStartEvent;
use Friendica\Service\Addon\Addon;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;