Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReactPHP] Update to PHP 8(.3) #152

Merged
merged 1 commit into from
Sep 27, 2024
Merged

[ReactPHP] Update to PHP 8(.3) #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/reactphp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM wyrihaximusnet/php:8.4-nts-alpine-slim-dev AS install-dependencies
FROM wyrihaximusnet/php:8.3-nts-alpine-slim-dev AS install-dependencies

WORKDIR /opt/app
USER root
Expand All @@ -8,7 +8,7 @@ USER app
COPY ./composer.* /opt/app/
RUN composer install --ansi --no-interaction --prefer-dist --no-dev -o

FROM wyrihaximusnet/php:8.4-nts-alpine-slim
FROM wyrihaximusnet/php:8.3-nts-alpine-slim

EXPOSE 7132
EXPOSE 7133
Expand Down
71 changes: 30 additions & 41 deletions images/reactphp/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
<?php

declare(strict_types=1);

use Psr\Http\Message\ResponseInterface;
use React\EventLoop\Factory;
use React\EventLoop\Loop;
use ReactInspector\Collector\Merger\CollectorMergerCollector;
use ReactInspector\EventLoop\LoopCollector;
use ReactInspector\EventLoop\LoopDecorator;
use ReactInspector\Http\Middleware\Printer\PrinterMiddleware;
use React\Http\Message\Uri;
use ReactInspector\GlobalState;
use ReactInspector\HttpMiddleware\Labels;
use ReactInspector\HttpMiddleware\MiddlewareCollector;
use ReactInspector\MemoryUsage\MemoryUsageCollector;
use ReactInspector\Metrics;
use ReactInspector\Printer\Prometheus\PrometheusPrinter;
use ReactInspector\Stream\IOCollector;
use ReactInspector\Tag;
use ReactInspector\Tags;
use RingCentral\Psr7\Uri;
use ReactInspector\MemoryUsage\MemoryUsage;
use Symfony\Component\Yaml\Yaml;
use Psr\Http\Message\ServerRequestInterface;
use React\Http\Message\Response;
use React\Http\Server as HttpServer;
use React\Http\HttpServer;
use WyriHaximus\FakePHPVersion\Versions;
use WyriHaximus\Metrics\Factory;
use WyriHaximus\Metrics\Label;
use WyriHaximus\Metrics\Printer\Prometheus;
use WyriHaximus\React\Http\Middleware\Header;
use WyriHaximus\React\Http\Middleware\WithHeadersMiddleware;
use const WyriHaximus\FakePHPVersion\CURRENT;

require 'vendor/autoload.php';

Expand All @@ -32,45 +29,36 @@
exit(1);
}

Loop::set(new LoopDecorator(Loop::get()));

$metrics = [];
$middleware = [];
$metricsMiddleware = [];

$extraHeaders = new WithHeadersMiddleware(
new Header('Server', 'wyrihaximusnet/redirect (https://hub.docker.com/r/wyrihaximusnet/redirect)'),
new Header('X-Powered-By', 'PHP/' . CURRENT),
new Header('Server', 'wyrihaximusnet/redirect (https://github.com/wyrihaximusnet/docker-redirect)'),
new Header('X-Powered-By', 'PHP/' . Versions::CURRENT),
);

$registry = Factory::create();
GlobalState::register($registry);
$memoryCollector = new MemoryUsage();
$memoryCollector->register($registry);

$middleware[] = $extraHeaders;
$metricsMiddleware[] = $extraHeaders;
$middlewareCollectorRedirects = new MiddlewareCollector('redirects');
$middlewareCollectorMetrics = new MiddlewareCollector('metrics');
$middleware[] = $middlewareCollectorRedirects;
$metricsMiddleware[] = $middlewareCollectorMetrics;
$middleware[] = new MiddlewareCollector(\ReactInspector\HttpMiddleware\Metrics::create($registry, new Label('vhost', 'redirects')));
$metricsMiddleware[] = new MiddlewareCollector(\ReactInspector\HttpMiddleware\Metrics::create($registry, new Label('vhost', 'metrics')));

