From: Art4 <art4@wlabs.de>
Date: Sat, 11 Jan 2025 17:08:07 +0000 (+0000)
Subject: Merge branch 'develop' into refactor-logger
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b40db06ef31b3d663691b9cf2847596c650a3079;p=friendica.git

Merge branch 'develop' into refactor-logger
---

b40db06ef31b3d663691b9cf2847596c650a3079
diff --cc src/App.php
index 8af3219a65,c1ac8b2d43..0f2a6a76f8
--- a/src/App.php
+++ b/src/App.php
@@@ -17,9 -17,9 +17,10 @@@ 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\Logger\LoggerManager;
  use Friendica\Core\Renderer;
  use Friendica\Core\Session\Capability\IHandleUserSessions;
  use Friendica\Database\Definition\DbaDefinition;
@@@ -135,12 -137,14 +138,18 @@@ class Ap
  			],
  		]);
  
- 		$this->container->setup(LogChannel::APP, false);
+ 		$this->setupContainerForAddons();
+ 
+ 		$this->setupContainerForLogger(LogChannel::APP);
+ 
+ 		$this->setupLegacyServiceLocator();
+ 
+ 		$this->registerErrorHandler();
  
 +		/** @var LoggerManager */
 +		$loggerManager = $this->container->create(LoggerManager::class);
 +		$loggerManager->changeLogChannel(LogChannel::APP);
 +
  		$this->requestId = $this->container->create(Request::class)->getRequestId();
  		$this->auth      = $this->container->create(Authentication::class);
  		$this->config    = $this->container->create(IManageConfigValues::class);