update deps

Author: Koldo Picaza

composer.json

@@ -15,10 +15,9 @@
     }
   ],
   "require": {
-    "php": "^7.3",
+    "php": "^7.4|^8.0",
     "ext-json": "*",
-    "antidot-fw/antidot-react-http": "dev-master",
-    "antidot-fw/antidot-react-psr15": "dev-master",
+    "antidot-fw/react-framework": "^1.0.0",
     "antidot-fw/fast-router-adapter": "^0.1.0",
     "antidot-fw/cli": "^1.1.0",
     "antidot-fw/container": "^0.1.0",
@@ -32,11 +31,10 @@
     "wshafer/psr11-monolog": "^3.0.0|@dev"
   },
   "require-dev": {
-    "blackfire/php-sdk": "^1.20",
     "franzl/whoops-middleware": "^1.1",
     "phpro/grumphp": "^1.0",
-    "phpstan/phpstan": "^0.11.5",
-    "phpunit/phpunit": "^8.0",
+    "phpstan/phpstan": "^0.12",
+    "phpunit/phpunit": "^8.0|^9.0",
     "roave/security-advisories": "dev-master",
     "seregazhuk/php-watcher": "^0.5.1",
     "squizlabs/php_codesniffer": "^3.4",
@@ -75,15 +73,14 @@
         "antidot-fw/logger",
         "antidot-fw/dev-tools",
         "antidot-fw/doctrine",
-        "antidot-fw/session",
-        "antidot-fw/aura-router-adapter",
+        "antidot-fw/dbal-adapter",
+        "antidot-fw/tactician-adapter",
+        "antidot-fw/message-queue",
         "antidot-fw/cli",
         "antidot-fw/fast-router-adapter",
-        "antidot-fw/phug-te,plate-renderer",
         "antidot-fw/event-dispatcher",
         "antidot-fw/symfony-config-translator",
         "wshafer/psr11-monolog",
-        "laminias/laminas-httphandlerrunner",
         "antidot-fw/antidot-react-http",
         "antidot-fw/antidot-react-psr15"
       ]

config/config.php

@@ -20,9 +20,7 @@
     \Antidot\Logger\Container\Config\ConfigProvider::class,
     \Antidot\Cli\Container\Config\ConfigProvider::class,
     \Antidot\Fast\Router\Container\Config\ConfigProvider::class,
-    \Antidot\React\PSR15\Container\Config\ConfigProvider::class,
     \Antidot\Container\Config\ConfigProvider::class,
-    \Laminas\HttpHandlerRunner\ConfigProvider::class,
     \Antidot\React\Container\Config\ConfigProvider::class,
     class_exists(DevToolsConfigProvider::class) ? DevToolsConfigProvider::class : fn() => [],
     // Load application config in a pre-defined order in such a way that local settings

config/services/dependencies.prod.yaml

@@ -1,5 +1,6 @@
 services:
   App\Application\Http\Handler\HomePage:
+  App\Application\Http\Middleware\HelloWorld:
 #  App\Application\Http\Handler\SomeTestClass:
 #    arguments:
 #      $dispatcher: '@another.dispatcher'

grumphp.yml

@@ -6,3 +6,4 @@ grumphp:
             script: check-all
             triggered_by: [php, phtml]
             working_directory: ~
+

public/index.php

@@ -1,28 +1,69 @@
+#!/usr/bin/env php
 <?php
 
 declare(strict_types=1);
 
-// Delegate static file requests back to the PHP built-in webserver
 use Antidot\Application\Http\Application;
+use Antidot\React\PromiseResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
+use Psr\Http\Message\ServerRequestInterface;
+use Ramsey\Uuid\Uuid;
+use React\EventLoop\Factory;
+use React\Http\Middleware\LimitConcurrentRequestsMiddleware;
+use React\Http\Middleware\RequestBodyBufferMiddleware;
+use React\Http\Middleware\RequestBodyParserMiddleware;
+use React\Http\Middleware\StreamingRequestMiddleware;
+use React\Http\Server;
+use React\Socket\Server as Socket;
+use function React\Promise\resolve;
 
-if (PHP_SAPI === 'cli-server' && $_SERVER['SCRIPT_FILENAME'] !== __FILE__) {
-    return false;
-}
-\chdir(\dirname(__DIR__));
 require 'vendor/autoload.php';
