New features and some fixes - Variadic arguments flexibility and grouping, Negative numbers

composer.json

@@ -40,10 +40,12 @@
         "php": ">=8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.0",
+        "phpstan/phpstan": "^1.10"
     },
     "scripts": {
         "test": "phpunit",
+        "testdox": "phpunit --testdox --colors=always",
         "test:cov": "phpunit --coverage-text --coverage-clover coverage.xml --coverage-html vendor/cov",
         "cs:sniff": "tools/phpcs",
         "cs:fix": "tools/phpcbf"

src/Application.php

@@ -60,7 +60,7 @@ class Application
     /** @var callable The callable to perform exit */
     protected $onExit;
 
-    /** @var callable The callable to catch exception, receives exception & exit code, may rethrow exception or may exit program */
+    /** @var null|callable The callable to catch exception, receives exception & exit code, may rethrow exception or may exit program */
     protected $onException = null;
 
     public function __construct(protected string $name, protected string $version = '0.0.1', callable $onExit = null)

src/Helper/Normalizer.php

@@ -14,15 +14,9 @@
 use Ahc\Cli\Input\Option;
 use Ahc\Cli\Input\Parameter;
 
-use function array_merge;
-use function explode;
-use function implode;
-use function ltrim;
-use function preg_match;
-use function str_split;
-
 /**
  * Internal value &/or argument normalizer. Has little to no usefulness as public api.
+ * Currently used by Input\Parser. To "normalize" values before setting them to parameters.
  *
  * @author  Jitendra Adhikari <[email protected]>
  * @license MIT
@@ -31,46 +25,26 @@
  */
 class Normalizer
 {
-    /**
-     * Normalize argv args. Like splitting `-abc` and `--xyz=...`.
-     */
-    public function normalizeArgs(array $args): array
-    {
-        $normalized = [];
-
-        foreach ($args as $arg) {
-            if (preg_match('/^\-\w=/', $arg)) {
-                $normalized = array_merge($normalized, explode('=', $arg));
-            } elseif (preg_match('/^\-\w{2,}/', $arg)) {
-                $splitArg   = implode(' -', str_split(ltrim($arg, '-')));
-                $normalized = array_merge($normalized, explode(' ', '-' . $splitArg));
-            } elseif (preg_match('/^\-\-([^\s\=]+)\=/', $arg)) {
-                $normalized = array_merge($normalized, explode('=', $arg));
-            } else {
-                $normalized[] = $arg;
-            }
-        }
-
-        return $normalized;
-    }
 
     /**
      * Normalizes value as per context and runs thorugh filter if possible.
+     * 
+     * @param Parameter $parameter
+     * @param string|null $value
+     * 
+     * @return mixed
      */
-    public function normalizeValue(Parameter $parameter, string $value = null): mixed
+    public function normalizeValue(Parameter $parameter, ?string $value = null): mixed
     {
         if ($parameter instanceof Option && $parameter->bool()) {
             return !$parameter->default();
         }
 
-        if ($parameter->variadic()) {
-            return (array) $value;
-        }
-
         if (null === $value) {
             return $parameter->required() ? null : true;
         }
 
         return $parameter->filter($value);
     }
+
 }

src/Helper/OutputHelper.php

@@ -14,7 +14,6 @@
 use Ahc\Cli\Exception;
 use Ahc\Cli\Input\Argument;
 use Ahc\Cli\Input\Command;
-use Ahc\Cli\Input\Groupable;
 use Ahc\Cli\Input\Option;
 use Ahc\Cli\Input\Parameter;
 use Ahc\Cli\Output\Writer;
@@ -77,7 +76,7 @@ public function printTrace(Throwable $e): void
 
         $this->writer->colors(
             "{$eClass} <red>{$e->getMessage()}</end><eol/>" .
-            "(thrown in <yellow>{$e->getFile()}</end><white>:{$e->getLine()})</end>"
+            "(thrown in <yellow>{$e->getFile()}</end><white>:{$e->getLine()})</end><eol/>"
         );
 
         // @codeCoverageIgnoreStart
@@ -87,7 +86,7 @@ public function printTrace(Throwable $e): void
         }
         // @codeCoverageIgnoreEnd
 
