From e12a226b4fa380b9c2f0dff50649886e09b70ac8 Mon Sep 17 00:00:00 2001
From: tracer <tracer@24unix.net>
Date: Fri, 16 Sep 2022 15:03:19 +0200
Subject: [PATCH] modified shebang behaviour

---
 bin/console | 57 +++++++++++++++++++----------------------------------
 1 file changed, 20 insertions(+), 37 deletions(-)
 mode change 100755 => 100644 bin/console

diff --git a/bin/console b/bin/console
old mode 100755
new mode 100644
index 5830058..20f295b
--- a/bin/console
+++ b/bin/console
@@ -1,5 +1,6 @@
-#!/usr/bin/keyhelp-php81
+#!/usr/bin/env php
 <?php declare(strict_types=1);
+
 namespace App\Controller;
 
 // & ~E_DEPRECATED is needed because of a bug in PhpStorm
@@ -13,36 +14,19 @@ if (php_sapi_name() !== 'cli') {
 	exit;
 }
 
+
 // version, store that somewhere else
 $version = '0.0.1';
 
+if (!is_file(filename: dirname(path: __DIR__).'/vendor/autoload.php')) {
+	die('Required runtime components are missing. Try running "composer install".' . PHP_EOL);
+}
+
 require dirname(path: __DIR__) . '/vendor/autoload.php';
 
-$configFile = dirname(path: __DIR__) ."/config.json.local";
-if (!file_exists(filename: $configFile)) {
-	$configFile = dirname(path: __DIR__) ."/config.json";
-}
 
-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');
-		echo 'Config file has been generated. Adjust it to your needs, then proceed to database setup.' . PHP_EOL;
-	} else {
-		echo 'You first have to setup the bindAPI. Bye.' . PHP_EOL;
-		exit(0);
-	}
-	exit(1);
-}
-$configJSON = file_get_contents(filename: $configFile);
-
-if (!$config = json_decode(json: $configJSON, associative: true)) {
-	echo 'Error parsing the config file.' . PHP_EOL;
-	echo $configJSON;
-}
-
-$shortOpts = 'V::'; // version
-$shortOpts .= "v::"; // verbose
+$shortOpts = 'v::'; // version
+$shortOpts .= "V::"; // verbose
 $shortOpts .= "h::"; // help
 
 $longOpts = [
@@ -53,32 +37,31 @@ $longOpts = [
 
 $options = getopt(short_options: $shortOpts, long_options: $longOpts, rest_index: $restIndex);
 
-if (array_key_exists(key: 'V', array: $options) || array_key_exists(key: 'version', array: $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(key: 'h', array: $options) || array_key_exists(key: 'help', array: $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(key: 'v', array: $options) || array_key_exists(key: 'verbose', array: $options) ) {
-	$config['verbose'] = true;
+if (array_key_exists(key: 'V', array: $options) || array_key_exists(key: 'verbose', array: $options)) {
+	$verbose = true;
 } else {
-	$config['verbose'] = false;
+	$verbose = false;
 }
 
 $arguments = array_slice(array: $argv, offset: $restIndex);
 
 try {
-	$app = new BindAPI(config: $config, argumentsCount: count(value: $arguments), arguments: $arguments);
-	$app->runCommand();
-} catch (DependencyException|NotFoundException $e) {
-	echo $e->getMessage();
+	$app = new BindAPI(verbose: $verbose );
+	$app->runCommand(argumentsCount: count(value: $arguments), arguments: $arguments);
+	
+} catch (DependencyException|NotFoundException|Exception $e) {
+	echo $e->getMessage() . PHP_EOL;
 	exit(1);
-} catch (Exception $e) {
-	echo $e->getMessage();
 }
 
 
@@ -89,7 +72,7 @@ try {
  *
  * @return bool
  */
-function confirm(String $message = 'Are you sure? ', array $options = ['y', 'n'], string $default ='n'): bool
+function confirm(string $message = 'Are you sure? ', array $options = ['y', 'n'], string $default = 'n'): bool
 {
 	// first $options means true, any other false
 	echo $message, ' (';