Optimize: input option

JBlond · Feb 22, 2023 · 6c7e30c · 6c7e30c
1 parent 5cd5b58
commit 6c7e30c
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,11 @@ $cli->input('Hello world: ',array('Hello','world'));
 
 $cli->input('Test2: ', 'test');
 
+
+// This input requires any input
+
+$cli->input('Free input: ', '');
+
 // Question with default N 
 $answer = $cli->input('Do this? y/N', array('y','n','Y','N'), 'N');
 echo $answer;

diff --git a/example/cli.php b/example/cli.php
@@ -14,6 +14,7 @@
 $cli->error($string);
 $cli->input('Hello world: ',array('Hello','world'));
 $cli->input('Test2: ', 'test');
+$cli->input('Free input: ', '');
 
 $answer = $cli->input('Do this? y/N', array('y','n','Y','N'), 'N');
 echo $answer;
diff --git a/src/jblond/cli/Cli.php b/src/jblond/cli/Cli.php
@@ -8,53 +8,63 @@
  */
 class Cli {
 
-	/**
-	 * @param string $prompt
-	 * @param array|string $validInputs
-	 * @param string $default
-	 * @return string
-	 */
-	public function input(string $prompt, $validInputs, string $default = ''): string
+    /**
+     * @param string $prompt
+     * @param array|string $validInputs
+     * @param string $default
+     * @return string
+     */
+    public function input(string $prompt, $validInputs, string $default = ''): string
     {
-		echo $prompt;
-		$input = trim(fgets(fopen('php://stdin', 'rb')));
-		while(
-			!isset($input) ||
-			(
-				is_array($validInputs) &&
-				!in_array($input, $validInputs, true)
-			) ||
-			(
-				$validInputs === 'is_file' &&
-				!is_file($input)
-			)
-		){
-			echo $prompt;
-			$input = trim(fgets(fopen('php://stdin', 'rb')));
-			if(empty($input) && !empty($default)) {
-				$input = $default;
-			}
-		}
-		return $input;
-	}
-
-	/**
-	 * @param string $output
-	 */
-	public function output(string $output): void
+        echo $prompt;
+
+        $input = trim(fgets(fopen('php://stdin', 'rb')));
+
+        while (true) {
+            if ($input === '' && $default !== '') {
+                return $default;
+            }
+
+            if ($validInputs === 'is_file' && !is_file($input)) {
+                echo $prompt;
+                $input = trim(fgets(STDIN));
+                continue;
+            }
+
+            if (is_array($validInputs) && !in_array($input, $validInputs, true)) {
+                echo $prompt;
+                $input = trim(fgets(STDIN));
+                continue;
+            }
+
+            if (is_string($validInputs) && !empty($validInputs) && ($input !== $validInputs)) {
+                echo $prompt;
+                $input = trim(fgets(STDIN));
+                continue;
+            }
+
+            return $input;
+        }
+    }
+
+
+    /**
+     * @param string $output
+     */
+    public function output(string $output): void
     {
-		$out = fopen('php://output', 'wb');
-		fwrite($out, $output);
-		fclose($out);
-	}
-
-	/**
-	 * @param string $string
-	 */
-	public function error(string $string): void
+        $out = fopen('php://output', 'wb');
+        fwrite($out, $output);
+        fclose($out);
+    }
+
+    /**
+     * @param string $string
+     */
+    public function error(string $string): void
     {
-		$stdError = fopen('php://stderr', 'wb');
-		fwrite($stdError, $string);
-		fclose($stdError);
-	}
+        $stdError = fopen('php://stderr', 'wb');
+        fwrite($stdError, $string);
+        fclose($stdError);
+    }
 }