fix an test error

Author: inhere

src/Flag/Option.php

@@ -9,11 +9,14 @@
 
 namespace Toolkit\PFlag\Flag;
 
+use Toolkit\Cli\Helper\FlagHelper;
+use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\FlagType;
 use function array_filter;
+use function array_map;
+use function array_unshift;
 use function implode;
-use function rtrim;
-use function trim;
+use function strlen;
 
 /**
  * Class Option
@@ -65,8 +68,16 @@ public function getAlias(): string
      */
     public function setAlias(string $alias): void
     {
-        if ($alias = trim($alias)) {
+        if (!$alias) {
+            return;
+        }
+
+        if (!FlagHelper::isValidName($alias)) {
+            throw new FlagException('invalid option alias: ' . $alias);
+        }
 
+        if (strlen($alias) < 2) {
+            throw new FlagException('flag option alias length cannot be < 2 ');
         }
 
         $this->alias = $alias;
@@ -103,25 +114,34 @@ public function getShorts(): array
      */
     public function setShorts(array $shorts): void
     {
-        $this->shorts   = $shorts;
-        $this->shortcut = '-' . rtrim(implode(', -', $shorts));
+        if ($shorts) {
+            $this->shorts   = $shorts;
+            $this->shortcut = '-' . implode(', -', $shorts);
+        }
     }
 
     /**
      * @return string
      */
     public function getHelpName(): string
     {
-        $shorts = $this->shortcut;
-
         $names = [];
         if ($this->alias) {
             $names[] = $this->alias;
         }
 
         $names[] = $this->name;
 
-        return '-' . rtrim(implode(', -', $shorts));
+        // prepend '--'
+        $nodes = array_map(static function (string $name) {
+            return (strlen($name) > 1 ? '--' : '-') . $name;
+        }, $names);
+
+        if ($this->shortcut) {
+            array_unshift($nodes, $this->shortcut);
+        }
+
+        return implode(', ', $nodes);
     }
 
     /**

test/Flag/OptionTest.php

@@ -20,6 +20,10 @@ public function testBasic(): void
 
         $opt->setAlias('n1');
         $this->assertSame('n1', $opt->getAlias());
+        $this->assertSame('--n1, --name', $opt->getHelpName());
+
+        $opt->setShortcut('n');
+        $this->assertSame('-n, --n1, --name', $opt->getHelpName());
 
         $opt->setDefault(89);
         $this->assertTrue($opt->hasDefault());
@@ -48,5 +52,7 @@ public function testShortcut(): void
             $this->assertSame(['a', 'b'], $opt->getShorts());
             $this->assertSame('-a, -b', $opt->getShortcut());
         }
+
+        $this->assertSame('-a, -b, --name', $opt->getHelpName());
     }
 }

test/ValidatorTest.php

@@ -27,7 +27,7 @@ public function testNameValidator(): void
         $this->assertTrue($v('inhere', 'test'));
 
         $this->expectException(FlagException::class);
-        $this->expectExceptionMessage("flag 'test' value should match: ^\w+$");
+        $this->expectExceptionMessage("flag 'test' value should match: " . NameValidator::DEFAULT_REGEX);
         $v(' inhere ', 'test');
     }
 }