Merge branch 'hotfix/3593' into develop

Forward port zendframework/zendframework#3593

src/Server/Server.php

@@ -366,7 +366,7 @@ protected function _getDefaultParams(array $args, array $params)
             if (array_key_exists('default', $param)) {
                 $value = $param['default'];
             }
-            array_push($args, $value);
+            $args[$param['name']] = $value;
         }
         return $args;
     }

test/ServerTest.php

@@ -277,6 +277,24 @@ public function testHandleValidMethodWithTooFewParamsShouldPassDefaultsOrNullsFo
         $this->assertNull($result[2]);
     }
 
+    public function testHandleValidMethodWithTooFewAssociativeParamsShouldPassDefaultsOrNullsForMissingParams()
+    {
+        $this->server->setClass('ZendTest\Json\Foo')
+                     ->setReturnResponse(true);
+        $request = $this->server->getRequest();
+        $request->setMethod('bar')
+                ->setParams(array('one' => true))
+                ->setId('foo');
+        $response = $this->server->handle();
+        $this->assertTrue($response instanceof Response);
+        $this->assertFalse($response->isError());
+        $result = $response->getResult();
+        $this->assertTrue(is_array($result));
+        $this->assertTrue(3 == count($result));
+        $this->assertEquals('two', $result[1], var_export($result, 1));
+        $this->assertNull($result[2]);
+    }
+
     public function testHandleValidMethodWithTooManyParamsShouldWork()
     {
         $this->server->setClass('ZendTest\Json\Foo')