Merge branch 'hotfix/5836' into develop

Forward port zendframework/zendframework#5836

src/Server/Server.php

@@ -361,17 +361,34 @@ protected function _fixType($type)
      */
     protected function _getDefaultParams(array $args, array $params)
     {
-        $defaultParams = array_slice($params, count($args));
-        foreach ($defaultParams as $param) {
-            $value = null;
-            if (array_key_exists('default', $param)) {
-                $value = $param['default'];
+        if (false === $this->isAssociative($args)) {
+            $params = array_slice($params, count($args));
+        }
+
+        foreach ($params as $param) {
+            if (isset($args[$param['name']]) || !array_key_exists('default', $param)) {
+                continue;
             }
-            $args[$param['name']] = $value;
+
+            $args[$param['name']] = $param['default'];
         }
+
         return $args;
     }
 
+    /**
+     * check whether array is associative or not
+     *
+     * @param array $array
+     * @return bool
+     */
+    private function isAssociative(array $array)
+    {
+        $keys = array_keys($array);
+
+        return ($keys != array_keys($keys));
+    }
+
     /**
      * Get method param type
      *

test/ServerTest.php

@@ -494,4 +494,50 @@ public function testAddFunctionAndClassThatContainsConstructor()
         $this->assertEquals($response->getId(), $decoded['id']);
 
     }
+
+    /**
+     * @group 3773
+     */
+    public function testHandleWithNamedParamsShouldSetMissingDefaults1()
+    {
+        $this->server->setClass('ZendTest\Json\TestAsset\Foo')
+                     ->setReturnResponse(true);
+        $request = $this->server->getRequest();
+        $request->setMethod('bar')
+                ->setParams( array(
+                    'two'   => 2,
+                    'one'   => 1,
+                ) )
+                ->setId( 'foo' );
+        $response = $this->server->handle();
+        $result = $response->getResult();
+
+        $this->assertTrue( is_array( $result ) );
+        $this->assertEquals( 1, $result[0] );
+        $this->assertEquals( 2, $result[1] );
+        $this->assertEquals( null, $result[2] );
+    }
+
+    /**
+     * @group 3773
+     */
+    public function testHandleWithNamedParamsShouldSetMissingDefaults2()
+    {
+        $this->server->setClass('ZendTest\Json\TestAsset\Foo')
+                     ->setReturnResponse(true);
+        $request = $this->server->getRequest();
+        $request->setMethod('bar')
+                ->setParams( array(
+                    'three' => 3,
+                    'one'   => 1,
+                ) )
+                ->setId( 'foo' );
+        $response = $this->server->handle();
+        $result = $response->getResult();
+
+        $this->assertTrue( is_array( $result ) );
+        $this->assertEquals( 1, $result[0] );
+        $this->assertEquals( 'two', $result[1] );
+        $this->assertEquals( 3, $result[2] );
+    }
 }