update to PHP 7.4

Author: kpicaza

composer.json

@@ -19,29 +19,29 @@
     "ext-json": "*",
     "antidot-fw/antidot-react-http": "dev-master",
     "antidot-fw/antidot-react-psr15": "dev-master",
-    "antidot-fw/fast-router-adapter": "dev-master",
-    "antidot-fw/cli": "^1.0.0",
-    "antidot-fw/container": "^0.0.2",
-    "antidot-fw/dev-tools": "dev-master",
-    "antidot-fw/event-dispatcher": "^1.1.0",
-    "antidot-fw/framework": "^0.0.2",
-    "antidot-fw/logger": "^1.0.1",
-    "antidot-fw/symfony-config-translator": "^1.0.0",
-    "antidot-fw/yaml-config-provider": "dev-master",
-    "symfony/yaml": "^4.2.7",
-    "wshafer/psr11-monolog": "@dev"
+    "antidot-fw/fast-router-adapter": "^0.1.0",
+    "antidot-fw/cli": "^1.1.0",
+    "antidot-fw/container": "^0.1.0",
+    "antidot-fw/dev-tools": "^0.1.2",
+    "antidot-fw/event-dispatcher": "^1.1.1",
+    "antidot-fw/framework": "^0.1.1",
+    "antidot-fw/logger": "^1.1.0",
+    "antidot-fw/symfony-config-translator": "^1.1.0",
+    "antidot-fw/yaml-config-provider": "^0.1.0",
+    "webmozart/assert": "^1.7.0",
+    "wshafer/psr11-monolog": "^3.0.0"
   },
   "require-dev": {
     "blackfire/php-sdk": "^1.20",
     "franzl/whoops-middleware": "^1.1",
-    "phpro/grumphp": "^0.15.0",
+    "phpro/grumphp": "0.17.2",
     "phpstan/phpstan": "^0.11.5",
     "phpunit/phpunit": "^8.0",
     "roave/security-advisories": "dev-master",
     "seregazhuk/php-watcher": "^0.5.1",
     "squizlabs/php_codesniffer": "^3.4",
     "symfony/var-dumper": "^4.2",
-    "zendframework/zend-component-installer": "^2.1"
+    "laminas/laminas-component-installer": "^2.1.2"
   },
   "autoload": {
     "psr-4": {
@@ -83,7 +83,7 @@
         "antidot-fw/event-dispatcher",
         "antidot-fw/symfony-config-translator",
         "wshafer/psr11-monolog",
-        "zendframework/zend-httphandlerrunner",
+        "laminias/laminas-httphandlerrunner",
         "antidot-fw/antidot-react-http",
         "antidot-fw/antidot-react-psr15"
       ]

config/cli-config.php

@@ -2,17 +2,20 @@
 
 declare(strict_types=1);
 
-use Zend\ConfigAggregator\ArrayProvider;
-use Zend\ConfigAggregator\ConfigAggregator;
+use Antidot\SymfonyConfigTranslator\Container\Config\ConfigAggregator;
+use Laminas\ConfigAggregator\ArrayProvider;
 
 $config = require __DIR__ . '/config.php';
-$cliConfig['dependencies'] = $config['console']['dependencies'];
+$cliConfig['services'] = $config['console']['services'] ?? [];
+$cliConfig['factories'] = $config['console']['factories'] ?? [];
 $cacheConfig = [
     'cli_config_cache_path' => 'var/cache/cli-config-cache.php',
 ];
 
-return (new ConfigAggregator([
-    new ArrayProvider($config),
-    new ArrayProvider($cliConfig),
-    new ArrayProvider($cacheConfig),
-], $cacheConfig['cli_config_cache_path']))->getMergedConfig();
+return (new ConfigAggregator(
+    [
+        new ArrayProvider($config),
+        new ArrayProvider($cliConfig),
+        new ArrayProvider($cacheConfig),
+    ], $cacheConfig['cli_config_cache_path']
+))->getMergedConfig();

config/cli-container.php

@@ -1,8 +1,8 @@
 <?php
 
 // Load configuration
-use Antidot\Container\ContainerBuilder;
+use Antidot\Container\Builder;
 
 $config = require __DIR__ . '/../config/cli-config.php';
 
-return ContainerBuilder::build($config, true);
+return Builder::build($config, true);

config/config.php

@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
+use Antidot\DevTools\Container\Config\ConfigProvider as DevToolsConfigProvider;
 use Antidot\SymfonyConfigTranslator\Container\Config\ConfigAggregator;
 use Antidot\Yaml\YamlConfigProvider;
-use Zend\ConfigAggregator\ArrayProvider;
-use Zend\ConfigAggregator\PhpFileProvider;
+use Laminas\ConfigAggregator\ArrayProvider;
+use Laminas\ConfigAggregator\PhpFileProvider;
 
 // To enable or disable caching, set the `ConfigAggregator::ENABLE_CACHE` boolean in
 // `config/autoload/local.php`.
@@ -14,7 +15,16 @@
 ];
 
 $aggregator = new ConfigAggregator([
+    \WShafer\PSR11MonoLog\ConfigProvider::class,
+    \Antidot\Event\Container\Config\ConfigProvider::class,
+    \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
     // overwrite global settings. (Loaded as first to last):
     //   - `*.php`

config/container.php

@@ -1,9 +1,9 @@
 <?php
 
 // Load configuration
-use Antidot\Container\ContainerBuilder;
+use Antidot\Container\Builder;
 
 $config = require __DIR__ . '/../config/config.php';
 
 // Build container
-return ContainerBuilder::build($config, true);
+return Builder::build($config, true);

src/Application/Http/Handler/HomePage.php

@@ -10,13 +10,13 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use React\Promise\FulfilledPromise;
 use Zend\Diactoros\Response\JsonResponse;
 
+use function React\Promise\resolve;
+
 class HomePage implements RequestHandlerInterface
 {
-    /** @var EventDispatcherInterface */
-    private $eventDispatcher;
+    private EventDispatcherInterface $eventDispatcher;
 
     public function __construct(EventDispatcherInterface $eventDispatcher)
     {
@@ -25,15 +25,14 @@ public function __construct(EventDispatcherInterface $eventDispatcher)
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $promise = new FulfilledPromise($request);
-
+        $eventDispatcher = $this->eventDispatcher;
         return new PromiseResponse(
-            $promise
-                ->then(function (ServerRequestInterface $request) {
-                    $this->eventDispatcher->dispatch(SomeEvent::occur());
+            resolve($request)
+                ->then(static function (ServerRequestInterface $request) use ($eventDispatcher) {
+                    $eventDispatcher->dispatch(SomeEvent::occur());
                     return $request;
                 })
-                ->then(function (ServerRequestInterface $request) {
+                ->then(static function (ServerRequestInterface $request) {
                     return new JsonResponse([
                         'docs' => 'https://antidotfw.io',
                         'message' => $request->getAttribute('foo') . ' Welcome to Antidot Framework Starter',