Middleware

composer.json

@@ -9,7 +9,8 @@
         "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6",
         "react/promise": "^2.3 || ^1.2.1",
-        "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
+        "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+        "react/promise-stream": "^0.1.1"
     },
     "autoload": {
         "psr-4": {
@@ -18,7 +19,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.10||^5.0",
-        "react/promise-stream": "^0.1.1",
         "react/socket": "^1.0 || ^0.8 || ^0.7",
         "clue/block-react": "^1.1"
     }

examples/01-hello-world.php

@@ -2,22 +2,25 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) {
-    return new Response(
-        200,
-        array(
-            'Content-Type' => 'text/plain'
-        ),
-        "Hello world\n"
-    );
-});
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) {
+        return new Response(
+            200,
+            array(
+                'Content-Type' => 'text/plain'
+            ),
+            "Hello world\n"
+        );
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/02-count-visitors.php

@@ -2,6 +2,7 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 
@@ -10,13 +11,15 @@
 $loop = Factory::create();
 
 $counter = 0;
-$server = new Server(function (ServerRequestInterface $request) use (&$counter) {
-    return new Response(
-        200,
-        array('Content-Type' => 'text/plain'),
-        "Welcome number " . ++$counter . "!\n"
-    );
-});
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) use (&$counter) {
+        return new Response(
+            200,
+            array('Content-Type' => 'text/plain'),
+            "Welcome number " . ++$counter . "!\n"
+        );
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/03-client-ip.php

@@ -2,22 +2,25 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) {
-    $body = "Your IP is: " . $request->getServerParams()['REMOTE_ADDR'];
-
-    return new Response(
-        200,
-        array('Content-Type' => 'text/plain'),
-        $body
-    );
-});
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) {
+        $body = "Your IP is: " . $request->getServerParams()['REMOTE_ADDR'];
+
+        return new Response(
+            200,
+            array('Content-Type' => 'text/plain'),
+            $body
+        );
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/04-query-parameter.php

@@ -2,29 +2,32 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) {
-    $queryParams = $request->getQueryParams();
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) {
+        $queryParams = $request->getQueryParams();
 
-    $body = 'The query parameter "foo" is not set. Click the following link ';
-    $body .= '<a href="/?foo=bar">to use query parameter in your request</a>';
+        $body = 'The query parameter "foo" is not set. Click the following link ';
+        $body .= '<a href="/?foo=bar">to use query parameter in your request</a>';
 
-    if (isset($queryParams['foo'])) {
-        $body = 'The value of "foo" is: ' . htmlspecialchars($queryParams['foo']);
-    }
+        if (isset($queryParams['foo'])) {
+            $body = 'The value of "foo" is: ' . htmlspecialchars($queryParams['foo']);
+        }
 
-    return new Response(
-        200,
-        array('Content-Type' => 'text/html'),
-        $body
-    );
-});
+        return new Response(
+            200,
+            array('Content-Type' => 'text/html'),
+            $body
+        );
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/05-cookie-handling.php

@@ -2,35 +2,38 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) {
-    $key = 'react\php';
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) {
+        $key = 'react\php';
 
-    if (isset($request->getCookieParams()[$key])) {
-        $body = "Your cookie value is: " . $request->getCookieParams()[$key];
+        if (isset($request->getCookieParams()[$key])) {
+            $body = "Your cookie value is: " . $request->getCookieParams()[$key];
+
+            return new Response(
+                200,
+                array('Content-Type' => 'text/plain'),
+                $body
+            );
+        }
 
         return new Response(
             200,
-            array('Content-Type' => 'text/plain'),
-            $body
+            array(
+                'Content-Type' => 'text/plain',
+                'Set-Cookie' => urlencode($key) . '=' . urlencode('test;more')
+            ),
+            "Your cookie has been set."
         );
-    }
-
-    return new Response(
-        200,
-        array(
-            'Content-Type' => 'text/plain',
-            'Set-Cookie' => urlencode($key) . '=' . urlencode('test;more')
-        ),
-        "Your cookie has been set."
-    );
-});
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/06-sleep.php

@@ -2,6 +2,7 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 use React\Promise\Promise;
@@ -10,18 +11,20 @@
 
 $loop = Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) use ($loop) {
-    return new Promise(function ($resolve, $reject) use ($request, $loop) {
-        $loop->addTimer(1.5, function() use ($loop, $resolve) {
-            $response = new Response(
-                200,
-                array('Content-Type' => 'text/plain'),
-                "Hello world"
-            );
-            $resolve($response);
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) use ($loop) {
+        return new Promise(function ($resolve, $reject) use ($request, $loop) {
+            $loop->addTimer(1.5, function() use ($loop, $resolve) {
+                $response = new Response(
+                    200,
+                    array('Content-Type' => 'text/plain'),
+                    "Hello world"
+                );
+                $resolve($response);
+            });
         });
-    });
-});
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/07-error-handling.php

@@ -2,6 +2,7 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 use React\Promise\Promise;
@@ -11,23 +12,25 @@
 $loop = Factory::create();
 
 $count = 0;
-$server = new Server(function (ServerRequestInterface $request) use (&$count) {
-    return new Promise(function ($resolve, $reject) use (&$count) {
-        $count++;
-
-        if ($count%2 === 0) {
-            throw new Exception('Second call');
-        }
-
-        $response = new Response(
-            200,
-            array('Content-Type' => 'text/plain'),
-            "Hello World!\n"
-        );
-
-        $resolve($response);
-    });
-});
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) use (&$count) {
+        return new Promise(function ($resolve, $reject) use (&$count) {
+            $count++;
+
+            if ($count%2 === 0) {
+                throw new Exception('Second call');
+            }
+
+            $response = new Response(
+                200,
+                array('Content-Type' => 'text/plain'),
+                "Hello World!\n"
+            );
+
+            $resolve($response);
+        });
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);

examples/08-stream-response.php

@@ -2,6 +2,7 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Middleware\Callback;
 use React\Http\Response;
 use React\Http\Server;
 use React\Stream\ThroughStream;
@@ -10,28 +11,30 @@
 
 $loop = Factory::create();
 
-$server = new Server($loop,function (ServerRequestInterface $request) use ($loop) {
-    if ($request->getMethod() !== 'GET' || $request->getUri()->getPath() !== '/') {
-        return new Response(404);
-    }
-
-    $stream = new ThroughStream();
-
-    $timer = $loop->addPeriodicTimer(0.5, function () use ($stream) {
-        $stream->emit('data', array(microtime(true) . PHP_EOL));
-    });
-
-    $loop->addTimer(5, function() use ($loop, $timer, $stream) {
-        $loop->cancelTimer($timer);
-        $stream->emit('end');
-    });
-
-    return new Response(
-        200,
-        array('Content-Type' => 'text/plain'),
-        $stream
-    );
-});
+$server = new Server([
+    new Callback(function (ServerRequestInterface $request) use ($loop) {
+        if ($request->getMethod() !== 'GET' || $request->getUri()->getPath() !== '/') {
+            return new Response(404);
+        }
+
+        $stream = new ThroughStream();
+
+        $timer = $loop->addPeriodicTimer(0.5, function () use ($stream) {
+            $stream->emit('data', array(microtime(true) . PHP_EOL));
+        });
+
+        $loop->addTimer(5, function() use ($loop, $timer, $stream) {
+            $loop->cancelTimer($timer);
+            $stream->emit('end');
+        });
+
+        return new Response(
+            200,
+            array('Content-Type' => 'text/plain'),
+            $stream
+        );
+    })
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);