adapt blog

blog/composer.json

@@ -129,82 +129,7 @@
         "branch-alias": {
             "dev-master": "3.0.x-dev"
         },
-        "config-plugin-options": {
-            "source-directory": "config"
-        },
-        "config-plugin-environments": {
-            "dev": {
-                "params": [
-                    "test/params.php"
-                ]
-            },
-            "prod": {
-                "params": [
-                    "test/params.php"
-                ]
-            },
-            "test": {
-                "params": [
-                    "test/params.php"
-                ]
-            }
-        },
-        "config-plugin": {
-            "common": "common/*.php",
-            "params": [
-                "params.php",
-                "?params-local.php"
-            ],
-            "web": [
-                "$common",
-                "web/*.php"
-            ],
-            "console": [
-                "$common",
-                "console/*.php"
-            ],
-            "events": "events.php",
-            "events-web": [
-                "$events",
-                "events-web.php"
-            ],
-            "events-console": [
-                "$events",
-                "events-console.php"
-            ],
-            "providers": "providers.php",
-            "providers-web": [
-                "$providers",
-                "providers-web.php"
-            ],
-            "providers-console": [
-                "$providers",
-                "providers-console.php"
-            ],
-            "delegates": "delegates.php",
-            "delegates-web": [
-                "$delegates",
-                "delegates-web.php"
-            ],
-            "delegates-console": [
-                "$delegates",
-                "delegates-console.php"
-            ],
-            "routes": [
-                "routes-backend.php",
-                "routes.php"
-            ],
-            "bootstrap": "bootstrap.php",
-            "bootstrap-web": [
-                "$bootstrap",
-                "bootstrap-web.php"
-            ],
-            "bootstrap-console": [
-                "$bootstrap",
-                "bootstrap-console.php"
-            ],
-            "widgets": "widgets.php"
-        },
+        "config-plugin-file": "configuration.php",
         "installer-types": [
             "npm-asset"
         ],

blog/config/params.php → blog/config/common/params.php

@@ -9,50 +9,25 @@
 use Cycle\Database\Config\SQLite\FileConnectionConfig;
 use Cycle\Database\Config\SQLiteDriverConfig;
 use Yiisoft\Assets\AssetManager;
-use Yiisoft\Cookies\CookieMiddleware;
 use Yiisoft\Definitions\Reference;
-use Yiisoft\ErrorHandler\Middleware\ErrorCatcher;
 use Yiisoft\Form\Field\SubmitButton;
 use Yiisoft\Router\CurrentRoute;
-use Yiisoft\Router\Middleware\Router;
 use Yiisoft\Router\UrlGeneratorInterface;
-use Yiisoft\Session\SessionMiddleware;
 use Yiisoft\Translator\TranslatorInterface;
-use Yiisoft\User\Login\Cookie\CookieLoginMiddleware;
-use Yiisoft\Yii\Console\Application;
-use Yiisoft\Yii\Console\Command\Serve;
 use Yiisoft\Yii\Cycle\Schema\Conveyor\AttributedSchemaConveyor;
 use Yiisoft\Yii\Cycle\Schema\Provider\FromConveyorSchemaProvider;
 use Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider;
