Fix reading short and long optional parameters

sebastianbergmann · Feb 25, 2017 · 2e4abfd · 2e4abfd
1 parent 11ef962
commit 2e4abfd
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/Util/Getopt.php b/src/Util/Getopt.php
@@ -90,20 +90,17 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args)
             }
 
             if (strlen($spec) > 1 && $spec[1] == ':') {
-                if (strlen($spec) > 2 && $spec[2] == ':') {
-                    if ($i + 1 < $argLen) {
-                        $opts[] = [$opt, substr($arg, $i + 1)];
-                        break;
-                    }
-                } else {
-                    if ($i + 1 < $argLen) {
-                        $opts[] = [$opt, substr($arg, $i + 1)];
-                        break;
-                    } elseif (false === $opt_arg = next($args)) {
+                if ($i + 1 < $argLen) {
+                    $opts[] = [$opt, substr($arg, $i + 1)];
+                    break;
+                }
+                if (!(strlen($spec) > 2 && $spec[2] == ':')) {
+                    if (false === $opt_arg = current($args)) {
                         throw new Exception(
                             "option requires an argument -- $opt"
                         );
                     }
+                    next($args);
                 }
             }
 
@@ -145,11 +142,12 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
             if (substr($long_opt, -1) == '=') {
                 if (substr($long_opt, -2) != '==') {
                     if (!strlen($opt_arg)) {
-                        if (false === $opt_arg = next($args)) {
+                        if (false === $opt_arg = current($args)) {
                             throw new Exception(
                                 "option --$opt requires an argument"
                             );
                         }
+                        next($args);
                     }
                 }
             } elseif ($opt_arg) {