mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-11 09:34:26 +02:00
Move setupContainerForAddons() into App
This commit is contained in:
parent
e899127137
commit
768d7961a6
2 changed files with 17 additions and 9 deletions
17
src/App.php
17
src/App.php
|
@ -17,6 +17,7 @@ use Friendica\App\Router;
|
|||
use Friendica\Capabilities\ICanCreateResponses;
|
||||
use Friendica\Capabilities\ICanHandleRequests;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Core\Addon\Capability\ICanLoadAddons;
|
||||
use Friendica\Core\Config\Factory\Config;
|
||||
use Friendica\Core\Container;
|
||||
use Friendica\Core\Renderer;
|
||||
|
@ -134,6 +135,8 @@ class App
|
|||
],
|
||||
]);
|
||||
|
||||
$this->setupContainerForAddons();
|
||||
|
||||
$this->container->setup(LogChannel::APP, false);
|
||||
|
||||
$this->requestId = $this->container->create(Request::class)->getRequestId();
|
||||
|
@ -170,11 +173,15 @@ class App
|
|||
|
||||
public function processConsole(array $argv): void
|
||||
{
|
||||
$this->setupContainerForAddons();
|
||||
|
||||
(\Friendica\Core\Console::create($this->container, $argv))->execute();
|
||||
}
|
||||
|
||||
public function processEjabberd(): void
|
||||
{
|
||||
$this->setupContainerForAddons();
|
||||
|
||||
$this->container->setup(LogChannel::AUTH_JABBERED, false);
|
||||
|
||||
/** @var BasePath */
|
||||
|
@ -192,6 +199,16 @@ class App
|
|||
}
|
||||
}
|
||||
|
||||
private function setupContainerForAddons(): void
|
||||
{
|
||||
/** @var ICanLoadAddons $addonLoader */
|
||||
$addonLoader = $this->container->create(ICanLoadAddons::class);
|
||||
|
||||
foreach ($addonLoader->getActiveAddonConfig('dependencies') as $name => $rule) {
|
||||
$this->container->addRule($name, $rule);
|
||||
}
|
||||
}
|
||||
|
||||
private function registerTemplateEngine(): void
|
||||
{
|
||||
Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue