From f03781b5090e22bfd15d48b6157fa296781b5d65 Mon Sep 17 00:00:00 2001 From: Faraz Samapoor Date: Wed, 24 Jan 2024 11:08:56 +0330 Subject: Refactors user_ldap app commands. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To improve code readability. Signed-off-by: Faraz Samapoor Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> --- apps/user_ldap/lib/Command/TestConfig.php | 47 ++++++++++++------------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'apps/user_ldap/lib/Command/TestConfig.php') diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php index c081b0cb726..17f73fdea81 100644 --- a/apps/user_ldap/lib/Command/TestConfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -41,18 +41,11 @@ class TestConfig extends Command { protected const BINDFAILURE = 2; protected const SEARCHFAILURE = 3; - protected AccessFactory $accessFactory; - protected Helper $helper; - protected ILDAPWrapper $ldap; - public function __construct( - AccessFactory $accessFactory, - Helper $helper, - ILDAPWrapper $ldap + protected AccessFactory $accessFactory, + protected Helper $helper, + protected ILDAPWrapper $ldap, ) { - $this->accessFactory = $accessFactory; - $this->helper = $helper; - $this->ldap = $ldap; parent::__construct(); } @@ -73,28 +66,24 @@ class TestConfig extends Command { $configID = $input->getArgument('configID'); if (!in_array($configID, $availableConfigs)) { $output->writeln('Invalid configID'); - return 1; + return self::FAILURE; } $result = $this->testConfig($configID); - switch ($result) { - case static::ESTABLISHED: - $output->writeln('The configuration is valid and the connection could be established!'); - return 0; - case static::CONF_INVALID: - $output->writeln('The configuration is invalid. Please have a look at the logs for further details.'); - break; - case static::BINDFAILURE: - $output->writeln('The configuration is valid, but the bind failed. Please check the server settings and credentials.'); - break; - case static::SEARCHFAILURE: - $output->writeln('The configuration is valid and the bind passed, but a simple search on the base fails. Please check the server base setting.'); - break; - default: - $output->writeln('Your LDAP server was kidnapped by aliens.'); - break; - } - return 1; + + $message = match ($result) { + static::ESTABLISHED => 'The configuration is valid and the connection could be established!', + static::CONF_INVALID => 'The configuration is invalid. Please have a look at the logs for further details.', + static::BINDFAILURE => 'The configuration is valid, but the bind failed. Please check the server settings and credentials.', + static::SEARCHFAILURE => 'The configuration is valid and the bind passed, but a simple search on the base fails. Please check the server base setting.', + default => 'Your LDAP server was kidnapped by aliens.', + }; + + $output->writeln($message); + + return $result === static::ESTABLISHED + ? self::SUCCESS + : self::FAILURE; } /** -- cgit v1.2.3