From a6ad06f940ce7d79a72262e67860cf237593bb09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Mon, 7 Feb 2022 10:06:19 +0100 Subject: [PATCH] Improve typing in apps/user_ldap/lib/Command/CheckUser.php MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/user_ldap/lib/Command/CheckUser.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php index c35557f67ed..7476afb1bfe 100644 --- a/apps/user_ldap/lib/Command/CheckUser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -4,6 +4,7 @@ * * @author Arthur Schiwon * @author Christoph Wurst + * @author Côme Chilliet * @author Joas Schilling * @author Morris Jobke * @author Roeland Jago Douma @@ -48,12 +49,6 @@ class CheckUser extends Command { /** @var UserMapping */ protected $mapping; - /** - * @param User_Proxy $uBackend - * @param Helper $helper - * @param DeletedUsersIndex $dui - * @param UserMapping $mapping - */ public function __construct(User_Proxy $uBackend, Helper $helper, DeletedUsersIndex $dui, UserMapping $mapping) { $this->backend = $uBackend; $this->helper = $helper; @@ -62,7 +57,7 @@ class CheckUser extends Command { parent::__construct(); } - protected function configure() { + protected function configure(): void { $this ->setName('ldap:check-user') ->setDescription('checks whether a user exists on LDAP.') @@ -89,7 +84,7 @@ class CheckUser extends Command { protected function execute(InputInterface $input, OutputInterface $output): int { try { $uid = $input->getArgument('ocName'); - $this->isAllowed($input->getOption('force')); + $this->assertAllowed($input->getOption('force')); $wasMapped = $this->userWasMapped($uid); $exists = $this->backend->userExistsOnLDAP($uid, true); if ($exists === true) { @@ -125,9 +120,8 @@ class CheckUser extends Command { /** * checks whether the setup allows reliable checking of LDAP user existence * @throws \Exception - * @return true */ - protected function isAllowed($force) { + protected function assertAllowed(bool $force): void { if ($this->helper->haveDisabledConfigurations() && !$force) { throw new \Exception('Cannot check user existence, because ' . 'disabled LDAP configurations are present.'); @@ -136,8 +130,6 @@ class CheckUser extends Command { // we don't check ldapUserCleanupInterval from config.php because this // action is triggered manually, while the setting only controls the // background job. - - return true; } private function updateUser(string $uid, OutputInterface $output): void { -- 2.39.5