fix: short option check and sort options map

php-toolkit · Apr 14, 2022 · 62bb1f2 · 62bb1f2
1 parent 190cf6f
commit 62bb1f2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/Contract/ParserInterface.php b/src/Contract/ParserInterface.php
@@ -56,9 +56,7 @@ public function hasShortOpts(): bool;
      * @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{aliases: array, helpType: string} $moreInfo
      *
      * @return self
      */

diff --git a/src/FlagUtil.php b/src/FlagUtil.php
@@ -175,7 +175,7 @@ public static function alignOptions(array $options): array
         }
 
         // check has short option. e.g '-h, --help'
-        $nameString = implode('|', array_keys($options));
+        $nameString = '|' . implode('|', array_keys($options));
         if (preg_match('/\|-\w/', $nameString) !== 1) {
             return $options;
         }

diff --git a/src/Flags.php b/src/Flags.php
@@ -23,6 +23,7 @@
 use function implode;
 use function is_array;
 use function is_string;
+use function ksort;
 use function sprintf;
 use function str_split;
 use function strlen;
@@ -746,9 +747,7 @@ protected function resetArguments(): void
      * @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{aliases: array, helpType: string} $moreInfo
+     * @param array{aliases: array, helpType: string} $moreInfo
      *
      * @return static
      */
@@ -1023,6 +1022,7 @@ public function getOptsHelpLines(): array
             $helpData[$helpName]  = $fmtDesc;
         }
 
+        ksort($helpData);
         return $helpData;
     }
 

diff --git a/src/SFlags.php b/src/SFlags.php
@@ -23,6 +23,7 @@
 use function implode;
 use function is_callable;
 use function is_string;
+use function ksort;
 use function next;
 use function sprintf;
 use function str_split;
@@ -149,9 +150,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
-     *
-     * @psalm-param array{alias: string, helpType: string} $moreInfo
+     * @param array{aliases: array<string>, helpType: string} $moreInfo
      *
      * @return SFlags
      */
@@ -177,6 +176,9 @@ public function addOpt(
         if (isset($moreInfo['helpType'])) {
             $define['helpType'] = $moreInfo['helpType'];
         }
+        if (isset($moreInfo['aliases'])) {
+            $define['aliases'] = $moreInfo['aliases'];
+        }
 
         $this->addOptDefine($define);
         return $this;
@@ -706,7 +708,7 @@ protected function addOptDefine(array $define): void
             $this->opts[$name] = FlagType::fmtBasicTypeValue($type, $envVal);
         }
 
-        // has shorts
+        // has aliases
         if ($define['aliases']) {
             foreach ($define['aliases'] as $alias) {
                 $this->setAlias($name, $alias, true);
@@ -1057,6 +1059,7 @@ public function getOptsHelpLines(): array
             $helpLines[$helpName]  = $fmtDesc;
         }
 
+        ksort($helpLines);
         return $helpLines;
     }