-        $traceStr = '<eol/><eol/><bold>Stack Trace:</end><eol/><eol/>';
+        $traceStr = '<eol/><bold>Stack Trace:</end><eol/><eol/>';
 
         foreach ($e->getTrace() as $i => $trace) {
             $trace += ['class' => '', 'type' => '', 'function' => '', 'file' => '', 'line' => '', 'args' => []];
@@ -279,8 +278,11 @@ protected function sortItems(array $items, &$max = 0): array
         $max = max(array_map(fn ($item) => strlen($this->getName($item)), $items));
 
         uasort($items, static function ($a, $b) {
-            $aName = $a instanceof Groupable ? $a->group() . $a->name() : $a->name();
-            $bName = $b instanceof Groupable ? $b->group() . $b->name() : $b->name();
+            // Fix for:
+            // Was groupable, but its problematic since groupable does not have name.
+            // Only commands have groupable. So we need to check instanceof Command.
+            $aName = $a instanceof Command ? $a->group() . $a->name() : $a->name();
+            $bName = $b instanceof Command ? $b->group() . $b->name() : $b->name();
 
             return $aName <=> $bName;
         });

src/Helper/Polyfill.php

@@ -0,0 +1,48 @@
+<?php 
+
+/*
+ * This file is part of the PHP-CLI package.
+ *
+ * (c) Jitendra Adhikari <[email protected]>
+ *     <https://github.com/adhocore>
+ *
+ * Licensed under MIT license.
+ */
+
+namespace Ahc\Cli\Helper;
+
+/**
+ * Polyfill class is for using newer php syntax 
+ * and still maintaining backword compatibility
+ * 
+ * @author  Shlomo Hassid <[email protected]>
+ * @license MIT
+ *
+ * @link    https://github.com/adhocore/cli
+ */
+class Polyfill
+{
+    public static function str_contains($haystack, $needle)
+    {
+        if (function_exists('str_contains')) {
+            return str_contains($haystack, $needle);
+        }
+        return $needle !== '' && strpos($haystack, $needle) !== false;
+    }
+
+    public static function str_starts_with($haystack, $needle)
+    {
+        if (function_exists('str_starts_with')) {
+            return str_starts_with($haystack, $needle);
+        }
+        return (string) $needle !== '' && strncmp($haystack, $needle, strlen($needle)) === 0;
+    }
+
+    public static function str_ends_with($haystack, $needle)
+    {
+        if (function_exists('str_ends_with')) {
+            return str_ends_with($haystack, $needle);
+        }
+        return $needle !== '' && substr($haystack, -strlen($needle)) === (string) $needle;
+    }
+}

src/Input/Command.php

@@ -12,7 +12,6 @@
 namespace Ahc\Cli\Input;
 
 use Ahc\Cli\Application as App;
-use Ahc\Cli\Exception\InvalidParameterException;
 use Ahc\Cli\Exception\RuntimeException;
 use Ahc\Cli\Helper\InflectsString;
 use Ahc\Cli\Helper\OutputHelper;
@@ -54,8 +53,6 @@ class Command extends Parser implements Groupable
 
     private array $_events = [];
 
-    private bool $_argVariadic = false;
-
     /**
      * Constructor.
      *
@@ -173,14 +170,6 @@ public function argument(string $raw, string $desc = '', $default = null): self
     {
         $argument = new Argument($raw, $desc, $default);
 
-        if ($this->_argVariadic) {
-            throw new InvalidParameterException('Only last argument can be variadic');
-        }
-
-        if ($argument->variadic()) {
-            $this->_argVariadic = true;
-        }
-
         $this->register($argument);
 
         return $this;

src/Input/Option.php

@@ -11,6 +11,7 @@
 
 namespace Ahc\Cli\Input;
 
+use Ahc\Cli\Helper\Polyfill;
 use function preg_match;
 use function preg_split;
 use function str_replace;
@@ -30,6 +31,10 @@ class Option extends Parameter
 
     protected string $long = '';
 
+    // We export those to be used while parsing:
+    public const SIGN_SHORT = '-'; 
+    public const SIGN_LONG  = '--';
+
     /**
      * {@inheritdoc}
      */
@@ -41,16 +46,35 @@ protected function parse(string $raw): void
             $this->default = true;
         }
 
-        $parts = preg_split('/[\s,\|]+/', $raw);
-
-        $this->short = $this->long = $parts[0];
-        if (isset($parts[1])) {
-            $this->long = $parts[1];
-        }
+        [$this->short, $this->long] = $this->namingParts($raw);
 
-        $this->name = str_replace(['--', 'no-', 'with-'], '', $this->long);
+        $this->name = str_replace(
+            [self::SIGN_LONG, 'no-', 'with-'], '', 
+            $this->long
+        );
     }
 
+    /**
+     * parses a raw option declaration string
+     * and return its parts
+     * @param string $raw 
+     * @return array 2 elements, short and long name
+     */
+    protected function namingParts(string $raw): array {
+        $short = '';
+        $long  = '';
+        foreach (preg_split('/[\s,\|]+/', $raw) as $part) { 
+            if (Polyfill::str_starts_with($part, self::SIGN_LONG)) {
+                $long = $part;
+            } elseif (Polyfill::str_starts_with($part, self::SIGN_SHORT)) {
+                $short = $part;
+            }
+        }
+        return [
+            $short, 
+            $long ?: self::SIGN_LONG.ltrim($short, self::SIGN_SHORT)
+        ];
+    }
     /**
      * Get long name.
      */