Various changes requested for review

manu0401 · manu0401 · commit 357dc123d1c9 · 2024-08-21T18:26:30.000+02:00
Change an excepion switch into a batch of if tests
Remove PHPdoc in implementation
Fix typo introduced in previous commit
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -70,12 +70,14 @@ public function bind(?string $dn = null, #[\SensitiveParameter] ?string $passwor
 
         if (false === @ldap_bind($this->connection, $dn, $password)) {
             $error = ldap_error($this->connection);
-            switch (ldap_errno($this->connection)) {
-                case self::LDAP_INVALID_CREDENTIALS:
+            $errno = ldap_errno($this->connection);
+            if (self::LDAP_INVALID_CREDENTIALS === $errno) {
                     throw new InvalidCredentialsException($error);
-                case self::LDAP_TIMEOUT:
+            }
+            if (self::LDAP_TIMEOUT === $errno) {
                     throw new ConnectionTimeoutException($error);
-                case self::LDAP_ALREADY_EXISTS:
+            }
+            if (self::LDAP_ALREADY_EXISTS === $errno) {
                     throw new AlreadyExistsException($error);
             }
             ldap_get_option($this->connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $diagnostic_message);
@@ -87,10 +89,8 @@ public function bind(?string $dn = null, #[\SensitiveParameter] ?string $passwor
 
     /**
      * @param string $password WARNING: When the LDAP server allows unauthenticated binds, a blank $password will always be valid
-     *
-     * @return void
      */
-    public function sasBbind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void
+    public function saslBind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void
     {
         if (!function_exists('ldap_sasl_bind')) {
             throw new LdapException('Library - missing SASL support');
@@ -102,12 +102,14 @@ public function sasBbind(?string $dn = null, #[\SensitiveParameter] ?string $pas
 
         if (false === @ldap_sasl_bind($this->connection, $dn, $password, $mech, $realm, $authcId, $authzId, $props)) {
             $error = ldap_error($this->connection);
-            switch (ldap_errno($this->connection)) {
-                case self::LDAP_INVALID_CREDENTIALS:
+            $errno = ldap_errno($this->connection);
+            if (self::LDAP_INVALID_CREDENTIALS === $errno) {
                     throw new InvalidCredentialsException($error);
-                case self::LDAP_TIMEOUT:
+            }
+            if (self::LDAP_TIMEOUT === $errno) {
                     throw new ConnectionTimeoutException($error);
-                case self::LDAP_ALREADY_EXISTS:
+            }
+            if (self::LDAP_ALREADY_EXISTS === $errno) {
                     throw new AlreadyExistsException($error);
             }
             throw new ConnectionException($error);
@@ -119,8 +121,6 @@ public function sasBbind(?string $dn = null, #[\SensitiveParameter] ?string $pas
 
     /**
      * ldap_exop_whoami accessor, returns authenticated DN
-     *
-     * @return string
      */
     public function whoami(): string
     {
diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php
@@ -32,7 +32,7 @@ public function bind(?string $dn = null, #[\SensitiveParameter] ?string $passwor
         $this->adapter->getConnection()->bind($dn, $password);
     }
 
-    public function saslbind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void
+    public function saslBind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void
     {
         $this->adapter->getConnection()->saslBind($dn, $password, $mech, $realm, $authcId, $authzId, $props);
     }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function bind(?string $dn = null, #[\SensitiveParameter] ?string $passwor`
`32`	`32`	`$this->adapter->getConnection()->bind($dn, $password);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function saslbind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void`
	`35`	`+ public function saslBind(?string $dn = null, #[\SensitiveParameter] ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authcId = null, ?string $authzId = null, ?string $props = null): void`
`36`	`36`	`{`
`37`	`37`	`$this->adapter->getConnection()->saslBind($dn, $password, $mech, $realm, $authcId, $authzId, $props);`
`38`	`38`	`}`