From e99faab498ecfe74700743546646e283437521b1 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 27 Jul 2020 10:21:42 +0200 Subject: [PATCH] Upgrade react/http (#813) --- bin/push-server | 2 +- composer.json | 2 +- lib/Server/HttpReceiver.php | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/push-server b/bin/push-server index 9e51a6301..90c60148c 100755 --- a/bin/push-server +++ b/bin/push-server @@ -76,7 +76,7 @@ $middleware = new MiddlewareAdapter(); // configure local httpd interface $localSocket = new SocketServer(REMOTE_IP_PORT . $localPort, $loop); // remote loggers can push updates -$localServer = new HttpReceiver($localSocket, $middleware); +$localServer = new HttpReceiver($loop, $localSocket, $middleware); // configure routes $routes = new RouteCollection; diff --git a/composer.json b/composer.json index 04aa84888..284ac5d68 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "symfony/routing": "^4.0", "symfony/yaml": "^4.0", "cboden/ratchet": "^0.4", - "react/http": "^0.8", + "react/http": "^1.0", "ringcentral/psr7": "^1.2", "php-pm/php-pm": "^2.0", "php-pm/httpkernel-adapter": "^2.0", diff --git a/lib/Server/HttpReceiver.php b/lib/Server/HttpReceiver.php index 9211242c6..e76b64c9c 100644 --- a/lib/Server/HttpReceiver.php +++ b/lib/Server/HttpReceiver.php @@ -23,6 +23,7 @@ namespace Volkszaehler\Server; +use React\EventLoop\LoopInterface; use React\Socket\Server as SocketServer; use React\Http\Server as HttpServer; use Psr\Http\Message\ResponseInterface; @@ -44,10 +45,10 @@ class HttpReceiver { */ protected $http; - function __construct(SocketServer $socket, MiddlewareAdapter $hub) { + function __construct(LoopInterface $loop, SocketServer $socket, MiddlewareAdapter $hub) { $this->hub = $hub; - $this->http = new HttpServer([$this, 'handleRequest']); + $this->http = new HttpServer($loop, [$this, 'handleRequest']); $this->http->listen($socket); }