fix: check the option value is error

Author: inhere

README.md

@@ -49,6 +49,28 @@ foreach (Clog::getLevelNames() as $level) {
 
 ![clog-example](example/images/clog-example.png)
 
+## Simple console app
+
+```php
+use Toolkit\Cli\CliApp;
+
+// run:
+// php example/mycmd
+// php example/mycmd -i abc --lon def ag1 ag2 ag3
+$cmd = CliApp::new('cmd1', 'this is my cli application');
+$cmd->addOpt('info', 'i', 'Output some information');
+$cmd->addOpt('long-option-name', 'lon', 'this is a long option for command');
+$cmd->addArg('arg1', 'this is first argument');
+
+$cmd->setHandler(function (CliApp $cmd) {
+  var_dump($cmd->getOpts(), $cmd->getArgs(), $cmd->getRemainArgs());
+});
+
+$cmd->run();
+```
+
+![clog-example](example/images/cli-app.png)
+
 ## Terminal control
 
 examples:

example/cli-app.png

@@ -38,21 +38,26 @@ public static function buildOptHelpName(array $names): string
     /**
      * check input is valid option value
      *
-     * @param mixed $val
+     * @param string|bool $val
      *
      * @return bool
      */
-    public static function isOptionValue(mixed $val): bool
+    public static function isOptionValue(string|bool $val): bool
     {
         if ($val === false) {
             return false;
         }
 
-        // if is: '', 0 || is not option name
+        // if is '', 0 || is not option name
         if (!$val || $val[0] !== '-') {
             return true;
         }
 
+        // is option name.
+        if (ltrim($val, '-')) {
+            return false;
+        }
+
         // ensure is option value.
         if (!str_contains($val, '=')) {
             return true;
@@ -189,7 +194,7 @@ public static function parseArgv(array $params, array $config = []): array
 
                 // long-opt: (--<opt>)
                 if (str_starts_with($option, '-')) {
-                    $option = substr($option, 1);
+                    $option = $pn;
                     $isLong = true;
 
                     // long-opt: value specified inline (--<opt>=<value>)
@@ -207,7 +212,6 @@ public static function parseArgv(array $params, array $config = []): array
 
                 // next elem is value. fix: allow empty string ''
                 if ($value === true && !isset($boolOpts[$option]) && self::isOptionValue($nxt)) {
-                    // list(,$val) = each($params);
                     $value = $nxt;
                     next($params);
 

example/images/cli-app.png

@@ -10,8 +10,8 @@
 namespace Toolkit\CliTest;
 
 use PHPUnit\Framework\TestCase;
-use Toolkit\Cli\Color;
 use Toolkit\Cli\Cli;
+use Toolkit\Cli\Color;
 
 /**
  * Class ColorTest
@@ -23,6 +23,7 @@ class ColorTest extends TestCase
     public function testRender(): void
     {
         if (!Cli::isSupportColor()) {
+            $this->assertFalse(Color::isShouldRenderColor());
             return;
         }
 

src/Helper/FlagHelper.php

@@ -11,6 +11,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Toolkit\Cli\Helper\FlagHelper;
+use function printf;
 
 /**
  * class FlagHelperTest
@@ -24,6 +25,17 @@ public function testIsValidArgName1(): void
         $this->assertFalse(FlagHelper::isValidName('/path/to'));
     }
 
+    public function testIsOptionValue(): void
+    {
+        $this->assertTrue(FlagHelper::isOptionValue('arg0'));
+        $this->assertTrue(FlagHelper::isOptionValue('arg0-'));
+        $this->assertTrue(FlagHelper::isOptionValue('-'));
+        $this->assertTrue(FlagHelper::isOptionValue('--'));
+
+        $this->assertFalse(FlagHelper::isOptionValue('-d'));
+        $this->assertFalse(FlagHelper::isOptionValue('--opt'));
+    }
+
     public function testIsValidName(): void
     {
         $tests = [
@@ -48,9 +60,12 @@ public function testIsValidName(): void
             $this->assertSame($ok, FlagHelper::isValidName((string)$name));
         }
     }
+
     public function testParseArgv(): void
     {
-        $rawArgv = explode(' ', 'git:tag --only-tag -d ../view arg0');
+        $str = 'git:tag --only-tag -d ../view arg0';
+        printf("parse: %s\n", $str);
+        $rawArgv = explode(' ', $str);
 
         [$args, $sOpts, $lOpts] = FlagHelper::parseArgv($rawArgv);