Merged Source/Master

composer.json

@@ -30,8 +30,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

src/Json.php

@@ -153,8 +153,10 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar
      * NOTE: This method is used internally by the encode method.
      *
      * @see encode
-     * @param mixed $valueToCheck a string - object property to be encoded
-     * @return void
+     * @param mixed $value a string - object property to be encoded
+     * @param array $javascriptExpressions
+     * @param null|string|int $currentKey
+     * @return mixed
      */
     protected static function _recursiveJsonExprFinder(
         &$value, array &$javascriptExpressions, $currentKey = null
@@ -306,7 +308,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu
      * @return mixed - JSON formatted string on success
      * @throws \Zend\Json\Exception\RuntimeException if the input not a XML formatted string
      */
-    public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true)
+    public static function fromXml($xmlStringContents, $ignoreXmlAttributes = true)
     {
         // Load the XML formatted string into a Simple XML Element object.
         $simpleXmlElementObject = simplexml_load_string($xmlStringContents);

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;

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')