Improve readability of authenticatePasswordVerifyHash()

Author: nathanjrobertson

src/Auth/Source/SQL2.php

@@ -434,7 +434,6 @@ protected function authenticatePasswordVerifyHash(
             throw new Error\Error('WRONGUSERPASS');
         }
 
-        $validPasswordHashFound = false;
         $passwordHash = null;
         foreach ($data as $row) {
             if ((!array_key_exists($hashColumn, $row)) || is_null($row[$hashColumn])) {
@@ -445,27 +444,27 @@ protected function authenticatePasswordVerifyHash(
                 ));
                 throw new Error\Error('WRONGUSERPASS');
             }
-            if (($passwordHash === null) && (strlen($row[$hashColumn]) > 0)) {
-                $passwordHash = $row[$hashColumn];
-                $validPasswordHashFound = true;
-            } elseif ($passwordHash != $row[$hashColumn]) {
+
+            if (strlen($row[$hashColumn]) === 0) {
                 Logger::error(sprintf(
-                    'sqlauth:%s: column %s must be THE SAME in every result tuple.',
+                    'sqlauth:%s: column `%s` must contain a valid password hash.',
                     $this->authId,
                     $hashColumn,
                 ));
                 throw new Error\Error('WRONGUSERPASS');
-            } elseif (strlen($row[$hashColumn]) === 0) {
+            } elseif ($passwordHash === null) {
+                $passwordHash = $row[$hashColumn];
+            } elseif ($passwordHash != $row[$hashColumn]) {
                 Logger::error(sprintf(
-                    'sqlauth:%s: column `%s` must contain a valid password hash.',
+                    'sqlauth:%s: column %s must be THE SAME in every result tuple.',
                     $this->authId,
                     $hashColumn,
                 ));
                 throw new Error\Error('WRONGUSERPASS');
             }
         }
 
-        if ((!$validPasswordHashFound) || (!password_verify($password, $passwordHash))) {
+        if (($passwordHash == null) || (!password_verify($password, $passwordHash))) {
             Logger::error('sqlauth:' . $this->authId . ': Auth query ' . $queryname .
                             ' password verification failed');
             /* Authentication with verify_password() failed, however that only means that