Merge remote branch 'upstream/master' into ZF-10246

zendframework · Aug 1, 2010 · 7529e8f · 7529e8f
7 parents a729860 + a4b177e + 5e10b10 + 0db5f75 + bcb7bb1 + f7074c9 + b37dc0b
commit 7529e8f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/PHPUnit/ControllerTestCase.php b/src/PHPUnit/ControllerTestCase.php
@@ -182,7 +182,7 @@ public function dispatch($url = null)
         $redirector->setExit(false);
 
         // json helper should not exit
-        $json = HelperBroker::getStaticHelper('JSON');
+        $json = HelperBroker::getStaticHelper('json');
         $json->suppressExit = true;
 
         $request    = $this->getRequest();