Merge pull request #54282 from nextcloud/techdebt/noid/reduce-deprecation-spam

Author: skjnldsv

lib/private/AppFramework/App.php

@@ -134,8 +134,7 @@ public static function main(string $controllerName, string $methodName, DIContai
 		$eventLogger->start('app:controller:dispatcher', 'Initialize dispatcher and pre-middleware');
 
 		// initialize the dispatcher and run all the middleware before the controller
-		/** @var Dispatcher $dispatcher */
-		$dispatcher = $container['Dispatcher'];
+		$dispatcher = $container->get(Dispatcher::class);
 
 		$eventLogger->end('app:controller:dispatcher');
 

lib/private/AppFramework/DependencyInjection/DIContainer.php

@@ -63,7 +63,7 @@
 use Psr\Log\LoggerInterface;
 
 class DIContainer extends SimpleContainer implements IAppContainer {
-	private string $appName;
+	protected string $appName;
 	private array $middleWares = [];
 	private ServerContainer $server;
 
@@ -152,7 +152,7 @@ public function __construct(string $appName, array $urlParams = [], ?ServerConta
 		$this->registerDeprecatedAlias('Dispatcher', Dispatcher::class);
 		$this->registerService(Dispatcher::class, function (ContainerInterface $c) {
 			return new Dispatcher(
-				$c->get('Protocol'),
+				$c->get(Http::class),
 				$c->get(MiddlewareDispatcher::class),
 				$c->get(IControllerMethodReflector::class),
 				$c->get(IRequest::class),

lib/private/AppFramework/Utility/SimpleContainer.php

@@ -196,7 +196,9 @@ protected function registerDeprecatedAlias(string $alias, string $target): void
 		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias): mixed {
 			try {
 				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', [
+					'app' => $this->appName ?? 'serverDI',
+				]);
 			} catch (ContainerExceptionInterface $e) {
 				// Could not get logger. Continue
 			}