-/**
- * Self-called anonymous function that creates its own scope and keep the global namespace clean.
- */
-\call_user_func(static function (): void {
-    error_reporting(E_ALL & ~E_USER_DEPRECATED & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE);
 
-    /** @var \Psr\Container\ContainerInterface $container */
+call_user_func(static function () {
+    $loop = Factory::create();
     $container = require 'config/container.php';
-    /** @var Application $app */
-    $app = $container->get(Application::class);
-    // Execute programmatic/declarative middleware pipeline and routing
-    // configuration statements
-    (require 'router/middleware.php')($app, $container);
-    (require 'router/routes.php')($app, $container);
-    $app->run();
+    $application = $container->get(Application::class);
+    (require 'router/middleware.php')($application, $container);
+    (require 'router/routes.php')($application, $container);
+
+    $server = new Server(
+        $loop,
+        new StreamingRequestMiddleware(),
+        new LimitConcurrentRequestsMiddleware(100), // 100 concurrent buffering handlers
+        new RequestBodyBufferMiddleware(4 * 1024 * 1024), // 4 MiB
+        new RequestBodyParserMiddleware(),
+        static function (ServerRequestInterface $request) use ($application) {
+            try {
+                $response = new PromiseResponse(
+                    resolve($request)
+                        ->then(static fn ($request) => $request->withAttribute('request_id', Uuid::uuid4()->toString()))
+                        ->then(static fn ($request) => $application->handle($request))
+                );
+            } catch (Throwable $exception) {
+                if (!empty($e = $exception->getPrevious())) {
+                    $exception = $e;
+                }
+
+                $response = new HtmlResponse(
+                    sprintf(
+                        '%s in file %s in line %s.',
+                        $exception->getMessage(),
+                        $exception->getFile(),
+                        $exception->getLine()
+                    )
+                );
+            }
+
+            return resolve($response);
+        }
+    );
+
+    $server->on('error', function ($err) {
+        dump($err);
+    });
+
+    $socket = new Socket('0.0.0.0:8080', $loop);
+    $server->listen($socket);
+
+    $loop->run();
 });

router/middleware.php

@@ -3,13 +3,13 @@
 declare(strict_types=1);
 
 use Antidot\Application\Http\Application;
-use Antidot\React\PSR15\Middleware\ErrorMiddleware;
-use Antidot\React\PSR15\Middleware\ExceptionLoggerMiddleware;
-use Antidot\React\PSR15\Middleware\RequestLoggerMiddleware;
-use Antidot\React\PSR15\Middleware\RouteDispatcherMiddleware;
-use Antidot\React\PSR15\Middleware\RouteNotFoundMiddleware;
+use Antidot\Application\Http\Middleware\ErrorMiddleware;
+use Antidot\Application\Http\Middleware\RouteDispatcherMiddleware;
+use Antidot\Application\Http\Middleware\RouteNotFoundMiddleware;
+use Antidot\Logger\Application\Http\Middleware\ExceptionLoggerMiddleware;
+use Antidot\Logger\Application\Http\Middleware\RequestLoggerMiddleware;
 
-return static function (Application $app) : void {
+return static function (Application $app): void {
     $app->pipe(ErrorMiddleware::class);
     $app->pipe(ExceptionLoggerMiddleware::class);
     $app->pipe(RequestLoggerMiddleware::class);

router/routes.php

@@ -4,6 +4,7 @@
 
 use Antidot\Application\Http\Application;
 use App\Application\Http\Handler\HomePage;
+use App\Application\Http\Middleware\HelloWorld;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -20,5 +21,5 @@
  * $app->route('/contact', App\Handler\ContactHandler::class, ['GET', 'POST', ...], 'contact');
  */
 return static function (Application $app, ContainerInterface $container) : void {
-    $app->get('/', [HomePage::class], 'home');
+    $app->get('/', [HelloWorld::class, HomePage::class], 'home');
 };

src/Application/Command/SomeCommandExample.php

@@ -10,12 +10,13 @@
 
 class SomeCommandExample extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('my:custom:command');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        return 0;
     }
 }

src/Application/Http/Handler/HomePage.php

@@ -4,13 +4,13 @@
 
 namespace App\Application\Http\Handler;
 
-use Antidot\React\PSR15\Response\PromiseResponse;
+use Antidot\React\PromiseResponse;
 use App\Application\Event\SomeEvent;
+use Laminas\Diactoros\Response\JsonResponse;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
 
 use function React\Promise\resolve;
 
@@ -35,7 +35,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 ->then(static function (ServerRequestInterface $request) {
                     return new JsonResponse([
                         'docs' => 'https://antidotfw.io',
-                        'message' => $request->getAttribute('foo') . ' Welcome to Antidot Framework Starter',
+                        'message' => sprintf(
+                            'Hello %s!!!! Welcome to Antidot Framework Starter',
+                            $request->getAttribute('greet')
+                        )
                     ]);
                 })
         );

src/Application/Http/Middleware/HelloWorld.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Application\Http\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class HelloWorld implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $greet = $request->getQueryParams()['greet'] ?? 'World';
+        $request = $request->withAttribute('greet', $greet);
+
+        return $handler->handle($request);
+    }
+}