fixed testOptionsFirst

shabbyrobe · shabbyrobe · commit 6e19d0b9c776 · 2013-02-08T18:41:27.000+11:00
diff --git a/src/docopt.php b/src/docopt.php
@@ -935,7 +935,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); }, $tokens));
+            return array_merge($parsed, array_map(function($v) { return new Argument(null, $v); }, iterator_to_array($tokens)));
         }
         else {
             $parsed[] = new Argument(null, $tokens->move());
diff --git a/test/DocoptTest.php b/test/DocoptTest.php
@@ -761,9 +761,6 @@ function testDefaultValueForPositionalArguments()
     #                                      new Option('-o', null, 1),
     #                                      new Option(null, '--verbose')]
 
-    /**
-     * @group faulty
-     */
     public function testOptionsFirst()
     {
         $this->assertEquals($this->docopt('usage: prog [--opt] [<args>...]',

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,7 @@ function parse_argv($tokens, \ArrayIterator $options, $optionsFirst=false)`
`935`	`935`	`$parsed = array_merge($parsed, parse_shorts($tokens, $options));`
`936`	`936`	`}`
`937`	`937`	`elseif ($optionsFirst) {`
`938`		`- return array_merge($parsed, array_map(function($v) { return new Argument(null, $v); }, $tokens));`
	`938`	`+ return array_merge($parsed, array_map(function($v) { return new Argument(null, $v); }, iterator_to_array($tokens)));`
`939`	`939`	`}`
`940`	`940`	`else {`
`941`	`941`	`$parsed[] = new Argument(null, $tokens->move());`
Original file line number	Diff line number	Diff line change
`@@ -761,9 +761,6 @@ function testDefaultValueForPositionalArguments()`
`761`	`761`	`# new Option('-o', null, 1),`
`762`	`762`	`# new Option(null, '--verbose')]`
`763`	`763`
`764`		`- /**`
`765`		`- * @group faulty`
`766`		`- */`
`767`	`764`	`public function testOptionsFirst()`
`768`	`765`	`{`
`769`	`766`	`$this->assertEquals($this->docopt('usage: prog [--opt] [<args>...]',`