stevenbuehner / HtpasswdManager

src/HtpasswdManager/Controller/UserController.php

Doc Comments +1 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
 	 * Returns true if valid, of not it returns a String with information about the reason
 	 *
 	 * @param string $username        	
-	 * @return boolean string
+	 * @return string|boolean string
 	 */
 	private function isUsernameValid($username) {
 		if (strlen ( $username ) <= 2)
@@ -167,7 +167,6 @@ 
 	/**
 	 * Returns true if valid, of not it returns a String with information about the reason
 	 *
-	 * @param string $username        	
 	 * @return boolean string
 	 */
 	private function isPasswordValid($password) {

Braces +7 added lines, -6 removed lines

@@ -155,12 +155,13 @@
 	 * @return boolean string
 	 */
 	private function isUsernameValid($username) {
-		if (strlen ( $username ) <= 2)
-			return "Benutzername ist zu kurz.";
-		else if (preg_match ( '~[a-zäöo][a-zäöu_0-9-]+~i', $username ) !== 1)
-			return "Benutzername enthält ungültige Zeichen";
-		else if (strpos ( $username, ' ' ) !== false)
-			return "Leerzeichen sind im Benutzernamen nicht erlaubt";
+		if (strlen ( $username ) <= 2) {
+					return "Benutzername ist zu kurz.";
+		} else if (preg_match ( '~[a-zäöo][a-zäöu_0-9-]+~i', $username ) !== 1) {
+					return "Benutzername enthält ungültige Zeichen";
+		} else if (strpos ( $username, ' ' ) !== false) {
+					return "Leerzeichen sind im Benutzernamen nicht erlaubt";
+		}
 		return true;
 	}
 

src/HtpasswdManager/Service/HtpasswdService.php

Doc Comments +3 added lines

@@ -108,6 +108,9 @@
 		return $usernameDeleted;
 	}
 
+	/**
+	 * @param string $newContent
+	 */
 	private function replaceHtPasswdContent($newContent) {
 		// file_put_contents ( $this->filename, $newContent );
 		$fp = fopen ( $this->filename, 'w' );

Braces +3 added lines, -2 removed lines

@@ -120,8 +120,9 @@
 	public function userExists($username) {
 		$userList = $this->getUserList ();
 		
-		if (isset ( $userList [$username] ))
-			return true;
+		if (isset ( $userList [$username] )) {
+					return true;
+		}
 		
 		return false;
 	}

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Doc Comments +3 added lines

@@ -140,6 +140,9 @@
         $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
     }
 
+    /**
+     * @param string $filename
+     */
     protected function getNumberOfLines($filename) {
         $cont  = file_get_contents($filename);
         $lines = explode("\n", $cont);

src/HtpasswdManager/Service/UserService.php

Braces +6 added lines, -4 removed lines

@@ -36,8 +36,9 @@ 
 				$username 
 		) );
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+		if ($eResult->stopped ()) {
+					return $eResult->last ();
+		}
 		
 		return ! in_array ( $username, $this->not_deletable_users );
 	}
@@ -47,8 +48,9 @@ 
 				'user' => $username 
 		) );
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+		if ($eResult->stopped ()) {
+					return $eResult->last ();
+		}
 			
 			/* If parameter is an array => allow only users in list. IF parameter is boolean, return boolean value */
 		if (is_array ( $this->user_with_management_permission )) {