Merge remote-tracking branch 'upstream/master'

Conflicts: library/Zend/Form/Decorator/File.php library/Zend/View/Helper/Navigation/Sitemap.php
zendframework · Sep 10, 2011 · 4c8955c · 4c8955c
commit 4c8955c
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/test/GetoptTest.php b/test/GetoptTest.php
@@ -96,11 +96,9 @@ public function testGetoptDumpArray()
 
     public function testGetoptDumpJson()
     {
-        $this->markTestIncomplete('INCOMPLETE due to waiting for Zend_Json migration to namespaces');
         $opts = new Getopt('abp:', array('-a', '-p', 'p_arg'));
         $this->assertEquals($opts->toJson(),
             '{"options":[{"option":{"flag":"a","parameter":true}},{"option":{"flag":"p","parameter":"p_arg"}}]}');
-
     }
 
     public function testGetoptDumpXml()