Merge pull request christoph-kluge#3 from WyriHaximus-labs/small-fixes

Small fixes/improvements

Author: christoph-kluge

composer.json

@@ -26,7 +26,7 @@
     },
    "require-dev": {
         "phpunit/phpunit": "^4.8.10||^5.0",
-        "react/http": "dev-master",
+        "react/http": "^0.8.1",
         "ringcentral/psr7": "^1.2"
     },
     "scripts": {

src/CorsMiddleware.php

@@ -5,8 +5,10 @@
 use Neomerx\Cors\Analyzer;
 use Neomerx\Cors\Contracts\AnalysisResultInterface;
 use Neomerx\Cors\Contracts\AnalyzerInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Response;
+use function React\Promise\resolve;
 use Sikei\React\Http\Middleware\CorsMiddlewareAnalysisStrategy as Strategy;
 use Sikei\React\Http\Middleware\CorsMiddlewareConfiguration as Config;
 
@@ -47,7 +49,7 @@ public function __invoke(ServerRequestInterface $request, $next)
                 return new Response(405, [], 'Method not supported');
         }
 
-        return $next($request)->then(function (Response $response) use ($cors) {
+        return resolve($next($request))->then(function (ResponseInterface $response) use ($cors) {
             foreach ($cors->getResponseHeaders() as $header => $value) {
                 $response = $response->withHeader($header, $value);
             }

tests/ResponseCompressionMiddlewareTest.php renamed to tests/CorsMiddlewareTest.php

@@ -6,7 +6,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Response;
-use React\Http\ServerRequest;
+use React\Http\Io\ServerRequest;
 use React\Promise\Promise;
 use React\Promise\PromiseInterface;