code cleanup

bindAPI/.gitignore

@@ -1,3 +1,4 @@
 .idea
 
 /vendor/
+/config.json

bindAPI/bin/console

@@ -1,16 +1,14 @@
 #!/usr/bin/keyhelp-php81
 <?php
-
 if (php_sapi_name() !== 'cli') {
 	exit;
 }
 
-require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(path: __DIR__) . '/vendor/autoload.php';
 
 use App\Controller\BindAPI;
 
-// read config
+$configFile = dirname(path: __DIR__) ."/config.json";
-$configFile = __DIR__ ."/../config.json";
 $configJSON = file_get_contents($configFile);
 $config = json_decode($configJSON, associative: true);
 

bindAPI/src/Controller/ApiUsers.php

@@ -20,13 +20,13 @@ class ApiUsers
 	 */
 	public function findAll(): bool|array
 	{
-		$statement = "
+		$sql = "
             SELECT id, api_token_prefix, api_token
             FROM user";
 		
 		try {
-			$statement = $this->dbConnection->query($statement);
+			$statement = $this->dbConnection->query($sql);
-			return $statement->fetchAll(PDO::FETCH_ASSOC);
+			return $statement->fetchAll(mode: PDO::FETCH_ASSOC);
 		} catch (PDOException $e) {
 			exit($e->getMessage());
 		}
@@ -40,40 +40,46 @@ class ApiUsers
 	 */
 	public function findByID(Int $id): bool|array
 	{
-		$statement = "
+		$sql = "
 			SELECT api_token_prefix, api_token
 			FROM user
             WHERE id = :id;
         ";
 		
 		try {
-			$statement = $this->dbConnection->prepare($statement);
+			$statement = $this->dbConnection->prepare($sql);
-			$statement->bindParam(':id', $id);
+			$statement->bindParam(param: ':id', var: $id);
 			$statement->execute();
-			return $statement->fetchAll(PDO::FETCH_ASSOC);
+			return $statement->fetch(mode: PDO::FETCH_ASSOC);
 		} catch (PDOException $e) {
 			exit($e->getMessage());
 		}
 	}
 	
+	
+	/**
+	 * @param String $prefix
+	 *
+	 * @return bool|array
+	 */
 	public function findByPrefix(String $prefix): bool|array
 	{
-		$statement = "
+		$sql = "
 			SELECT api_token
 			FROM user
-            WHERE api_token_prefix = :prefix;
+            WHERE api_token_prefix = :prefix";
-        ";
 		
 		try {
-			$statement = $this->dbConnection->prepare($statement);
+			$statement = $this->dbConnection->prepare($sql);
-			$statement->bindParam(':prefix', $prefix);
+			$statement->bindParam(param: ':prefix', var: $prefix);
 			$statement->execute();
-			return $statement->fetch(PDO::FETCH_ASSOC);
+			return $statement->fetch(mode: PDO::FETCH_ASSOC);
 		} catch (PDOException $e) {
 			exit($e->getMessage());
 		}
 	}
 	
+	
 	/**
 	 * @return array|void
 	 */
@@ -82,22 +88,22 @@ class ApiUsers
 		$tokenPrefix = uniqid();
 		$result['tokenPrefix'] = $tokenPrefix;
 		try {
-			$key = bin2hex(random_bytes(24));
+			$key = bin2hex(random_bytes(length: 24));
 			$result['key'] = $key;
 		} catch (Exception $e) {
 			echo $e->getMessage() . PHP_EOL;
 			exit(1);
 		}
-		$token = password_hash($tokenPrefix . '.' . $key, PASSWORD_ARGON2ID);
+		$token = password_hash(password: $tokenPrefix . '.' . $key, algo: PASSWORD_ARGON2ID);
 		
-		$statement = "
+		$sql = "
             INSERT INTO user (api_token_prefix, api_token)
             VALUES (:token_prefix, :token)";
 		
 		try {
-			$statement = $this->dbConnection->prepare($statement);
+			$statement = $this->dbConnection->prepare($sql);
-			$statement->bindParam(':token_prefix', $tokenPrefix);
+			$statement->bindParam(param: ':token_prefix', var: $tokenPrefix);
-			$statement->bindParam(':token', $token);
+			$statement->bindParam(param: ':token', var: $token);
 			$statement->execute();
 			$result['row'] = $this->dbConnection->lastInsertId();
 			return $result;
@@ -114,13 +120,13 @@ class ApiUsers
 	 */
 	public function delete($id): int
 	{
-		$statement = "
+		$sql = "
             DELETE FROM user
             WHERE id = :id";
 		
 		try {
-			$statement = $this->dbConnection->prepare($statement);
+			$statement = $this->dbConnection->prepare($sql);
-			$statement->bindParam('id', $id);
+			$statement->bindParam(param: 'id', var: $id);
 			$statement->execute();
 			return $statement->rowCount();
 		} catch (PDOException $e) {
@@ -128,5 +134,4 @@ class ApiUsers
 		}
 	}
 	
-	
 }