fix: cli-utils App get opt error

Author: inhere

src/App.php

@@ -95,7 +95,7 @@ public function __construct(array $argv = null)
         // get script file
         $this->script = array_shift($argv);
         // parse flags
-        [$this->args, $this->opts] = Flags::parseArgv($argv);
+        [$this->args, $this->opts] = Flags::parseArgv($argv, ['mergeOpts' => true]);
     }
 
     /**
@@ -207,6 +207,15 @@ protected function handleException(Throwable $e): int
         return $code;
     }
 
+    /**
+     * @param callable $handler
+     * @param array    $config
+     */
+    public function addByConfig(callable $handler, array $config): void
+    {
+        $this->addCommand($config['name'], $handler, $config);
+    }
+
     /**
      * @param string            $command
      * @param callable          $handler

src/Cli.php

@@ -205,7 +205,10 @@ public static function supportColor(): bool
     public static function isSupportColor(): bool
     {
         if (DIRECTORY_SEPARATOR === '\\') {
-            return '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD || false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM')// || 'cygwin' === getenv('TERM')
+            return '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD ||
+                false !== getenv('ANSICON') ||
+                'ON' === getenv('ConEmuANSI') ||
+                'xterm' === getenv('TERM')// || 'cygwin' === getenv('TERM')
                 ;
         }
 

src/Flags.php

@@ -102,6 +102,7 @@ public static function simpleParseArgv(array $argv): array
      * @param array $config
      *
      * @return array [args, short-opts, long-opts]
+     *               If 'mergeOpts' is True, will return [args, opts]
      */
     public static function parseArgv(array $params, array $config = []): array
     {
@@ -113,7 +114,7 @@ public static function parseArgv(array $params, array $config = []): array
             // List of parameters without values(bool option keys)
             'boolOpts'       => [], // ['debug', 'h']
             // Whether merge short-opts and long-opts
-            // 'mergeOpts'      => false,
+            'mergeOpts'      => false,
             // want parsed options. if not empty, will ignore no matched
             'wantParsedOpts' => [],
             // list of option allow array values.
@@ -198,6 +199,10 @@ public static function parseArgv(array $params, array $config = []): array
             }
         }
 
+        if ($config['mergeOpts']) {
+            return [$args, array_merge($sOpts, $lOpts)];
+        }
+
         return [$args, $sOpts, $lOpts];
     }
 

test/FlagsTest.php

@@ -0,0 +1,38 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\CliTest;
+
+use PHPUnit\Framework\TestCase;
+use function explode;
+use Toolkit\Cli\Flags;
+
+/**
+ * Class FlagsTest
+ *
+ * @package Toolkit\CliTest
+ */
+class FlagsTest extends TestCase
+{
+    public function testParseArgv(): void
+    {
+        $rawArgv = explode(' ', 'git:tag --only-tag -d ../view arg0');
+
+        [$args, $sOpts, $lOpts] = Flags::parseArgv($rawArgv);
+
+        $this->assertNotEmpty($args);
+        $this->assertSame('git:tag', $args[0]);
+        $this->assertSame('arg0', $args[1]);
+
+        $this->assertSame('../view', $sOpts['d']);
+        $this->assertTrue($lOpts['only-tag']);
+
+        [$args, $opts] = Flags::parseArgv($rawArgv, ['mergeOpts' => true]);
+
+        $this->assertNotEmpty($args);
+        $this->assertSame('git:tag', $args[0]);
+        $this->assertSame('arg0', $args[1]);
+
+        $this->assertSame('../view', $opts['d']);
+        $this->assertTrue($opts['only-tag']);
+    }
+}