CLI: Select: Simplify things and multibyte support for the keys

Signed-off-by: Wolf Wortmann <[email protected]>
codeigniter4 · Feb 2, 2021 · 1fa44d0 · 1fa44d0
1 parent 68d4e74
commit 1fa44d0
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -295,16 +295,13 @@ public static function promptSelect(string $text, array $options, $validation =
 
 		CLI::write($text);
 
-		$keyMaxLength = max(array_map('strlen', array_keys($options)));
-		$keys = [];
+		$keyMaxLength = max(array_map('mb_strlen', array_keys($options)));
 		foreach ($options as $key => $description){
-			$keys[] = (string) $key;
 			$name = '  ' . str_pad($key, $keyMaxLength + 2, ' ');
-
 			CLI::write($name . CLI::wrap($description, 125, strlen($name)));
 		}
 
-		return static::prompt(PHP_EOL, $keys, $validation);
+		return static::prompt(PHP_EOL, array_keys($options), $validation);
 	}
 
 	//--------------------------------------------------------------------