Fix CLI parsing to not choke on unexpected input

phar-io · Feb 25, 2016 · c8638c5 · c8638c5
1 parent 86f558b
commit c8638c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/commands/CommandLocator.php b/src/commands/CommandLocator.php
@@ -26,6 +26,8 @@ public function __construct(Factory $factory) {
     public function getCommandForRequest(CLI\Request $request) {
         $command = $request->getCommand();
         switch ($command) {
+
+            case '':
             case 'help': {
                 return $this->factory->getHelpCommand();
             }

diff --git a/src/shared/cli/Options.php b/src/shared/cli/Options.php
@@ -38,8 +38,12 @@ private function parseOptions(array $options) {
                     $this->options[$key] = $value;
                     continue;
                 }
-                $this->options[ltrim($option, '-')] = $options[$idx + 1];
-                $skipNext = true;
+                if (isset($options[$idx + 1])) {
+                    $this->options[ltrim($option, '-')] = $options[$idx + 1];
+                    $skipNext = true;
+                } else {
+                    $this->options[ltrim($option, '-')] = true;
+                }
                 continue;
             }
             if (strpos($option, '-') === 0) {

diff --git a/src/shared/cli/Request.php b/src/shared/cli/Request.php
@@ -66,7 +66,7 @@ private function parse() {
      */
     private function extractOptions() {
         $opts = [];
-        while (strpos($this->argv[0], '-') === 0) {
+        while (count($this->argv) && strpos($this->argv[0][0], '-') === 0) {
             $opts[] = array_shift($this->argv);
         }
         return $opts;