Merge remote-tracking branch 'origin/master' into custom-origin

Author: christoph-kluge

README.md

@@ -20,12 +20,12 @@ This middleware will detect CORS requests and will intercept the request if ther
 # Usage
 
 ```php
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new CorsMiddleware(),
     function (ServerRequestInterface $request, callable $next) {
         return new Response(200, ['Content-Type' => 'text/html'], 'We test CORS');
     },
-]));
+]);
 ```
 
 # Configuration
@@ -61,41 +61,41 @@ $settings = [
 ## Allow specific origins (Origin requires scheme, host and optionally port)
 
 ```php
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new CorsMiddleware([
         'allow_origin' => [
             'http://www.example.net',
             'https://www.example.net',
             'http://www.example.net:8443',
         ],
     ]),
-]));
+]);
 ```
 
 ## Allow origins on a per-request base (callback)
 
 ```php
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new CorsMiddleware([
         'allow_origin'          => [],
         'allow_origin_callback' => function(ParsedUrlInterface $origin) {
             // do some evaluation magic with origin ..
             return true;
         },
     ]),
-]));
+]);
 ```
 
 ## Use custom response code on pre-flight requests
 
 Some legacy browsers choke on 204. Thanks to [expressjs/cors#configuring-cors](https://github.com/expressjs/cors#configuring-cors) for that.
 
 ```php
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new CorsMiddleware([
         'response_code' => 200,
     ]),
-]));
+]);
 ```
 
 # License

examples/01-server-with-cors.php

@@ -4,22 +4,21 @@
 use React\EventLoop\Factory;
 use React\Http\Response;
 use React\Http\Server;
-use React\Http\MiddlewareRunner;
 use Sikei\React\Http\Middleware\CorsMiddleware;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new CorsMiddleware(),
     function (ServerRequestInterface $request, callable $next) {
         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);