Minor CS issues

- Updated docblocks on changed files
- Reworded test method
- Space after `!` operators
- Wrapped long lines

Author: weierophinney

src/Client.php

@@ -1,8 +1,8 @@
 <?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
+ * @see       https://github.com/zendframework/zend-json-server for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-json-server/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Server;
@@ -117,13 +117,13 @@ public function doRequest($request)
             $this->httpClient->setUri($this->serverAddress);
         }
 
-        // set default Accept and Content-Type headers unless already set
+        // Set default Accept and Content-Type headers unless already set.
         $headers = $httpRequest->getHeaders();
         $headersToAdd = [];
-        if (!$headers->has('Content-Type')) {
+        if (! $headers->has('Content-Type')) {
             $headersToAdd['Content-Type'] = 'application/json-rpc';
         }
-        if (!$headers->has('Accept')) {
+        if (! $headers->has('Accept')) {
             $headersToAdd['Accept'] = 'application/json-rpc';
         }
         $headers->addHeaders($headersToAdd);

src/Server.php

@@ -601,8 +601,11 @@ protected function handleRequest()
      *     method on success, Error if there is a mismatch between request
      *     parameters and the method signature.
      */
-    private function validateAndPrepareParams(array $requestedParams, array $serviceParams, Method\Definition $invokable)
-    {
+    private function validateAndPrepareParams(
+        array $requestedParams,
+        array $serviceParams,
+        Method\Definition $invokable
+    ) {
         return is_string(key($requestedParams))
             ? $this->validateAndPrepareNamedParams($requestedParams, $serviceParams, $invokable)
             : $this->validateAndPrepareOrderedParams($requestedParams, $serviceParams);
@@ -618,8 +621,11 @@ private function validateAndPrepareParams(array $requestedParams, array $service
      *     method on success, Error if any named request parameters do not match
      *     those of the method requested.
      */
-    private function validateAndPrepareNamedParams(array $requestedParams, array $serviceParams, Method\Definition $invokable)
-    {
+    private function validateAndPrepareNamedParams(
+        array $requestedParams,
+        array $serviceParams,
+        Method\Definition $invokable
+    ) {
         if (count($requestedParams) < count($serviceParams)) {
             $requestedParams = $this->getDefaultParams($requestedParams, $serviceParams);
         }

test/ClientTest.php

@@ -1,20 +1,20 @@
 <?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
+ * @see       https://github.com/zendframework/zend-json-server for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-json-server/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\Server;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Http\Client as HttpClient;
 use Zend\Http\Client\Adapter\Test as TestAdapter;
+use Zend\Http\Response as HttpResponse;
 use Zend\Json\Server\Client;
 use Zend\Json\Server\Error;
 use Zend\Json\Server\Request;
 use Zend\Json\Server\Response;
-use Zend\Http\Response as HttpResponse;
 
 class ClientTest extends TestCase
 {
@@ -248,7 +248,7 @@ public function testClientShouldSetDefaultAcceptAndContentTypeHeadersOnRequest()
         $this->assertSame('application/json-rpc', $jsonClient->getHttpClient()->getHeader('Accept'));
     }
 
-    public function testClientShouldNotSetDefaultAcceptAndContentTypeHeadersOnRequestIfTheyAlreadyExist()
+    public function testClientShouldNotOverwriteAcceptAndContentTypeHeadersIfAlreadyPresentInRequest()
     {
         $request = new Request();
         $response = new HttpResponse();