Adapt to new runners (#159)

yiisoft · Feb 19, 2023 · 24ebcc7 · 24ebcc7
1 parent 1e1247f
commit 24ebcc7
Show file tree

Hide file tree

Showing 42 changed files with 214 additions and 235 deletions.
diff --git a/composer.json b/composer.json
@@ -37,39 +37,39 @@
         "vlucas/phpdotenv": "^5.3",
         "yiisoft/access": "^1.0",
         "yiisoft/auth": "^3.0",
-        "yiisoft/cache": "^2.0",
-        "yiisoft/cache-file": "^2.0",
+        "yiisoft/cache": "^3.0",
+        "yiisoft/cache-file": "^3.0",
         "yiisoft/config": "^1.0",
         "yiisoft/data": "^1.0",
-        "yiisoft/data-response": "^1.0",
+        "yiisoft/data-response": "^2.0",
         "yiisoft/definitions": "^3.0",
         "yiisoft/di": "^1.2",
-        "yiisoft/error-handler": "^2.0",
+        "yiisoft/error-handler": "^3.0",
         "yiisoft/factory": "^1.1",
         "yiisoft/files": "^2.0",
         "yiisoft/http": "^1.2",
         "yiisoft/injector": "^1.1",
         "yiisoft/log": "^2.0",
-        "yiisoft/log-target-file": "^2.0",
+        "yiisoft/log-target-file": "^3.0",
         "yiisoft/request-body-parser": "^1.1",
         "yiisoft/request-model": "^1.0@dev",
-        "yiisoft/router": "^2.0",
-        "yiisoft/router-fastroute": "^2.0",
+        "yiisoft/router": "^3.0",
+        "yiisoft/router-fastroute": "^3.0",
         "yiisoft/security": "^1.0",
-        "yiisoft/translator": "^2.0",
+        "yiisoft/translator": "^3.0",
         "yiisoft/translator-message-php": "^1.1",
-        "yiisoft/user": "^1.0",
+        "yiisoft/user": "^2.0",
         "yiisoft/validator": "^3.0@dev",
-        "yiisoft/yii-console": "^1.3",
+        "yiisoft/yii-console": "^2.0",
         "yiisoft/yii-cycle": "dev-master",
         "yiisoft/yii-debug": "^3.0@dev",
         "yiisoft/yii-debug-api": "^3.0@dev",
-        "yiisoft/yii-event": "^1.0",
+        "yiisoft/yii-event": "^2.0",
         "yiisoft/yii-http": "^1.0",
         "yiisoft/yii-middleware": "dev-master",
-        "yiisoft/yii-runner-console": "^1.1",
-        "yiisoft/yii-runner-http": "^1.1",
-        "yiisoft/yii-swagger": "^1.0"
+        "yiisoft/yii-runner-console": "^2.0",
+        "yiisoft/yii-runner-http": "^2.0",
+        "yiisoft/yii-swagger": "^2.0"
     },
     "require-dev": {
         "codeception/c3": "^2.6",
@@ -116,78 +116,7 @@
         "branch-alias": {
             "dev-master": "1.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.php",
-            "bootstrap": "bootstrap.php",
-            "bootstrap-web": [
-                "$bootstrap",
-                "bootstrap-web.php"
-            ],
-            "bootstrap-console": [
-                "$bootstrap",
-                "bootstrap-console.php"
-            ]
-        }
+        "config-plugin-file": "configuration.php"
     },
     "config": {
         "sort-packages": true,

diff --git a/config/.gitignore b/config/.gitignore
@@ -1 +1,2 @@
 *-local.php
+.merge-plan.php
diff --git a/config/bootstrap-console.php b/config/bootstrap-console.php
diff --git a/config/bootstrap-web.php b/config/bootstrap-web.php
diff --git a/config/bootstrap.php b/config/bootstrap.php
diff --git a/config/common/cache.php → config/common/di/cache.php b/config/common/cache.php → config/common/di/cache.php
diff --git a/config/common/cycle.php → config/common/di/cycle.php b/config/common/cycle.php → config/common/di/cycle.php
diff --git a/config/common/logger.php → config/common/di/logger.php b/config/common/logger.php → config/common/di/logger.php
diff --git a/config/common/router.php → config/common/di/router.php b/config/common/router.php → config/common/di/router.php
diff --git a/config/common/translator.php → config/common/di/translator.php b/config/common/translator.php → config/common/di/translator.php
diff --git a/config/params.php → config/common/params.php b/config/params.php → config/common/params.php
@@ -2,39 +2,21 @@
 
 declare(strict_types=1);
 
-use App\Command\Hello;
 use Cycle\Database\Config\SQLite\FileConnectionConfig;
 use Cycle\Database\Config\SQLiteDriverConfig;
 use Yiisoft\Assets\AssetManager;
 use Yiisoft\Definitions\Reference;
-use Yiisoft\ErrorHandler\Middleware\ErrorCatcher;
-use Yiisoft\Router\Middleware\Router;
-use Yiisoft\Yii\Cycle\Command\Migration;
-use Yiisoft\Yii\Cycle\Command\Schema;
 use Yiisoft\Yii\Cycle\Schema\Conveyor\AttributedSchemaConveyor;
 use Yiisoft\Yii\Cycle\Schema\Provider\FromConveyorSchemaProvider;
 use Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider;
 use Yiisoft\Yii\Cycle\Schema\SchemaProviderInterface;
-use Yiisoft\Yii\Middleware\SubFolder;
 
 return [
-    'locale' => [
-        'locales' => ['en' => 'en-US', 'ru' => 'ru-RU'],
-        'ignoredRequests' => [
-            '/debug**',
-        ],
-    ],
     'supportEmail' => 'support@example.com',
-    'middlewares' => [
-        ErrorCatcher::class,
-        SubFolder::class,
-        \Yiisoft\Yii\Middleware\Locale::class,
-        Router::class,
-    ],
 
     'yiisoft/aliases' => [
         'aliases' => [
-            '@root' => dirname(__DIR__),
+            '@root' => dirname(__DIR__, 2),
             '@assets' => '@public/assets',
             '@assetsUrl' => '@baseUrl/assets',
             '@baseUrl' => '/',
@@ -67,22 +49,6 @@
         ],
     ],
 
-    // Console commands
-    'yiisoft/yii-console' => [
-        'commands' => [
-            'hello' => Hello::class,
-            'cycle/schema' => Schema\SchemaCommand::class,
-            'cycle/schema/php' => Schema\SchemaPhpCommand::class,
-            'cycle/schema/clear' => Schema\SchemaClearCommand::class,
-            'cycle/schema/rebuild' => Schema\SchemaRebuildCommand::class,
-            'migrate/create' => Migration\CreateCommand::class,
-            'migrate/generate' => Migration\GenerateCommand::class,
-            'migrate/up' => Migration\UpCommand::class,
-            'migrate/down' => Migration\DownCommand::class,
-            'migrate/list' => Migration\ListCommand::class,
-        ],
-    ],
-
     'yiisoft/yii-cycle' => [
         // DBAL config
         'dbal' => [
@@ -97,7 +63,7 @@
             ],
             'connections' => [
                 'sqlite' => new SQLiteDriverConfig(
-                    new FileConnectionConfig(dirname(__DIR__) . '/data/db/database.db')
+                    new FileConnectionConfig(dirname(__DIR__, 2) . '/data/db/database.db')
                 ),
             ],
         ],

diff --git a/config/routes.php → config/common/routes.php b/config/routes.php → config/common/routes.php
diff --git a/config/console/.gitkeep b/config/console/.gitkeep
diff --git a/config/console/commands.php b/config/console/commands.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Command\Hello;
+use Yiisoft\Yii\Cycle\Command\Migration;
+use Yiisoft\Yii\Cycle\Command\Schema;
+
+return [
+    'hello' => Hello::class,
+    'cycle/schema' => Schema\SchemaCommand::class,
+    'cycle/schema/php' => Schema\SchemaPhpCommand::class,
+    'cycle/schema/clear' => Schema\SchemaClearCommand::class,
+    'cycle/schema/rebuild' => Schema\SchemaRebuildCommand::class,
+    'migrate/create' => Migration\CreateCommand::class,
+    'migrate/generate' => Migration\GenerateCommand::class,
+    'migrate/up' => Migration\UpCommand::class,
+    'migrate/down' => Migration\DownCommand::class,
+    'migrate/list' => Migration\ListCommand::class,
+];
diff --git a/config/console/params.php b/config/console/params.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'yiisoft/yii-console' => [
+        'commands' => require __DIR__ . '/commands.php',
+    ],
+];
diff --git a/config/delegates-console.php b/config/delegates-console.php
diff --git a/config/delegates-web.php b/config/delegates-web.php
diff --git a/config/delegates.php b/config/delegates.php
diff --git a/config/dev/params.php b/config/dev/params.php
diff --git a/config/environments/dev/params.php b/config/environments/dev/params.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'yiisoft/yii-debug' => [
+        'enabled' => true,
+    ],
+];
diff --git a/config/prod/params.php → config/environments/prod/params.php b/config/prod/params.php → config/environments/prod/params.php
diff --git a/config/test/params.php → config/environments/test/params.php b/config/test/params.php → config/environments/test/params.php
@@ -14,7 +14,7 @@
         'dbal' => [
             'connections' => [
                 'sqlite' => new SQLiteDriverConfig(
-                    new FileConnectionConfig(dirname(__DIR__, 2) . '/tests/Support/Data/database.db')
+                    new FileConnectionConfig(dirname(__DIR__, 3) . '/tests/Support/Data/database.db')
                 ),
             ],
         ],

