Merge branch 'hotfix/337' into develop

Forward port #337

Author: weierophinney

CHANGELOG.md

@@ -44,7 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#337](https://github.com/zendframework/zend-diactoros/pull/337) ensures that the `ServerRequestFactory::createServerRequest()` method
+  creates a `php://temp` stream instead of a `php::input` stream, in compliance
+  with the PSR-17 specification.
 
 ## 2.0.0 - 2018-09-27
 

src/ServerRequestFactory.php

@@ -92,7 +92,8 @@ public function createServerRequest(string $method, $uri, array $serverParams =
             $serverParams,
             $uploadedFiles,
             $uri,
-            $method
+            $method,
+            'php://temp'
         );
     }
 }

test/Integration/ServerRequestFactoryTest.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Psr7Test\ServerRequestIntegrationTest;
+use Zend\Diactoros\ServerRequestFactory;
+
+class ServerRequestFactoryTest extends ServerRequestIntegrationTest
+{
+    public function createSubject()
+    {
+        return (new ServerRequestFactory())->createServerRequest('GET', '/', $_SERVER);
+    }
+}

test/ServerRequestFactoryTest.php

@@ -570,4 +570,15 @@ public function testMarshalRequestUriPrefersRequestUriServerParamWhenXOriginalUr
         $uri = marshalUriFromSapi($server, $headers);
         $this->assertSame('/requested/path', $uri->getPath());
     }
+
+    public function testServerRequestFactoryHasAWritableEmptyBody()
+    {
+        $factory = new ServerRequestFactory();
+        $request = $factory->createServerRequest('GET', '/');
+        $body = $request->getBody();
+
+        $this->assertTrue($body->isWritable());
+        $this->assertTrue($body->isSeekable());
+        $this->assertSame(0, $body->getSize());
+    }
 }