Merge branch 'develop' into refactor-logger

diff --cc src/App.php
index 8af3219a655fd477bf815017b3aae497b79ac33f,c1ac8b2d4387f29cb4fa9f678ff8fe6bbbdad386..0f2a6a76f8a7a2750de111f0f686cf1b0c77021c
--- 1/src/App.php
--- 2/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);

diff --cc static/dependencies.config.php
Simple merge