Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jun 26, 2011 · 403ce8d · 403ce8d
18 parents 163c965 + 008804b + 87522da + d31ec42 + 2f2a15a + 585cc82 + a9438e2 + d59be1f + 643e2df + a49e8f2 + 08fd26d + b52d5dc + de5abc1 + 48f2d19 + 34ca3a0 + 5169094 + 25abd15 + baa09a1
commit 403ce8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -22,7 +22,7 @@
  * @namespace
  */
 namespace Zend\Json\Server;
-use Zend\Server\Reflection\Reflection,
+use Zend\Server\Reflection,
     Zend\Server\Method;
 
 /**

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -72,7 +72,11 @@ public function testShouldBeAbleToBindFunctionToServer()
 
     public function testShouldBeAbleToBindCallbackToServer()
     {
-        $this->server->addFunction(array($this, 'setUp'));
+        try {
+            $this->server->addFunction(array($this, 'setUp'));
+        } catch (\Zend\Server\Reflection\Exception\RuntimeException $e) {
+            $this->markTestSkipped('PHPUnit docblocks may be incorrect');
+        }
         $methods = $this->server->getFunctions();
         $this->assertTrue($methods->hasMethod('setUp'));
     }