fixed optionsFirst bug

docopt · Apr 3, 2013 · 3528080 · 3528080
1 parent e4c9420
commit 3528080
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/docopt.php b/src/docopt.php
@@ -987,7 +987,7 @@ function parse_argv($tokens, \ArrayIterator $options, $optionsFirst=false)
                 $parsed = array_merge($parsed, parse_shorts($tokens, $options));
             }
             elseif ($optionsFirst) {
-                return array_merge($parsed, array_map(function($v) { return new Argument(null, $v); }, iterator_to_array($tokens)));
+                return array_merge($parsed, array_map(function($v) { return new Argument(null, $v); }, $tokens->left()));
             }
             else {
                 $parsed[] = new Argument(null, $tokens->move());

diff --git a/test/lib/PythonPortedTest.php b/test/lib/PythonPortedTest.php
@@ -829,16 +829,26 @@ public function testIssue59()
 
     public function testOptionsFirst()
     {
-        $this->assertEquals($this->docopt('usage: prog [--opt] [<args>...]',
-                      '--opt this that')->args, array('--opt'=>true,
-                                             '<args>'=>array('this', 'that')));
-        $this->assertEquals($this->docopt('usage: prog [--opt] [<args>...]',
-                      'this that --opt')->args, array('--opt'=>true,
-                                             '<args>'=>array('this', 'that')));
-        $this->assertEquals($this->docopt('usage: prog [--opt] [<args>...]',
-                      'this that --opt',
-                      array('optionsFirst'=>true))->args, array('--opt'=>false,
-                                              '<args>'=>array('this', 'that', '--opt')));
+        $this->assertEquals(
+            $this->docopt('usage: prog [--opt] [<args>...]', '--opt this that')->args, 
+            array('--opt'=>true, '<args>'=>array('this', 'that'))
+        );
+
+        $this->assertEquals(
+            $this->docopt('usage: prog [--opt] [<args>...]', 'this that --opt')->args,
+            array('--opt'=>true, '<args>'=>array('this', 'that'))
+        );
+
+        $this->assertEquals(
+            $this->docopt('usage: prog [--opt] [<args>...]', 'this that --opt', array('optionsFirst'=>true))->args, 
+            array('--opt'=>false, '<args>'=>array('this', 'that', '--opt'))
+        );
+
+        // found issue with PHP version in this situation
+        $this->assertEquals(
+            $this->docopt('usage: prog [--opt=<val>] [<args>...]', ' --opt=foo this that --opt', array('optionsFirst'=>true))->args, 
+            array('--opt'=>'foo', '<args>'=>array('this', 'that', '--opt'))
+        );
     }
 
     public function testIssue68OptionsShortcutDoesNotIncludeOptionsInUsagePattern()