fix: not format value type on bind arg value in the SFlags

Author: inhere

src/Contract/ParserInterface.php

@@ -169,6 +169,13 @@ public function hasInputArg($nameOrIndex): bool;
      */
     public function getArgIndex($nameOrIndex): int;
 
+    /**
+     * @param string|int $nameOrIndex
+     *
+     * @return array
+     */
+    public function getArgDefine($nameOrIndex): array;
+
     /**
      * Get an argument value by name
      *

src/Flag/Argument.php

@@ -45,6 +45,14 @@ public function setName(string $name): void
         }
     }
 
+    public function toArray(): array
+    {
+        $info = parent::toArray();
+
+        $info['index'] = $this->index;
+        return $info;
+    }
+
     /**
      * @return string
      */

src/Flags.php

@@ -632,17 +632,24 @@ public function getArg($nameOrIndex, $default = null)
      */
     public function getArgument($nameOrIndex): ?Argument
     {
-        if (is_string($nameOrIndex)) {
-            if (!isset($this->name2index[$nameOrIndex])) {
-                return null;
-            }
+        $index = $this->getArgIndex($nameOrIndex);
 
-            $index = $this->name2index[$nameOrIndex];
-        } else {
-            $index = (int)$nameOrIndex;
+        return $this->arguments[$index] ?? null;
+    }
+
+    /**
+     * @param string|int $nameOrIndex
+     *
+     * @return array
+     */
+    public function getArgDefine($nameOrIndex): array
+    {
+        $index = $this->getArgIndex($nameOrIndex);
+        if ($index < 0) {
+            throw new FlagException("flag argument '$nameOrIndex' is undefined");
         }
 
-        return $this->arguments[$index] ?? null;
+        return $this->arguments[$index]->toArray();
     }
 
     /**

src/SFlags.php

@@ -584,6 +584,8 @@ public function bindingArguments(): void
      */
     protected function collectArgValue($value, int $index, bool $isArray, array $define): void
     {
+        $value = FlagType::fmtBasicTypeValue($define['type'], $value);
+
         // has validator
         if ($cb = $define['validator']) {
             $name = $define['name'] ?: "#$index";
@@ -1005,7 +1007,21 @@ public function hasDefineArg($nameOrIndex): bool
     {
         $index = $this->getArgIndex($nameOrIndex);
 
-        return isset($this->argDefines[$index]);
+        return $index > -1;
+    }
+
+    /**
+     * @param string|int $nameOrIndex
+     * @return array
+     */
+    public function getArgDefine($nameOrIndex): array
+    {
+        $index = $this->getArgIndex($nameOrIndex);
+        if ($index < 0) {
+            throw new FlagException("flag argument '$nameOrIndex' is undefined");
+        }
+
+        return $this->argDefines[$index];
     }
 
     /**

test/BaseFlagsTestCase.php

@@ -77,7 +77,7 @@ protected function bindingOptsAndArgs(FlagsParser $fs): void
             's'               => 'string;an string option only short name',
         ];
         $argRules = [
-            'intarg' => 'int;an int argument',
+            'int-arg' => 'int;an int argument',
             'str-arg' => "an string argument,\nand has multi line desc",
         ];
 

test/FlagsParserTest.php

@@ -33,6 +33,7 @@ private function doCheckBasic(FlagsParser $fs): void
         $this->assertFalse($fs->hasArg('not-exist'));
         $this->assertTrue($fs->isNotEmpty());
         $this->assertFalse($fs->hasShortOpts());
+        $this->assertNotEmpty($fs->getArgDefine('github'));
 
         $fs->setOptRules([
             '-n,--name' => 'an string option'
@@ -41,9 +42,28 @@ private function doCheckBasic(FlagsParser $fs): void
         $this->assertTrue($fs->isNotEmpty());
         $this->assertTrue($fs->hasShortOpts());
         $this->assertTrue($fs->hasOpt('name'));
+        $this->assertFalse($fs->hasInputOpt('name'));
         $this->assertFalse($fs->hasOpt('not-exist'));
     }
 
+    public function testGetOptAndGetArg(): void
+    {
+        $this->runTestsWithParsers(function (FlagsParser $fs) {
+            $this->bindingOptsAndArgs($fs);
+            $this->doTestGetOptAndGetArg($fs);
+        });
+    }
+
+    private function doTestGetOptAndGetArg(FlagsParser $fs): void
+    {
+        // int type
+        $ok = $fs->parse(['--str-opt1', 'val1', '--int-opt', '335', '233']);
+        $this->assertTrue($ok);
+        $this->assertSame(335, $fs->getOpt('int-opt'));
+        $this->assertSame(233, $fs->getArg('int-arg'));
+        $fs->resetResults();
+    }
+
     public function testStopOnTwoHl(): void
     {
         $this->runTestsWithParsers(function (FlagsParser $fs) {