diff options
author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-08-17 00:04:55 +0200 |
---|---|---|
committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-08-17 18:38:28 +0200 |
commit | 2ec68b1eb90aca54e69defd42bf0a610a09f4f49 (patch) | |
tree | 836365d1736cde0b3a887d6944b794741d5ea16b /lib | |
parent | 81b4ced07653e8d66004b76db659cbabe06e65b5 (diff) | |
download | nextcloud-server-2ec68b1eb90aca54e69defd42bf0a610a09f4f49.tar.gz nextcloud-server-2ec68b1eb90aca54e69defd42bf0a610a09f4f49.zip |
refactor(Log): Use new in initializer instead of constructor body
PHP 8.1 allows us to now move the `new` into the initializer,
this makes the code a bit nicer (and 3 lines shorter).
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Log.php | 6 | ||||
-rw-r--r-- | lib/private/Server.php | 2 |
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 */ |