Merge branch 'hotfix/124'

Close #124

Author: weierophinney

CHANGELOG.md

@@ -6,7 +6,15 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#124](https://github.com/zendframework/zend-diactoros/pull/124) adds four
+  more optional arguments to the `ServerRequest` constructor:
+  - `array $cookies`
+  - `array $queryParams`
+  - `null|array|object $parsedBody`
+  - `string $protocolVersion`
+  `ServerRequestFactory` was updated to pass values for each of these parameters
+  when creating an instance, instead of using the related `with*()` methods on
+  an instance.
 
 ### Deprecated
 

src/ServerRequest.php

@@ -69,6 +69,10 @@ class ServerRequest implements ServerRequestInterface
      * @param null|string $method HTTP method for the request, if any.
      * @param string|resource|StreamInterface $body Message body, if any.
      * @param array $headers Headers for the message, if any.
+     * @param array $cookies Cookies for the message, if any.
+     * @param array $queryParams Query params for the message, if any.
+     * @param null|array|object $parsedBody The deserialized body parameters, if any.
+     * @param string HTTP protocol version.
      * @throws InvalidArgumentException for any invalid value.
      */
     public function __construct(
@@ -77,14 +81,22 @@ public function __construct(
         $uri = null,
         $method = null,
         $body = 'php://input',
-        array $headers = []
+        array $headers = [],
+        array $cookies = [],
+        array $queryParams = [],
+        $parsedBody = null,
+        $protocol = '1.1'
     ) {
         $this->validateUploadedFiles($uploadedFiles);
 
         $body = $this->getStream($body);
         $this->initialize($uri, $method, $body, $headers);
         $this->serverParams  = $serverParams;
         $this->uploadedFiles = $uploadedFiles;
+        $this->cookieParams  = $cookies;
+        $this->queryParams   = $queryParams;
+        $this->parsedBody    = $parsedBody;
+        $this->protocol      = $protocol;
     }
 
     /**

src/ServerRequestFactory.php

@@ -61,20 +61,20 @@ public static function fromGlobals(
         $server  = static::normalizeServer($server ?: $_SERVER);
         $files   = static::normalizeFiles($files ?: $_FILES);
         $headers = static::marshalHeaders($server);
-        $request = new ServerRequest(
+
+        return new ServerRequest(
             $server,
             $files,
             static::marshalUriFromServer($server, $headers),
             static::get('REQUEST_METHOD', $server, 'GET'),
             'php://input',
-            $headers
+            $headers,
+            $cookies ?: $_COOKIE,
+            $query ?: $_GET,
+            $body ?: $_POST,
+            static::marshalProtocolVersion($server)
         );
 
-        return $request
-            ->withProtocolVersion(static::marshalProtocolVersion($server))
-            ->withCookieParams($cookies ?: $_COOKIE)
-            ->withQueryParams($query ?: $_GET)
-            ->withParsedBody($body ?: $_POST);
     }
 
     /**

test/ServerRequestFactoryTest.php

@@ -440,23 +440,23 @@ public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContain
 
     public function testMarshalProtocolVersionReturnsHttpVersion()
     {
-        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
         $method->setAccessible(true);
         $version = $method->invoke(null, ['SERVER_PROTOCOL' => 'HTTP/1.0']);
         $this->assertEquals('1.0', $version);
     }
 
     public function testMarshalProtocolVersionRisesExceptionIfVersionIsNotRecognized()
     {
-        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
         $method->setAccessible(true);
         $this->setExpectedException('UnexpectedValueException');
         $method->invoke(null, ['SERVER_PROTOCOL' => 'dadsa/1.0']);
     }
 
     public function testMarshalProtocolReturnsDefaultValueIfHeaderIsNotPresent()
     {
-        $method = new ReflectionMethod(ServerRequestFactory::class, 'marshalProtocolVersion');
+        $method = new ReflectionMethod('Zend\Diactoros\ServerRequestFactory', 'marshalProtocolVersion');
         $method->setAccessible(true);
         $version = $method->invoke(null, []);
         $this->assertEquals('1.1', $version);

test/ServerRequestTest.php

@@ -135,22 +135,38 @@ public function testUsesProvidedConstructorArguments($parameterMethod, $methodRe
         $headers = [
             'host' => ['example.com'],
         ];
+        $cookies = [
+            'boo' => 'foo',
+        ];
+        $queryParams = [
+            'bar' => 'bat',
+        ];
+        $parsedBody = 'bazbar';
+        $protocol = '1.2';
 
         $request = new ServerRequest(
             $server,
             $files,
             $uri,
             $parameterMethod,
             'php://memory',
-            $headers
+            $headers,
+            $cookies,
+            $queryParams,
+            $parsedBody,
+            $protocol
         );
 
-        $this->assertEquals($server, $request->getServerParams());
-        $this->assertEquals($files, $request->getUploadedFiles());
+        $this->assertSame($server, $request->getServerParams());
+        $this->assertSame($files, $request->getUploadedFiles());
 
         $this->assertSame($uri, $request->getUri());
-        $this->assertEquals($methodReturned, $request->getMethod());
-        $this->assertEquals($headers, $request->getHeaders());
+        $this->assertSame($methodReturned, $request->getMethod());
+        $this->assertSame($headers, $request->getHeaders());
+        $this->assertSame($cookies, $request->getCookieParams());
+        $this->assertSame($queryParams, $request->getQueryParams());
+        $this->assertSame($parsedBody, $request->getParsedBody());
+        $this->assertSame($protocol, $request->getProtocolVersion());
 
         $body = $request->getBody();
         $r = new ReflectionProperty($body, 'stream');