Merge pull request #55 from adhocore/54-option-parse-bug

54 option parse bug

Author: adhocore

src/Helper/Normalizer.php

@@ -36,10 +36,12 @@ public function normalizeArgs(array $args): array
         $normalized = [];
 
         foreach ($args as $arg) {
-            if (\preg_match('/^\-\w{2,}/', $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('/^\-\-\w{2,}\=/', $arg)) {
+            } elseif (\preg_match('/^\-\-([^\s\=]+)\=/', $arg)) {
                 $normalized = \array_merge($normalized, explode('=', $arg));
             } else {
                 $normalized[] = $arg;

tests/Input/CommandTest.php

@@ -185,6 +185,21 @@ public function test_user_options()
         $this->assertSame('user', reset($o)->name());
     }
 
+    public function test_complex_value_option()
+    {
+        $p = $this->newCommand()
+            ->option('-l --limit', 'limit', 'intval')
+            ->option('-o --order-by', 'order by');
+
+        // `--order-by="id desc"` in terminal becomes `--order-by=id desc` in PHP.
+        $v = $p->parse(['cmd', '-l=5', '--order-by=id desc'])->values();
+
+        $this->assertArrayHasKey('limit', $v);
+        $this->assertArrayHasKey('orderBy', $v);
+        $this->assertSame(5, $v['limit']);
+        $this->assertSame('id desc', $v['orderBy']);
+    }
+
     public function test_usage()
     {
         $p = $this->newCommand()->usage('Usage: $ cmd [...]');