Add missing return type and use early return

Author: stevebauman

src/Models/Concerns/HasPassword.php

@@ -198,24 +198,22 @@ public function getPasswordSalt(string $method): ?string
 
     /**
      * Determine the password hash method to use from the users current password.
-     *
-     * @return string|void
      */
-    public function determinePasswordHashMethod()
+    public function determinePasswordHashMethod(): ?string
     {
         if (! $password = $this->password) {
-            return;
+            return null;
         }
 
         if (! $method = Password::getHashMethod($password)) {
-            return;
+            return null;
         }
 
-        [,$algo] = array_pad(
-            Password::getHashMethodAndAlgo($password) ?? [],
-            $length = 2,
-            $value = null
-        );
+        if (! $hashAndAlgo = Password::getHashMethodAndAlgo($password)) {
+            return $method;
+        }
+
+        [,$algo] = array_pad(array: $hashAndAlgo, length: 2, value: null);
 
         return match ((int) $algo) {
             Password::CRYPT_SALT_TYPE_MD5 => 'md5'.$method,