up: support more custom setting for add arg flag

Author: inhere

src/Contract/ParserInterface.php

@@ -80,9 +80,7 @@ public function addOpt(
      * @param string $type The argument data type. default is: string. {@see FlagType}
      * @param bool   $required
      * @param mixed|null $default
-     * @param array  $moreInfo
-     *
-     * @psalm-param array{helpType: string} $moreInfo
+     * @param array{helpType: string, validator: callable|ValidatorInterface}  $moreInfo
      *
      * @return self
      */

src/Flag/AbstractFlag.php

@@ -16,6 +16,7 @@
 use Toolkit\PFlag\FlagsParser;
 use Toolkit\PFlag\FlagType;
 use Toolkit\PFlag\FlagUtil;
+use Toolkit\PFlag\Validator\CondValidator;
 use Toolkit\Stdlib\Obj;
 use Toolkit\Stdlib\OS;
 use function is_array;
@@ -25,7 +26,7 @@
 
 /**
  * Class Flag
- * - - definition a input flag item(option|argument)
+ * - definition a input flag item(option|argument)
  *
  * @package Toolkit\PFlag\Flag
  */
@@ -202,6 +203,11 @@ public function setValue(mixed $value): void
         // has validator
         $cb = $this->validator;
         if ($cb && is_scalar($value)) {
+            /** @see CondValidator::setFs() */
+            // if (method_exists($cb, 'setFs')) {
+            //     $cb->setFs($this);
+            // }
+
             $ok  = true;
             $ret = $cb($value, $this->name);
 
@@ -410,15 +416,19 @@ public function getHelpType(bool $useTypeOnEmpty = false): string
      */
     public function setHelpType(string $helpType): void
     {
-        $this->helpType = $helpType;
+        if ($helpType) {
+            $this->helpType = $helpType;
+        }
     }
 
     /**
      * @param callable|null $validator
      */
     public function setValidator(?callable $validator): void
     {
-        $this->validator = $validator;
+        if ($validator) {
+            $this->validator = $validator;
+        }
     }
 
     /**

src/FlagUtil.php

@@ -85,7 +85,7 @@ public static function filterOptionName(string $val): string
      */
     public static function getMaxInt(int $val1, int $val2): int
     {
-        return $val1 > $val2 ? $val1 : $val2;
+        return max($val1, $val2);
     }
 
     /**

src/Flags.php

@@ -11,6 +11,7 @@
 
 use InvalidArgumentException;
 use RuntimeException;
+use Toolkit\PFlag\Contract\ValidatorInterface;
 use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\Exception\FlagParseException;
 use Toolkit\PFlag\Flag\Argument;
@@ -437,7 +438,7 @@ public function isNotEmpty(): bool
      * @param string     $type The argument data type. default is: string. {@see FlagType}
      * @param bool       $required
      * @param mixed|null $default
-     * @param array      $moreInfo
+     * @param array{helpType: string, validator: callable|ValidatorInterface}  $moreInfo
      *
      * @return static
      */
@@ -450,6 +451,8 @@ public function addArg(
         array $moreInfo = []
     ): static {
         $arg = Argument::new($name, $desc, $type, $required, $default);
+        $arg->setHelpType($moreInfo['helpType'] ?? '');
+        $arg->setValidator($moreInfo['validator'] ?? null);
 
         $this->addArgument($arg);
         return $this;

src/SFlags.php

@@ -10,6 +10,7 @@
 namespace Toolkit\PFlag;
 
 use InvalidArgumentException;
+use Toolkit\PFlag\Contract\ValidatorInterface;
 use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\Exception\FlagParseException;
 use Toolkit\Stdlib\OS;
@@ -186,9 +187,7 @@ public function addOpt(
      * @param string $type The argument data type. default is: string. {@see FlagType}
      * @param bool $required
      * @param mixed|null $default
-     * @param array $moreInfo
-     *
-     * @psalm-param array{alias: string, helpType: string} $moreInfo
+     * @param array{helpType: string, validator: callable|ValidatorInterface}  $moreInfo
      *
      * @return SFlags
      */
@@ -214,6 +213,10 @@ public function addArg(
             $define['helpType'] = $moreInfo['helpType'];
         }
 
+        if (isset($moreInfo['validator'])) {
+            $define['validator'] = $moreInfo['validator'];
+        }
+
         $this->addArgDefine($define);
         return $this;
     }

src/Validator/CondValidator.php

@@ -27,7 +27,7 @@ abstract class CondValidator extends AbstractValidator
      *
      * @var callable(FlagsParser):bool
      */
-    protected $cond;
+    protected $condFn;
 
     /**
      * @param mixed  $value
@@ -37,7 +37,7 @@ abstract class CondValidator extends AbstractValidator
      */
     public function __invoke(mixed $value, string $name): bool
     {
-        $condFn = $this->cond;
+        $condFn = $this->condFn;
         if ($condFn && !$condFn($this->fs)) {
             return true;
         }
@@ -62,13 +62,13 @@ public function setFs(FlagsParser $fs): void
     }
 
     /**
-     * @param mixed $cond
+     * @param mixed $condFn
      *
      * @return static
      */
-    public function setCond(mixed $cond): self
+    public function setCondFn(mixed $condFn): self
     {
-        $this->cond = $cond;
+        $this->condFn = $condFn;
         return $this;
     }
 }

src/Validator/FuncValidator.php

@@ -15,8 +15,7 @@
 class FuncValidator extends AbstractValidator
 {
     /**
-     * @var callable
-     * @psalm-var callable(mixed, string): bool
+     * @var callable(mixed, string): bool
      */
     protected $func;