update: add an util methods, update readme

Author: inhere

README.md

@@ -317,6 +317,7 @@ $app->add('test2', function (FlagsParser $fs) {
     ]
 ]);
 
+// fn - required php 7.4+
 $app->add('show-err', fn() => throw new RuntimeException('test show exception'));
 
 $app->run();

README.zh-CN.md

@@ -351,7 +351,6 @@ $arrArg = $fs->getArg(1); // array{"arr0", "arr1"}
 // get value by name
 $arrArg = $fs->getArg('arrArg'); // array{"arr0", "arr1"}
 ```
-
 -----------
 
 ## 创建简单的独立命令或应用程序
@@ -445,6 +444,7 @@ $app->add('test2', function (FlagsParser $fs) {
     ]
 ]);
 
+// fn - required php 7.4+
 $app->add('show-err', fn() => throw new RuntimeException('test show exception'));
 
 $app->run();

src/FlagUtil.php

@@ -2,6 +2,7 @@
 
 namespace Toolkit\PFlag;
 
+use function array_keys;
 use function array_map;
 use function array_shift;
 use function basename;
@@ -11,7 +12,9 @@
 use function is_numeric;
 use function ltrim;
 use function preg_match;
+use function str_replace;
 use function strlen;
+use function trim;
 
 /**
  * class FlagUtil
@@ -157,4 +160,42 @@ public static function escapeToken(string $token): string
     {
         return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
     }
+
+    /**
+     * Align command option names.
+     *
+     * @param array $options
+     *
+     * @return array
+     */
+    public static function alignOptions(array $options): array
+    {
+        if (!$options) {
+            return [];
+        }
+
+        // check has short option. e.g '-h, --help'
+        $nameString = implode('|', array_keys($options));
+        if (preg_match('/\|-\w/', $nameString) !== 1) {
+            return $options;
+        }
+
+        $formatted = [];
+        foreach ($options as $name => $des) {
+            if (!$name = trim($name, ', ')) {
+                continue;
+            }
+
+            // start with '--', padding length equals to '-h, '
+            if (isset($name[1]) && $name[1] === '-') {
+                $name = '    ' . $name;
+            } else {
+                $name = str_replace([',-'], [', -'], $name);
+            }
+
+            $formatted[$name] = $des;
+        }
+
+        return $formatted;
+    }
 }

test/CliAppTest.php

@@ -4,6 +4,7 @@
 
 use Toolkit\PFlag\CliApp;
 use Toolkit\Stdlib\Obj\DataObject;
+use const PHP_VERSION_ID;
 
 /**
  * class CliAppTest
@@ -15,11 +16,21 @@ class CliAppTest extends BaseFlagsTestCase
     private function initApp(CliApp $app): DataObject
     {
         $buf = DataObject::new();
-        $app->add('test1', fn() => $buf->set('key', 'in test1'));
+
+        if (PHP_VERSION_ID > 70400) {
+            $app->add('test1', fn() => $buf->set('key', 'in test1'));
+        } else {
+            $app->add('test1', function() use($buf) {
+                $buf->set('key', 'in test2');
+            });
+        }
+
         $app->addCommands([
             'test2' => [
                 'desc'   => 'desc for test2 command',
-                'handler' => fn() => $buf->set('key', 'in test2'),
+                'handler' => function() use($buf) {
+                    $buf->set('key', 'in test2');
+                },
                 'options' => [
                     'opt1' => 'string;a string opt1 for command test2',
                     'opt2' => 'int;a int opt2 for command test2',