New structure of configs (#17)

yiisoft · Feb 19, 2023 · d28f8ce · d28f8ce
1 parent 8292a29
commit d28f8ce
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 268 deletions.
diff --git a/composer.json b/composer.json
@@ -33,11 +33,11 @@
     "require": {
         "php": "^8.0",
         "vlucas/phpdotenv": "^5.3",
-        "yiisoft/aliases": "^2.0",
+        "yiisoft/aliases": "^3.0",
         "yiisoft/log": "^2.0",
-        "yiisoft/log-target-file": "^2.0",
-        "yiisoft/yii-console": "^1.3",
-        "yiisoft/yii-runner-console": "^1.1"
+        "yiisoft/log-target-file": "^3.0",
+        "yiisoft/yii-console": "^2.0",
+        "yiisoft/yii-runner-console": "^2.0"
     },
     "require-dev": {
         "codeception/codeception": "^5.0",
@@ -61,56 +61,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": {
-            "params": "params.php",
-            "bootstrap": "bootstrap.php",
-            "bootstrap-console": [
-                "$bootstrap",
-                "bootstrap-console.php"
-            ],
-            "common": [
-                "common/*.php"
-            ],
-            "console": [
-                "$common",
-                "console/*.php"
-            ],
-            "events": "events.php",
-            "events-console": [
-                "$events",
-                "events-console.php"
-            ],
-            "providers": "providers.php",
-            "providers-console": [
-                "$providers",
-                "providers-console.php"
-            ],
-            "delegates": "delegates.php",
-            "delegates-console": [
-                "$delegates",
-                "delegates-console.php"
-            ]
-        }
+        "config-plugin-file": "configuration.php"
     },
     "config": {
         "sort-packages": true,

diff --git a/config/.gitignore b/config/.gitignore
@@ -0,0 +1 @@
+.merge-plan.php
diff --git a/config/.merge-plan.php b/config/.merge-plan.php
diff --git a/config/bootstrap-console.php b/config/bootstrap-console.php
diff --git a/config/bootstrap.php b/config/bootstrap.php
diff --git a/config/commands.php b/config/commands.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Command\HelloCommand;
+
+return [
+    HelloCommand::$defaultName => HelloCommand::class,
+];
diff --git a/config/delegates-console.php b/config/delegates-console.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/common/logger.php → config/di/logger.php b/config/common/logger.php → config/di/logger.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
diff --git a/config/events-console.php b/config/events-console.php
diff --git a/config/events.php b/config/events.php
diff --git a/config/params.php b/config/params.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use App\Command\HelloCommand;
-
 return [
     'yiisoft/aliases' => [
         'aliases' => [
@@ -13,8 +11,6 @@
     ],
 
     'yiisoft/yii-console' => [
-        'commands' => [
-            HelloCommand::$defaultName => HelloCommand::class,
-        ],
+        'commands' => require __DIR__ . '/commands.php',
     ],
 ];
diff --git a/config/providers-console.php b/config/providers-console.php
diff --git a/config/providers.php b/config/providers.php
diff --git a/configuration.php b/configuration.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'config-plugin' => [
+        'params' => 'params.php',
+        'params-console' => '$params',
+        'di' => 'di/*.php',
+        'di-console' => '$di',
+        'di-delegates' => [],
+        'di-delegates-console' => '$di-delegates',
+        'di-providers' => [],
+        'di-providers-console' => '$di-providers',
+        'events' => [],
+        'events-console' => '$events',
+        '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',
+    ],
+];