add some new idea for flags parse

Author: inhere

src/Flag/Flags.php

@@ -6,6 +6,8 @@
 use Inhere\Console\Exception\FlagException;
 use Inhere\Console\Flag\Traits\FlagArgumentsTrait;
 use Inhere\Console\Flag\Traits\FlagOptionsTrait;
+use Inhere\Console\Flag\Traits\FlagParsingTrait;
+use Toolkit\Stdlib\Obj\AbstractObj;
 use function array_shift;
 use function count;
 use function ltrim;
@@ -17,10 +19,11 @@
  *
  * @package Inhere\Console\Flag
  */
-class Flags
+class Flags extends AbstractObj
 {
     use FlagArgumentsTrait;
     use FlagOptionsTrait;
+    use FlagParsingTrait;
     use NameAliasTrait;
 
     /**
@@ -33,38 +36,11 @@ class Flags
      */
     private $helpRenderer;
 
-    /**
-     * @var bool
-     */
-    private $parsed = false;
-
     /**
      * @var bool
      */
     private $autoBindArgs = false;
 
-    /**
-     * The raw input args
-     *
-     * @var array
-     */
-    private $rawArgs = [];
-
-    /**
-     * The remaining args on parsed
-     *
-     * @var array
-     */
-    private $args = [];
-
-    /**
-     * @return $this
-     */
-    public static function new(): self
-    {
-        return new self();
-    }
-
     /**
      * @return $this
      */
@@ -143,7 +119,7 @@ public function parse(array $args = null): array
      * - found `-h|--help` flag
      * - found first arg(not an option)
      *
-     * @return array [bool, status]
+     * @return array [goon: bool, status: int]
      */
     protected function parseOne(): array
     {
@@ -166,6 +142,11 @@ protected function parseOne(): array
             return [false, self::STATUS_OK];
         }
 
+        // NOTICE: will stop parse option on found '--'
+        if ($arg === '--') {
+            return [false, self::STATUS_OK];
+        }
+
         $name = ltrim($arg, '-');
 
         // invalid arg. eg: '--' // ignore
@@ -209,7 +190,7 @@ protected function parseOne(): array
             if (!$hasVal && count($this->args) > 0) {
                 // value is next arg
                 $hasVal = true;
-                $ntArg = $this->args[0];
+                $ntArg  = $this->args[0];
 
                 // is not an option value.
                 if ($ntArg[0] === '-') {
@@ -242,7 +223,7 @@ public function reset(bool $clearDefined = false): void
         }
 
         // clear match results
-        $this->parsed = false;
+        $this->parsed  = false;
         $this->matched = [];
         $this->rawArgs = $this->args = [];
     }
@@ -316,22 +297,6 @@ public function setHelpRenderer(callable $helpRenderer): void
         $this->helpRenderer = $helpRenderer;
     }
 
-    /**
-     * @return array
-     */
-    public function getRawArgs(): array
-    {
-        return $this->rawArgs;
-    }
-
-    /**
-     * @return array
-     */
-    public function getArgs(): array
-    {
-        return $this->args;
-    }
-
     /**
      * @return bool
      */
@@ -348,11 +313,4 @@ public function setAutoBindArgs(bool $autoBindArgs): void
         $this->autoBindArgs = $autoBindArgs;
     }
 
-    /**
-     * @return bool
-     */
-    public function isParsed(): bool
-    {
-        return $this->parsed;
-    }
 }

src/Flag/SFlags.php

@@ -0,0 +1,62 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Console\Flag;
+
+use Inhere\Console\Flag\Traits\FlagParsingTrait;
+use Toolkit\Stdlib\Obj\AbstractObj;
+use function array_merge;
+
+/**
+ * Class SFlags
+ * @package Inhere\Console\Flag
+ */
+class SFlags extends AbstractObj
+{
+    use FlagParsingTrait;
+
+    /**
+     * @var array
+     */
+    private $settings = [
+        // List of parameters without values(bool option keys)
+        'boolOpts'       => [], // ['debug', 'h']
+        // Whether merge short-opts and long-opts
+        'mergeOpts'      => false,
+        // Only want parsed options.
+        // if not empty, will ignore no matched
+        'wantParsedOpts' => [],
+        // List of option allow array values.
+        'arrayOpts'      => [], // ['names', 'status']
+        // Special short style
+        // posix: -abc will expand: -a -b -c
+        // unix: -abc  will expand: -a=bc
+        'shortStyle' => 'posix',
+    ];
+
+    /**
+     * @param array $rawArgs
+     * @param array $settings
+     *
+     * @return array
+     */
+    public function parse(array $rawArgs, array $settings = []): array
+    {
+        $this->setSettings($settings);
+    }
+
+    /**
+     * @return array
+     */
+    public function getSettings(): array
+    {
+        return $this->settings;
+    }
+
+    /**
+     * @param array $settings
+     */
+    public function setSettings(array $settings): void
+    {
+        $this->settings = array_merge($this->settings, $settings);
+    }
+}

src/Flag/Traits/FlagParsingTrait.php

@@ -0,0 +1,81 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Console\Flag\Traits;
+
+/**
+ * Trait FlagParsingTrait
+ * @package Inhere\Console\Flag\Traits
+ */
+trait FlagParsingTrait
+{
+    /**
+     * @var bool
+     */
+    private $parsed = false;
+
+    /**
+     * Whether stop parse option on first argument
+     *
+     * @var bool
+     */
+    // private $stopOnNoOption = true;
+    // private $stopOnNoOpt = true;
+    private $stopOnArg = true;
+
+    /**
+     * The remaining args on option parsed
+     *
+     * @var array
+     */
+    private $args = [];
+
+    /**
+     * The raw input args
+     *
+     * @var array
+     */
+    private $rawArgs = [];
+
+    /**
+     * @return array
+     */
+    public function getArgs(): array
+    {
+        return $this->args;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRawArgs(): array
+    {
+        return $this->rawArgs;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isParsed(): bool
+    {
+        return $this->parsed;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isStopOnArg(): bool
+    {
+        return $this->stopOnArg;
+    }
+
+    /**
+     * @param bool $stopOnArg
+     *
+     * @return static
+     */
+    public function setStopOnArg(bool $stopOnArg): self
+    {
+        $this->stopOnArg = $stopOnArg;
+        return $this;
+    }
+}