Merge branch 'hotfix/3767' into develop

Forward port zendframework/zendframework#3767
zendframework · Mar 1, 2013 · 6d4e64c · 6d4e64c
commit 6d4e64c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Server/Server.php b/src/Server/Server.php
@@ -522,7 +522,7 @@ protected function _handle()
 
             $orderedParams = array();
             foreach ($reflection->getParameters() as $refParam) {
-                if (isset( $params[ $refParam->getName() ] )) {
+                if (array_key_exists($refParam->getName(), $params)) {
                     $orderedParams[ $refParam->getName() ] = $params[ $refParam->getName() ];
                 } elseif ($refParam->isOptional()) {
                     $orderedParams[ $refParam->getName() ] = null;

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -259,6 +259,20 @@ public function testHandleValidMethodShouldWork()
         $this->assertFalse($response->isError());
     }
 
+    public function testHandleValidMethodWithNULLParamValueShouldWork()
+    {
+        $this->server->setClass('ZendTest\\Json\\Foo')
+                     ->addFunction('ZendTest\\Json\\FooFunc')
+                     ->setReturnResponse(true);
+        $request = $this->server->getRequest();
+        $request->setMethod('bar')
+                ->setParams(array(true, NULL, 'bar'))
+                ->setId('foo');
+        $response = $this->server->handle();
+        $this->assertTrue($response instanceof Response);
+        $this->assertFalse($response->isError());
+    }
+
     public function testHandleValidMethodWithTooFewParamsShouldPassDefaultsOrNullsForMissingParams()
     {
         $this->server->setClass('ZendTest\Json\Foo')