nextcloud / server

lib/private/Security/Hasher.php

Spacing +13 added lines, -13 removed lines

@@ -78,7 +78,7 @@ 
 		}
 
 		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if(!\is_null($hashingCost)) {
+		if (!\is_null($hashingCost)) {
 			$this->options['cost'] = $hashingCost;
 		}
 	}
@@ -93,9 +93,9 @@ 
 	 */
 	public function hash(string $message): string {
 		if (\defined('PASSWORD_ARGON2I')) {
-			return 2 . '|' . password_hash($message, PASSWORD_ARGON2I, $this->options);
+			return 2.'|'.password_hash($message, PASSWORD_ARGON2I, $this->options);
 		} else {
-			return 1 . '|' . password_hash($message, PASSWORD_BCRYPT, $this->options);
+			return 1.'|'.password_hash($message, PASSWORD_BCRYPT, $this->options);
 		}
 	}
 
@@ -106,9 +106,9 @@ 
 	 */
 	protected function splitHash(string $prefixedHash) {
 		$explodedString = explode('|', $prefixedHash, 2);
-		if(\count($explodedString) === 2) {
-			if((int)$explodedString[0] > 0) {
-				return ['version' => (int)$explodedString[0], 'hash' => $explodedString[1]];
+		if (\count($explodedString) === 2) {
+			if ((int) $explodedString[0] > 0) {
+				return ['version' => (int) $explodedString[0], 'hash' => $explodedString[1]];
 			}
 		}
 
@@ -123,13 +123,13 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function legacyHashVerify($message, $hash, &$newHash = null): bool {
-		if(empty($this->legacySalt)) {
+		if (empty($this->legacySalt)) {
 			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
 		}
 
 		// Verify whether it matches a legacy PHPass or SHA1 string
 		$hashLength = \strlen($hash);
-		if(($hashLength === 60 && password_verify($message.$this->legacySalt, $hash)) ||
+		if (($hashLength === 60 && password_verify($message.$this->legacySalt, $hash)) ||
 			($hashLength === 40 && hash_equals($hash, sha1($message)))) {
 			$newHash = $this->hash($message);
 			return true;
@@ -146,13 +146,13 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function verifyHashV1(string $message, string $hash, &$newHash = null): bool {
-		if(password_verify($message, $hash)) {
+		if (password_verify($message, $hash)) {
 			$algo = PASSWORD_BCRYPT;
 			if (\defined('PASSWORD_ARGON2I')) {
 				$algo = PASSWORD_ARGON2I;
 			}
 
-			if(password_needs_rehash($hash, $algo, $this->options)) {
+			if (password_needs_rehash($hash, $algo, $this->options)) {
 				$newHash = $this->hash($message);
 			}
 			return true;
@@ -169,8 +169,8 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function verifyHashV2(string $message, string $hash, &$newHash = null) : bool {
-		if(password_verify($message, $hash)) {
-			if(password_needs_rehash($hash, PASSWORD_ARGON2I, $this->options)) {
+		if (password_verify($message, $hash)) {
+			if (password_needs_rehash($hash, PASSWORD_ARGON2I, $this->options)) {
 				$newHash = $this->hash($message);
 			}
 			return true;
@@ -188,7 +188,7 @@ 
 	public function verify(string $message, string $hash, &$newHash = null): bool {
 		$splittedHash = $this->splitHash($hash);
 
-		if(isset($splittedHash['version'])) {
+		if (isset($splittedHash['version'])) {
 			switch ($splittedHash['version']) {
 				case 2:
 					return $this->verifyHashV2($message, $splittedHash['hash'], $newHash);