Adopted examples to work with the most current version of react/http

christoph-kluge · Mar 3, 2019 · c81c3cc · c81c3cc
1 parent a2d08b7
commit c81c3cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/examples/01-server-with-compression.php b/examples/01-server-with-compression.php
@@ -2,7 +2,6 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
-use React\Http\Io\MiddlewareRunner;
 use React\Http\Response;
 use React\Http\Server;
 use Sikei\React\Http\Middleware\ResponseCompressionMiddleware;
@@ -13,27 +12,22 @@
 
 $loop = Factory::create();
 
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new ResponseCompressionMiddleware([
         new CompressionGzipHandler(),
         new CompressionDeflateHandler(),
     ]),
-    function (ServerRequestInterface $request, callable $next) {
+    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);
 
-$server->on('error', function(Exception $error) {
-    echo get_class($error) . ' - ' . $error->getMessage() . PHP_EOL;
-    echo get_class($error->getPrevious()) . ' - ' . $error->getPrevious()->getMessage() . PHP_EOL;
-});
-
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
 
 $loop->run();
diff --git a/examples/02-server-with-compression-stream.php b/examples/02-server-with-compression-stream.php
@@ -2,7 +2,6 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
-use React\Http\Io\MiddlewareRunner;
 use React\Http\Response;
 use React\Http\Server;
 use React\Stream\ThroughStream;
@@ -14,12 +13,12 @@
 
 $loop = Factory::create();
 
-$server = new Server(new MiddlewareRunner([
+$server = new Server([
     new ResponseCompressionMiddleware([
         new CompressionGzipHandler(),
         new CompressionDeflateHandler(),
     ]),
-    function (ServerRequestInterface $request, callable $next) use ($loop) {
+    function (ServerRequestInterface $request) use ($loop) {
         $stream = new ThroughStream();
         $loop->addTimer(0.001, function () use ($stream) {
             $stream->write('{');
@@ -34,7 +33,7 @@ function (ServerRequestInterface $request, callable $next) use ($loop) {
 
         return new Response(200, ['Content-Type' => 'application/json'], $stream);
     },
-]));
+]);
 
 $socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
 $server->listen($socket);