$middleware[] = static function (ServerRequestInterface $request, callable $next) use (&$metrics): ResponseInterface {
/** @var Tags $tags */
$tags = $request->getAttribute(MiddlewareCollector::TAGS_ATTRIBUTE);
$tags->add(new Tag('fromHost', $request->getUri()->getHost()));
/** @var Labels $labels */
$labels = $request->getAttribute(MiddlewareCollector::LABELS_ATTRIBUTE);
$labels->add(new Label('fromHost', $request->getUri()->getHost()));
/** @var ResponseInterface $response */
$response = $next($request);
$tags->add(new Tag('toHost', parse_url($response->getHeaderLine('Location'))['host']));
$labels->add(new Label('toHost', parse_url($response->getHeaderLine('Location'))['host']));
return $response;
};

$metricsMiddleware[] = new PrinterMiddleware(new PrometheusPrinter(), new Metrics(
Loop::get(),
3,
new LoopCollector(Loop::get()),
new MemoryUsageCollector(),
new IOCollector(),
new CollectorMergerCollector(
$middlewareCollectorRedirects,
$middlewareCollectorMetrics
)
));
$metricsMiddleware[] = static fn (): ResponseInterface => new Response(200, ['Content-Type' => 'text/plain'], $registry->print(new Prometheus()));;

if (isset($yaml['hosts']) && is_array($yaml['hosts']) && count($yaml['hosts']) > 0) {
$middleware[] = static function (ServerRequestInterface $request, callable $next) use ($yaml): ResponseInterface {
Expand Down Expand Up @@ -175,7 +163,7 @@
echo $throwable, PHP_EOL;
});

$socket = new React\Socket\Server('0.0.0.0:7132', null, ['backlog' => 511]);
$socket = new React\Socket\SocketServer('0.0.0.0:7132', ['backlog' => 511]);
$socket->on('error', static function (Throwable $throwable): void {
echo $throwable, PHP_EOL;
});
Expand All @@ -186,20 +174,21 @@
echo $throwable, PHP_EOL;
});

$metricsSocket = new React\Socket\Server('0.0.0.0:7133', null, ['backlog' => 511]);
$metricsSocket = new React\Socket\SocketServer('0.0.0.0:7133', ['backlog' => 511]);
$metricsSocket->on('error', static function (Throwable $throwable): void {
echo $throwable, PHP_EOL;
});
$metricsServer->listen($metricsSocket);

$signalHandler = function () use (&$signalHandler, $socket, $metricsSocket) {
$signalHandler = function () use (&$signalHandler, $socket, $metricsSocket, $memoryCollector, $registry) {
echo 'Caught signal', PHP_EOL;
Loop::removeSignal(SIGINT, $signalHandler);
Loop::removeSignal(SIGTERM, $signalHandler);
$socket->close();
$metricsSocket->close();
$memoryCollector->unregister($registry);
echo 'Closed and stopped everything', PHP_EOL;
Loop::stop();
die();
};

Loop::addSignal(SIGINT, $signalHandler);
Expand Down
25 changes: 12 additions & 13 deletions images/reactphp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"require": {
"php": "^7.4",
"php": "^8.3",
"react/http": "^1.4",
"symfony/yaml": "^5.0",
"wyrihaximus/fake-php-version": "^1.3",
"wyrihaximus/react-http-middleware-with-headers": "^2.0",
"react-inspector/http-middleware-printer": "^1.0",
"react-inspector/prometheus-printer": "^1.0",
"react-inspector/http-middleware": "^1.0",
"react-inspector/event-loop": "^1.0",
"react-inspector/stream": "^1.0",
"react-inspector/memory-usage": "^1.0",
"react-inspector/metric": "^1.0",
"react-inspector/metrics": "^1.0",
"react-inspector/printer": "^1.0",
"react-inspector/collector-merger": "^1.0"
"wyrihaximus/fake-php-version": "^1.9.3",
"wyrihaximus/react-http-middleware-with-headers": "^3.0",
"react-inspector/http-middleware": "^3.1",
"react-inspector/event-loop": "^2.0",
"react-inspector/stream": "^2.0",
"react-inspector/memory-usage": "^2.0"
},
"config": {
"platform": {
"php": "8.3.13"
}
}
}
Loading
Loading