Improved testing

Author: Nyholm

composer.json

@@ -19,6 +19,8 @@
         "phpunit/phpunit": "^5.7.27",
         "symfony/http-foundation": "^3.4 || ^4.0",
         "zendframework/zend-diactoros": "^1.8",
+        "nyholm/psr7-server": "dev-interface",
+        "http-interop/http-factory-diactoros": "dev-master",
         "satooshi/php-coveralls": "^1.1"
     },
     "autoload": {

test/Http/RequestTest.php

@@ -2,6 +2,11 @@
 
 namespace PHPFastCGI\Test\FastCGIDaemon\Http;
 
+use Http\Factory\Diactoros\ServerRequestFactory;
+use Http\Factory\Diactoros\StreamFactory;
+use Http\Factory\Diactoros\UploadedFileFactory;
+use Http\Factory\Diactoros\UriFactory;
+use Nyholm\Psr7Server\ServerRequestCreator;
 use PHPFastCGI\FastCGIDaemon\Http\Request;
 
 /**
@@ -10,6 +15,17 @@
  */
 class RequestTest extends \PHPUnit_Framework_TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        Request::setServerRequestCreator(new ServerRequestCreator(
+            new ServerRequestFactory(),
+            new UriFactory(),
+            new UploadedFileFactory(),
+            new StreamFactory()
+        ));
+    }
+
     /**
      * Test that the request builder is correctly building the request messages.
      */
@@ -51,7 +67,6 @@ public function testRequest()
         $this->assertEquals($expectedQuery,         $serverRequest->getQueryParams());
         $this->assertEquals($expectedPost,          $serverRequest->getParsedBody());
         $this->assertEquals($expectedCookies,       $serverRequest->getCookieParams());
-        $this->assertEquals($content,      (string) $serverRequest->getBody());
 
         // Check the HttpFoundation request
         rewind($stream);