diff --git a/config/events-console.php b/config/events-console.php
diff --git a/config/events-web.php b/config/events-web.php
diff --git a/config/events.php b/config/events.php
diff --git a/config/providers-console.php b/config/providers-console.php
diff --git a/config/providers-web.php b/config/providers-web.php
diff --git a/config/providers.php b/config/providers.php
diff --git a/config/web/application.php → config/web/di/application.php b/config/web/application.php → config/web/di/application.php
diff --git a/config/web/data-response.php → config/web/di/data-response.php b/config/web/data-response.php → config/web/di/data-response.php
diff --git a/config/web/error-handler.php → config/web/di/error-handler.php b/config/web/error-handler.php → config/web/di/error-handler.php
diff --git a/config/web/middleware-dispatcher.php → config/web/di/middleware-dispatcher.php b/config/web/middleware-dispatcher.php → config/web/di/middleware-dispatcher.php
diff --git a/config/common/psr17.php → config/web/di/psr17.php b/config/common/psr17.php → config/web/di/psr17.php
diff --git a/config/web/user.php → config/web/di/user.php b/config/web/user.php → config/web/di/user.php
diff --git a/config/web/params.php b/config/web/params.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\ErrorHandler\Middleware\ErrorCatcher;
+use Yiisoft\Router\Middleware\Router;
+use Yiisoft\Yii\Middleware\Locale;
+use Yiisoft\Yii\Middleware\SubFolder;
+
+return [
+    'middlewares' => [
+        ErrorCatcher::class,
+        SubFolder::class,
+        Locale::class,
+        Router::class,
+    ],
+
+    'locale' => [
+        'locales' => ['en' => 'en-US', 'ru' => 'ru-RU'],
+        'ignoredRequests' => [
+            '/debug**',
+        ],
+    ],
+];