Merge pull request #9 from sandrokeil/feature/use-react-http-1.0.0

Use react http 1.0

composer.json

@@ -21,12 +21,12 @@
     "require": {
         "php": ">=5.6.0",
         "psr/http-message": "^1.0",
+        "react/http": "^1.0.0",
         "react/promise": "^2.5",
         "neomerx/cors-psr7": "^1.0"
     },
    "require-dev": {
         "phpunit/phpunit": "^4.8.10||^5.0",
-        "react/http": "^0.8.6",
         "ringcentral/psr7": "^1.2"
     },
     "scripts": {

examples/01-server-with-cors.php

@@ -2,23 +2,24 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
-use React\Http\Response;
+use React\Http\Message\Response;
 use React\Http\Server;
 use Sikei\React\Http\Middleware\CorsMiddleware;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server([
+$server = new Server(
+    $loop,
     new CorsMiddleware(),
     function (ServerRequestInterface $request) {
         return new Response(200, ['Content-Type' => 'application/json'], json_encode([
             'some' => 'nice',
             'json' => 'values',
         ]));
-    },
-]);
+    }
+);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/02-server-with-cors-strict-checks.php

@@ -2,23 +2,24 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
-use React\Http\Response;
+use React\Http\Message\Response;
 use React\Http\Server;
 use Sikei\React\Http\Middleware\CorsMiddleware;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server([
+$server = new Server(
+    $loop,
     new CorsMiddleware(['server_url' => 'http://api.example.net:8080']),
     function (ServerRequestInterface $request) {
         return new Response(200, ['Content-Type' => 'application/json'], json_encode([
             'some' => 'nice',
             'json' => 'values',
         ]));
-    },
-]);
+    }
+);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:8080', $loop);
 $server->listen($socket);

src/CorsMiddleware.php

@@ -7,7 +7,7 @@
 use Neomerx\Cors\Contracts\AnalyzerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use React\Http\Response;
+use React\Http\Message\Response;
 use function React\Promise\resolve;
 use Sikei\React\Http\Middleware\CorsMiddlewareAnalysisStrategy as Strategy;
 use Sikei\React\Http\Middleware\CorsMiddlewareConfiguration as Config;

tests/CorsMiddlewareTest.php

@@ -5,8 +5,8 @@
 use Neomerx\Cors\Contracts\Http\ParsedUrlInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
-use React\Http\Response;
-use React\Http\Io\ServerRequest;
+use React\Http\Message\Response;
+use React\Http\Message\ServerRequest;
 use React\Promise\Promise;
 use React\Promise\PromiseInterface;