added missing named parameters, added strict_types

Signed-off-by: tracer <tracer@24unix.net>

bin/console

@@ -1,5 +1,6 @@
 #!/usr/bin/keyhelp-php81
-<?php
+<?php declare(strict_types=1);
+
 
 namespace App\Controller;
 
@@ -14,7 +15,7 @@ $version = '0.0.1';
 require dirname(path: __DIR__) . '/vendor/autoload.php';
 
 $configFile = dirname(path: __DIR__) ."/config.json";
-if (!file_exists($configFile)) {
+if (!file_exists(filename: $configFile)) {
 	echo 'Missing config file' . PHP_EOL;
 	if (confirm(message: 'Should I create a new config based on config.json.sample?')) {
 		copy(from: 'config.json.sample', to: 'config.json');
@@ -25,9 +26,9 @@ if (!file_exists($configFile)) {
 	}
 	exit(1);
 }
-$configJSON = file_get_contents($configFile);
+$configJSON = file_get_contents(filename: $configFile);
 
-if (!$config = json_decode($configJSON, associative: true)) {
+if (!$config = json_decode(json: $configJSON, associative: true)) {
 	echo 'Error parsing the config file.' . PHP_EOL;
 	echo $configJSON;
 }
@@ -42,27 +43,27 @@ $longOpts = [
 		'help::'
 ];
 
-$options = getopt($shortOpts, $longOpts, rest_index: $restIndex);
+$options = getopt(short_options: $shortOpts, long_options: $longOpts, rest_index: $restIndex);
 
-if (array_key_exists('v', $options) || array_key_exists('version', $options) ) {
+if (array_key_exists(key: 'v', array: $options) || array_key_exists(key: 'version', array: $options) ) {
 	print("bindAPI version: $version" . PHP_EOL);
 	exit(0);
 }
 
-if (array_key_exists('h', $options) || array_key_exists('help', $options) ) {
+if (array_key_exists(key: 'h', array: $options) || array_key_exists(key: 'help', array: $options) ) {
 	print("Help …" . PHP_EOL);
 	exit(0);
 }
 
-if (array_key_exists('V', $options) || array_key_exists('verbose', $options) ) {
+if (array_key_exists(key: 'V', array: $options) || array_key_exists(key: 'verbose', array: $options) ) {
 	$config['verbose'] = true;
 } else {
 	$config['verbose'] = false;
 }
 
-$arguments = array_slice($argv, $restIndex);
+$arguments = array_slice(array: $argv, offset: $restIndex);
 
-$app = new BindAPI(config: $config, argumentsCount: count($arguments), arguments: $arguments);
+$app = new BindAPI(config: $config, argumentsCount: count(value: $arguments), arguments: $arguments);
 $app->runCommand();
 
 
@@ -81,7 +82,7 @@ function confirm(String $message = 'Are you sure? ', array $options = ['y', 'n']
 	foreach ($options as $option) {
 		// mark default
 		if ($option == $default) {
-			$option = strtoupper($option);
+			$option = strtoupper(string: $option);
 		}
 		if ($first) {
 			echo $option;
@@ -93,8 +94,8 @@ function confirm(String $message = 'Are you sure? ', array $options = ['y', 'n']
 	echo '): ';
 	
 	$handle = fopen(filename: "php://stdin", mode: 'r');
-	$line = trim(fgetc($handle));
-	fclose($handle);
+	$line = trim(fgetc(stream: $handle));
+	fclose(stream: $handle);
 	
 	if ($line == '') {
 		// enter

src/Controller/ApiKeys.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace App\Controller;
 
@@ -25,7 +25,7 @@ class ApiKeys
             FROM " . DatabaseConnection::TABLE_USER;
 		
 		try {
-			$statement = $this->databaseConnection->getConnection()->query($sql);
+			$statement = $this->databaseConnection->getConnection()->query(statement: $sql);
 			return $statement->fetchAll(mode: PDO::FETCH_ASSOC);
 		} catch (PDOException $e) {
 			exit($e->getMessage());
@@ -47,7 +47,7 @@ class ApiKeys
         ";
 		
 		try {
-			$statement = $this->databaseConnection->getConnection()->prepare($sql);
+			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->bindParam(param: ':id', var: $id);
 			$statement->execute();
 			return $statement->fetch(mode: PDO::FETCH_ASSOC);
@@ -70,7 +70,7 @@ class ApiKeys
             WHERE api_token_prefix = :prefix";
 		
 		try {
-			$statement = $this->databaseConnection->getConnection()->prepare($sql);
+			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->bindParam(param: ':prefix', var: $prefix);
 			$statement->execute();
 			return $statement->fetch(mode: PDO::FETCH_ASSOC);
@@ -88,7 +88,7 @@ class ApiKeys
 		$tokenPrefix = uniqid();
 		$result['tokenPrefix'] = $tokenPrefix;
 		try {
-			$key = bin2hex(random_bytes(length: 24));
+			$key = bin2hex(string: random_bytes(length: 24));
 			$result['key'] = $key;
 		} catch (Exception $e) {
 			echo $e->getMessage() . PHP_EOL;
@@ -101,7 +101,7 @@ class ApiKeys
             VALUES (:name, :token_prefix, :token)";
 		
 		try {
-			$statement = $this->databaseConnection->getConnection()->prepare($sql);
+			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->bindParam(param: ':token_prefix', var: $tokenPrefix);
 			$statement->bindParam(param: ':token', var: $token);
 			$statement->bindParam(param: ':name', var: $name);
@@ -127,7 +127,7 @@ class ApiKeys
             WHERE id = :id";
 		
 		try {
-			$statement = $this->databaseConnection->getConnection()->prepare($sql);
+			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->bindParam(param: 'id', var: $id);
 			$statement->execute();
 			return $statement->rowCount();