From b41b9cf4c0da2e6e3c0502f51a5a9942ecff6fb3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Thu, 28 Sep 2023 16:15:00 +0200 Subject: [PATCH] Small cleanups in SetupCheck classes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .../lib/SetupChecks/CheckUserCertificates.php | 7 ++++--- .../settings/lib/SetupChecks/LegacySSEKeyFormat.php | 13 +++++-------- apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php | 13 +++++-------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/apps/settings/lib/SetupChecks/CheckUserCertificates.php b/apps/settings/lib/SetupChecks/CheckUserCertificates.php index 38832bd2860..5d58f61b675 100644 --- a/apps/settings/lib/SetupChecks/CheckUserCertificates.php +++ b/apps/settings/lib/SetupChecks/CheckUserCertificates.php @@ -32,11 +32,12 @@ use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; class CheckUserCertificates implements ISetupCheck { - private IL10N $l10n; private string $configValue; - public function __construct(IL10N $l10n, IConfig $config) { - $this->l10n = $l10n; + public function __construct( + private IL10N $l10n, + IConfig $config, + ) { $configValue = $config->getAppValue('files_external', 'user_certificate_scan', ''); $this->configValue = $configValue; } diff --git a/apps/settings/lib/SetupChecks/LegacySSEKeyFormat.php b/apps/settings/lib/SetupChecks/LegacySSEKeyFormat.php index 44560590f74..68964b3fdab 100644 --- a/apps/settings/lib/SetupChecks/LegacySSEKeyFormat.php +++ b/apps/settings/lib/SetupChecks/LegacySSEKeyFormat.php @@ -32,14 +32,11 @@ use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; class LegacySSEKeyFormat implements ISetupCheck { - private IL10N $l10n; - private IConfig $config; - private IURLGenerator $urlGenerator; - - public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) { - $this->l10n = $l10n; - $this->config = $config; - $this->urlGenerator = $urlGenerator; + public function __construct( + private IL10N $l10n, + private IConfig $config, + private IURLGenerator $urlGenerator, + ) { } public function getCategory(): string { diff --git a/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php b/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php index 473fedc5c1d..a11246fd142 100644 --- a/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php +++ b/apps/user_ldap/lib/SetupChecks/LdapInvalidUuids.php @@ -34,14 +34,11 @@ use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; class LdapInvalidUuids implements ISetupCheck { - private IL10N $l10n; - private UserMapping $userMapping; - private GroupMapping $groupMapping; - - public function __construct(IL10N $l10n, UserMapping $userMapping, GroupMapping $groupMapping) { - $this->l10n = $l10n; - $this->userMapping = $userMapping; - $this->groupMapping = $groupMapping; + public function __construct( + private IL10N $l10n, + private UserMapping $userMapping, + private GroupMapping $groupMapping, + ) { } public function getCategory(): string { -- 2.39.5