Merge pull request #18 from rlerdorf/patch-1

Fix 2 bugs
etsy · Sep 25, 2017 · 6a360e0 · 6a360e0
2 parents 3bf1b90 + 86f30b4
commit 6a360e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Util/PHPOptions/Options.php b/src/Util/PHPOptions/Options.php
@@ -183,8 +183,8 @@ function _getopt_do_longs($opts, $opt, $longopts, $args) {
     if ($i === False) {
         $optarg = Null;
     } else {
-        $opt = substr($opt,0,$i);
         $optarg = substr($opt,$i+1);
+        $opt = substr($opt,0,$i);
     }
 
     list($has_arg, $opt) = _getopt_long_has_args($opt, $longopts);
@@ -514,7 +514,7 @@ public function parse($args) {
                 if (! is_array($opt[$k])) {
                     $opt[$k] = array($opt[$k], $val);
                 } else {
-                    $opt[$k][] = $val;
+                    $opt[$k] = array_merge($opt[$k],[$val]);
                 }
             } else {
                 $opt[$k] = $val;