-use Yiisoft\Yii\Middleware\Locale;
-use Yiisoft\Yii\Sentry\SentryMiddleware;
 use Yiisoft\Yii\View\CsrfViewInjection;
 
 return [
-    'locale' => [
-        'locales' => ['en' => 'en-US', 'ru' => 'ru-RU', 'id' => 'id-ID', 'sk' => 'sk-SK'],
-        'ignoredRequests' => [
-            '/debug**',
-            '/inspect**',
-        ],
-    ],
     'mailer' => [
         'adminEmail' => '[email protected]',
         'senderEmail' => '[email protected]',
     ],
-    'middlewares' => [
-        ErrorCatcher::class,
-        SentryMiddleware::class,
-        SessionMiddleware::class,
-        CookieMiddleware::class,
-        CookieLoginMiddleware::class,
-        Locale::class,
-        Router::class,
-    ],
 
     'yiisoft/aliases' => [
         'aliases' => [
-            '@root' => dirname(__DIR__),
+            '@root' => dirname(__DIR__, 2),
             '@assets' => '@root/public/assets',
             '@assetsUrl' => '@baseUrl/assets',
             '@baseUrl' => $_ENV['BASE_URL'],
@@ -129,21 +104,6 @@
         ],
     ],
 
-    'yiisoft/yii-console' => [
-        'name' => Application::NAME,
-        'version' => Application::VERSION,
-        'autoExit' => false,
-        'commands' => [
-            'serve' => Serve::class,
-            'user/create' => App\User\Console\CreateCommand::class,
-            'user/assignRole' => App\User\Console\AssignRoleCommand::class,
-            'fixture/add' => App\Command\Fixture\AddCommand::class,
-            'fixture/schema/clear' => App\Command\Fixture\SchemaClearCommand::class,
-            'router/list' => App\Command\Router\ListCommand::class,
-            'translator/translate' => App\Command\Translation\TranslateCommand::class,
-        ],
-    ],
-
     'yiisoft/yii-cycle' => [
         // DBAL config
         'dbal' => [

blog/config/console/commands.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Yii\Console\Command\Serve;
+
+return [
+    'serve' => Serve::class,
+    'user/create' => App\User\Console\CreateCommand::class,
+    'user/assignRole' => App\User\Console\AssignRoleCommand::class,
+    'fixture/add' => App\Command\Fixture\AddCommand::class,
+    'fixture/schema/clear' => App\Command\Fixture\SchemaClearCommand::class,
+    'router/list' => App\Command\Router\ListCommand::class,
+    'translator/translate' => App\Command\Translation\TranslateCommand::class,
+];

blog/config/console/params.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Yii\Console\Application;
+
+return [
+    'yiisoft/yii-console' => [
+        'name' => Application::NAME,
+        'version' => Application::VERSION,
+        'autoExit' => false,
+        'commands' => require __DIR__ . '/commands.php',
+    ],
+];

blog/config/web/params.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Cookies\CookieMiddleware;
+use Yiisoft\ErrorHandler\Middleware\ErrorCatcher;
+use Yiisoft\Router\Middleware\Router;
+use Yiisoft\Session\SessionMiddleware;
+use Yiisoft\User\Login\Cookie\CookieLoginMiddleware;
+use Yiisoft\Yii\Middleware\Locale;
+use Yiisoft\Yii\Sentry\SentryMiddleware;
+
+return [
+    'middlewares' => [
+        ErrorCatcher::class,
+        SentryMiddleware::class,
+        SessionMiddleware::class,
+        CookieMiddleware::class,
+        CookieLoginMiddleware::class,
+        Locale::class,
+        Router::class,
+    ],
+
+    'locale' => [
+        'locales' => ['en' => 'en-US', 'ru' => 'ru-RU', 'id' => 'id-ID', 'sk' => 'sk-SK'],
+        'ignoredRequests' => [
+            '/debug**',
+            '/inspect**',
+        ],
+    ],
+];

blog/configuration.php

@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'config-plugin' => [
+        'params' => [
+            'common/params.php',
+        ],
+        'params-web' => [
+            '$params',
+            'web/params.php',
+        ],
+        'params-console' => [
+            '$params',
+            'console/params.php',
+        ],
+        'di' => [
+            '$common',
+            'common/di/*.php',
+        ],
+        'di-web' => [
+            '$di',
+            '$web',
+            'web/di/*.php',
+        ],
+        'di-console' => [
+            '$di',
+            '$console',
+        ],
+        'di-providers' => [
+            '$providers',
+        ],
+        'di-providers-web' => [
+            '$di-providers',
+        ],
+        'di-providers-console' => [
+            '$di-providers',
+        ],
+        'di-delegates' => [
+            '$delegates',
+        ],
+        'di-delegates-web' => [
+            '$di-delegates',
+        ],
+        'di-delegates-console' => [
+            '$di-delegates',
+        ],
+        'events' => [],
+        'events-web' => [
+            '$events',
+            'web/events.php',
+        ],
+        'events-console' => [
+            '$events',
+            'console/events.php',
+        ],
+        'routes' => [
+            'common/routes/*.php',
+        ],
+        'bootstrap' => [
+            'common/bootstrap.php',
+        ],
+        'bootstrap-web' => [
+            '$bootstrap',
+        ],
+        'bootstrap-console' => [
+            '$bootstrap',
+        ],
+    ],
+    'config-plugin-environments' => [
+        'dev' => [
+            'params' => [
+                'environments/dev/params.php',
+            ],
+        ],
+        'prod' => [
+            'params' => [
+                'environments/prod/params.php',
+            ],
+        ],
+        'test' => [
+            'params' => [
+                'environments/test/params.php',
+            ],
+        ],
+    ],
+    'config-plugin-options' => [
+        'source-directory' => 'config',
+    ],
+];

blog/docker-compose.yml

@@ -8,5 +8,8 @@ services:
             - ./:/app
             # host-volume for composer cache
             - ~/.composer-docker/cache:/root/.composer/cache:delegated
+            - /projects/yii-dev-tool/dev/yii-runner:/app/vendor/yiisoft/yii-runner
+            - /projects/yii-dev-tool/dev/yii-runner-http:/app/vendor/yiisoft/yii-runner-http
+            - /projects/yii-dev-tool/dev/yii-runner-console:/app/vendor/yiisoft/yii-runner-console
         ports:
             - '30080:80'