Params should be checked more precisely

src/Server.php

@@ -577,12 +577,13 @@ protected function handleRequest()
         $service       = $serviceMap->getService($method);
         $serviceParams = $service->getParams();
 
-        if (count($params) < count($serviceParams)) {
-            $params = $this->getDefaultParams($params, $serviceParams);
-        }
 
         // Make sure named parameters are passed in correct order.
         if (is_string(key($params))) {
+            if (count($params) < count($serviceParams)) {
+                $params = $this->getDefaultParams($params, $serviceParams);
+            }
+
             $callback = $invokable->getCallback();
             if ('function' == $callback->getType()) {
                 $reflection = new ReflectionFunction($callback->getFunction());
@@ -609,6 +610,17 @@ protected function handleRequest()
             }
 
             $params = $orderedParams;
+        } else {
+            $requiredParamsCount = 0;
+            foreach ($serviceParams as $param) {
+                if (!$param['optional']) {
+                    $requiredParamsCount++;
+                }
+            }
+
+            if (count($params) < $requiredParamsCount) {
+                return $this->fault('Invalid params', Error::ERROR_INVALID_PARAMS);
+            }
         }
 
         try {

test/ServerTest.php

@@ -14,6 +14,7 @@
 use Zend\Json;
 use Zend\Json\Server\Request;
 use Zend\Json\Server\Response;
+use Zend\Json\Server\Error;
 use Zend\Server\Reflection\Exception\RuntimeException;
 
 class ServerTest extends TestCase
@@ -528,4 +529,32 @@ public function testHandleWithNamedParamsShouldSetMissingDefaults2()
         $this->assertEquals('two', $result[1]);
         $this->assertEquals(3, $result[2]);
     }
+
+    public function testResponseShouldBeInvalidWhenRequestHasLessRequiredParametersPassedWithoutKeys()
+    {
+        $server = $this->server;
+        $server->setClass(TestAsset\FooParameters::class);
+        $server->setReturnResponse(true);
+        $request = $server->getRequest();
+        $request->setMethod('bar')
+                ->setParams([true]);
+        $server->handle();
+
+        $response = $server->getResponse();
+        $this->assertEquals($response->getError()->getCode(), Error::ERROR_INVALID_PARAMS);
+    }
+
+    public function testResponseShouldBeInvalidWhenRequestHasLessRequiredParametersPassedWithoutKeys1()
+    {
+        $server = $this->server;
+        $server->setClass(TestAsset\FooParameters::class);
+        $server->setReturnResponse(true);
+        $request = $server->getRequest();
+        $request->setMethod('baz')
+                ->setParams([true]);
+        $server->handle();
+        $response = $server->getResponse();
+        $this->assertNotEmpty($response->getError());
+        $this->assertEquals($response->getError()->getCode(), Error::ERROR_INVALID_PARAMS);
+    }
 }

test/TestAsset/FooParameters.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-json-server for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Json\Server\TestAsset;
+
+/**
+ * Class for testing JSON-RPC server
+ */
+class FooParameters
+{
+    /**
+     * Bar
+     *
+     * @param  bool $one
+     * @param  string $two
+     * @return array
+     */
+    public function bar($one, $two)
+    {
+        return [$one, $two];
+    }
+
+    /**
+     * Baz
+     *
+     * @param  bool $one
+     * @param  string $two
+     * @param  string $three
+     * @return array
+     */
+    public function baz($one, $two, $three = "default")
+    {
+        return [$one, $two, $three];
+    }
+}