Fix for issue described in PR #6

Author: shabbyrobe

src/docopt.php

@@ -489,17 +489,18 @@ class Option extends LeafPattern
 
         public function __construct($short=null, $long=null, $argcount=0, $value=false)
         {
-            if ($argcount != 0 && $argcount != 1)
+            if ($argcount != 0 && $argcount != 1) {
                 throw new \InvalidArgumentException();
+            }
 
             $this->short = $short;
             $this->long = $long;
             $this->argcount = $argcount;
             $this->value = $value;
 
-            // Python checks "value is False". maybe we should check "$value === false"
-            if (!$value && $argcount)
+            if ($value === false && $argcount) {
                 $this->value = null;
+            }
         }
 
         public static function parse($optionDescription)

test.php

@@ -23,6 +23,7 @@
 $suite = new PHPUnit_Framework_TestSuite();
 $suite->addTest(new PHPUnit_Framework_TestSuite('Docopt\Test\PythonPortedTest'));
 $suite->addTest(Docopt\Test\LanguageAgnosticTest::createSuite($pyTestFile));
+$suite->addTest(Docopt\Test\LanguageAgnosticTest::createSuite("$basePath/test/extra.docopt"));
 
 $runner = new PHPUnit_TextUI_TestRunner();
 $runner->doRun($suite, array(

test/extra.docopt

@@ -0,0 +1,17 @@
+r"""Usage: prog [-a <foo>]
+
+Options: -a <foo>  An option [default: 0].
+
+"""
+$ prog
+{"-a": "0"}
+
+
+r"""Usage: prog [-a <foo>]
+
+Options: -a <foo>  An option [default: ].
+
+"""
+$ prog
+{"-a": ""}
+

test/lib/LanguageAgnosticTest.php

@@ -5,8 +5,9 @@ class LanguageAgnosticTest implements \PHPUnit_Framework_Test, \PHPUnit_Framewor
 {
 	public static function createSuite($testFile)
 	{
-		if (!file_exists($testFile))
+		if (!file_exists($testFile)) {
 			throw new \InvalidArgumentException("Test file $testFile does not exist");
+        }
 
 		$suite = new \PHPUnit_Framework_TestSuite;
 
@@ -37,23 +38,25 @@ public static function createSuite($testFile)
 				$argv = isset($argx[1]) ? $argx[1] : "";
 
 				$tName = $name ? ($name.$nIdx) : 'unnamed'.$idx;
-				$suite->addTest(new static($tName, $doc, $prog, $argv, $expect));
+                $test = new static($tName, $doc, $prog, $argv, $expect);
+				$suite->addTest($test);
 				$idx++;
 			}
 		}
 
 		return $suite;
 	}
-	
+
 	public function __construct($name, $doc, $prog, $argv, $expect)
 	{
 		$this->doc = $doc;
 		$this->name = $name;
 		$this->prog = $prog;
 		$this->argv = $argv;
 
-		if ($expect == "user-error")
+		if ($expect == "user-error") {
 			$expect = array('user-error');
+        }
 
 		$this->expect = $expect;
 	}