Merge pull request #47291 from nextcloud/refactor/log-php-8-1

refactor(Log): Use new in initializer instead of constructor body

2 files changed, 2 insertions, 6 deletions

diff --git a/lib/private/Log.php b/lib/private/Log.php
index 4fce0436707..ea995642832 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -41,13 +41,9 @@ class Log implements ILogger, IDataLogger {
 	public function __construct(
 		private IWriter $logger,
 		private SystemConfig $config,
-		private ?Normalizer $normalizer = null,
+		private Normalizer $normalizer = new Normalizer(),
 		private ?IRegistry $crashReporters = null
 	) {
-		// FIXME: php8.1 allows "private Normalizer $normalizer = new Normalizer()," in initializer
-		if ($normalizer === null) {
-			$this->normalizer = new Normalizer();
-		}
 	}
 
 	public function setEventDispatcher(IEventDispatcher $eventDispatcher): void {
diff --git a/lib/private/Server.php b/lib/private/Server.php
index a0072b43ee2..aaf4c925f98 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -735,7 +735,7 @@ class Server extends ServerContainer implements IServerContainer {
 			$logger = $factory->get($logType);
 			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
 
-			return new Log($logger, $this->get(SystemConfig::class), null, $registry);
+			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
 		});
 		$this->registerAlias(ILogger::class, \OC\Log::class);
 		/** @deprecated 19.0.0 */