From: Art4 <art4@wlabs.de>
Date: Thu, 26 Dec 2024 17:03:42 +0000 (+0000)
Subject: Merge branch 'refactor-entrypoint-auth_ejabberd.php' into refactor-entrypoint-console.php
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=adee070ee675500deb160a3b2e9135c5be077670;p=friendica.git

Merge branch 'refactor-entrypoint-auth_ejabberd.php' into refactor-entrypoint-console.php
---

adee070ee675500deb160a3b2e9135c5be077670
diff --cc src/App.php
index 0fcebd464a,98c12cd579..b5bd34f578
--- a/src/App.php
+++ b/src/App.php
@@@ -176,9 -170,11 +176,9 @@@ class Ap
  	{
  		$this->setupContainerForAddons();
  
 -		$this->container = $this->container->addRule(LoggerInterface::class,[
 -			'constructParams' => [LogChannel::AUTH_JABBERED],
 -		]);
 +		$this->setupContainerForLogger(LogChannel::AUTH_JABBERED);
  
- 		$this->setupLegacyServerLocator();
+ 		$this->setupLegacyServiceLocator();
  
  		$this->registerErrorHandler();
  
@@@ -194,21 -190,6 +194,21 @@@
  		}
  	}
  
 +	public function processConsole(array $argv): void
 +	{
 +		$this->setupContainerForAddons();
 +
 +		$this->setupContainerForLogger(LogChannel::CONSOLE);
 +
- 		$this->setupLegacyServerLocator();
++		$this->setupLegacyServiceLocator();
 +
 +		$this->registerErrorHandler();
 +
 +		$this->registerTemplateEngine();
 +
 +		(new \Friendica\Core\Console($this->container, $argv))->execute();
 +	}
 +
  	private function setupContainerForAddons(): void
  	{
  		/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
@@@ -217,14 -198,7 +217,14 @@@
  		$this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
  	}
  
 +	private function setupContainerForLogger(string $logChannel): void
 +	{
 +		$this->container = $this->container->addRule(LoggerInterface::class, [
 +			'constructParams' => [$logChannel],
 +		]);
 +	}
 +
- 	private function setupLegacyServerLocator(): void
+ 	private function setupLegacyServiceLocator(): void
  	{
  		\Friendica\DI::init($this->container);
  	}