fix some error, add more methods for use flags

Author: inhere

src/Concern/HelperRenderTrait.php

@@ -123,7 +123,7 @@ protected function doBuildHelp(array $argDefines, array $optDefines, bool $withC
             if ($lines) {
                 $indent = Str::repeat(' ', $nameLen);
                 foreach ($lines as $line) {
-                    $buf->writef("     %s%s\n", $indent, $line);
+                    $buf->writef("      %s%s\n", $indent, $line);
                 }
             }
         }
@@ -156,7 +156,7 @@ protected function doBuildHelp(array $argDefines, array $optDefines, bool $withC
             if ($lines) {
                 $indent = Str::repeat(' ', $nameLen);
                 foreach ($lines as $line) {
-                    $buf->writef("     %s%s\n", $indent, $line);
+                    $buf->writef("      %s%s\n", $indent, $line);
                 }
             }
         }
@@ -387,6 +387,14 @@ public function getMoreHelp()
         return $this->moreHelp;
     }
 
+    /**
+     * @param array|string|null $moreHelp
+     */
+    public function setHelp($moreHelp): void
+    {
+        $this->setMoreHelp($moreHelp);
+    }
+
     /**
      * @param array|string|null $moreHelp
      */

src/Concern/RuleParserTrait.php

@@ -248,9 +248,6 @@ protected function parseRule($rule, string $name = '', int $index = 0, bool $isO
 
             // save alias
             $item['shorts'] = $shorts ?: $shortsFromRule;
-            if ($item['required']) {
-                $this->requiredOpts[] = $name;
-            }
         } else {
             $item['index'] = $index;
         }

src/Flags.php

@@ -410,6 +410,7 @@ public function bindingArguments(): self
             throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(' ', $args)));
         }
 
+        $this->remainArgs = $args;
         return $this;
     }
 

src/FlagsParser.php

@@ -90,12 +90,19 @@ abstract class FlagsParser implements ParserInterface
     protected $flags = [];
 
     /**
-     * The remaining raw args, after option parsed from {@see $rawFlags}
+     * The remaining raw args, after option parsed from {@see $flags}
      *
      * @var string[]
      */
     protected $rawArgs = [];
 
+    /**
+     * The overage raw args, after argument parsed from {@see $rawArgs}
+     *
+     * @var string[]
+     */
+    protected $remainArgs = [];
+
     /**
      * The required option names.
      *
@@ -416,6 +423,14 @@ public function getRawArgs(): array
         return $this->rawArgs;
     }
 
+    /**
+     * @return string[]
+     */
+    public function getRemainArgs(): array
+    {
+        return $this->remainArgs;
+    }
+
     /**
      * @return string
      */

src/SFlags.php

@@ -572,6 +572,8 @@ public function bindingArguments(): void
         if ($this->strictMatchArgs && $args) {
             throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(', ', $args)));
         }
+
+        $this->remainArgs = $args;
     }
 
     /**
@@ -636,7 +638,7 @@ protected function checkDefine(array $define, string $mark, string $kind = self:
         $name = $define['name'];
 
         if ($this->isLocked()) {
-            throw new FlagException("flags has been locked, cannot add $kind");
+            throw new FlagException("flags has been locked, cannot add $kind($name)");
         }
 
         if (isset($this->optDefines[$name])) {
@@ -681,6 +683,10 @@ protected function addOptDefine(array $define): void
             $this->opts[$name] = $define['default'] = $default;
         }
 
+        if ($define['required']) {
+            $this->requiredOpts[] = $name;
+        }
+
         // support read value from ENV var
         if ($define['envVar'] && ($envVal = OS::getEnvVal($define['envVar']))) {
             $this->opts[$name] = FlagType::fmtBasicTypeValue($type, $envVal);