call Console::run() within command()

Author: paulbalandan

system/Common.php

@@ -12,6 +12,7 @@
  */
 
 use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\CLI\Console;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Context\Context;
@@ -127,7 +128,7 @@ function command(string $command)
         $regexString = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
         $regexQuoted = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
-        $args   = [];
+        $tokens = [];
         $length = strlen($command);
         $cursor = 0;
 
@@ -140,9 +141,9 @@ function command(string $command)
             if (preg_match('/\s+/A', $command, $match, 0, $cursor)) {
                 // nothing to do
             } elseif (preg_match('/' . $regexQuoted . '/A', $command, $match, 0, $cursor)) {
-                $args[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
+                $tokens[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
             } elseif (preg_match('/' . $regexString . '/A', $command, $match, 0, $cursor)) {
-                $args[] = stripcslashes($match[1]);
+                $tokens[] = stripcslashes($match[1]);
             } else {
                 // @codeCoverageIgnoreStart
                 throw new InvalidArgumentException(sprintf(
@@ -155,39 +156,21 @@ function command(string $command)
             $cursor += strlen($match[0]);
         }
 
-        /** @var array<int|string, string|null> */
-        $params      = [];
-        $command     = array_shift($args);
-        $optionValue = false;
-
-        foreach ($args as $i => $arg) {
-            if (mb_strpos($arg, '-') !== 0) {
-                if ($optionValue) {
-                    // if this was an option value, it was already
-                    // included in the previous iteration
-                    $optionValue = false;
-                } else {
-                    // add to segments if not starting with '-'
-                    // and not an option value
-                    $params[] = $arg;
-                }
-
-                continue;
-            }
-
-            $arg   = ltrim($arg, '-');
-            $value = null;
-
-            if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
-                $value       = $args[$i + 1];
-                $optionValue = true;
+        // Don't show the header as it is not needed when running commands from code.
+        if (! in_array('--no-header', $tokens, true)) {
+            if (! in_array('--', $tokens, true)) {
+                $tokens[] = '--no-header';
+            } else {
+                $index = (int) array_search('--', $tokens, true);
+                array_splice($tokens, $index, 0, '--no-header');
             }
-
-            $params[$arg] = $value;
         }
 
+        // Prepend an application name, as Console expects one.
+        array_unshift($tokens, 'spark');
+
         ob_start();
-        service('commands')->run($command, $params);
+        (new Console())->run($tokens);
 
         return ob_get_clean();
     }

tests/system/Commands/CommandTest.php

@@ -165,11 +165,11 @@ public static function provideCommandParsesArgsCorrectly(): iterable
             ],
             [
                 'reveal seg1 seg2 -opt1 val1 seg3',
-                ['seg1', 'seg2', 'opt1' => 'val1', 'seg3'],
+                ['seg1', 'seg2', 'seg3', 'opt1' => 'val1'],
             ],
             [
                 'reveal as df -gh -jk -qw 12 zx cv',
-                ['as', 'df', 'gh' => null, 'jk' => null, 'qw' => '12', 'zx', 'cv'],
+                ['as', 'df', 'zx', 'cv', 'gh' => null, 'jk' => null, 'qw' => '12'],
             ],
             [
                 'reveal as -df "some stuff" -jk 12 -sd "Some longer stuff" -fg \'using single quotes\'',