mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-12 12:24:28 +02:00
Move Addon class into Service namespace
This commit is contained in:
parent
5647d8aef4
commit
92505dca7b
5 changed files with 7 additions and 7 deletions
|
@ -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') ?? []);
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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',
|
||||||
],
|
],
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue