Adapt configuration group names to Yii conventions (#59)

yiisoft · Feb 13, 2023 · 8344b73 · 8344b73
1 parent 5ff89a4
commit 8344b73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,44 +1,45 @@
 # Yii Aliases Change Log
 
-## 2.1.0 under development
+## 3.0.0 under development
 
-- New #44: Add method `Aliases::getArray()` that bulk translates path aliases into actual paths (vjik)
+- New #44: Add method `Aliases::getArray()` that bulk translates path aliases into actual paths (@vjik)
+- Chg #59: Adapt configuration group names to Yii conventions (@vjik)
 
 ## 2.0.0 April 13, 2021
 
-- Chg #40: Remove magic `__set()` that was leading to weird side-effects (samdark)
+- Chg #40: Remove magic `__set()` that was leading to weird side-effects (@samdark)
 
 ## 1.1.4 April 13, 2021
 
-- Chg: Adjust config for yiisoft/factory changes (vjik, samdark)
+- Chg: Adjust config for yiisoft/factory changes (@vjik, @samdark)
 
 ## 1.1.3 March 23, 2021
 
-- Chg: Adjust config for new config plugin (samdark)
+- Chg: Adjust config for new config plugin (@samdark)
 
 ## 1.1.2 December 24, 2020
 
-- Bug #35: Don't throw TypeError from method `getAll()`, when alias is nested (Fantom409)
+- Bug #35: Don't throw TypeError from method `getAll()`, when alias is nested (@Fantom409)
 
 ## 1.1.1 November 06, 2020
 
-- Bug #28: Add `params` to `config-plugin` section in `composer.json` (vjik)
+- Bug #28: Add `params` to `config-plugin` section in `composer.json` (@vjik)
 
 ## 1.1.0 November 4, 2020
 
-- Chg #26: Change Yii configuration `$params['aliases']` to `$params['yiisoft/aliases']['aliases']` (vjik)
+- Chg #26: Change Yii configuration `$params['aliases']` to `$params['yiisoft/aliases']['aliases']` (@vjik)
 
 ## 1.0.3 October 6, 2020
 
-- Enh: Don't error on config assembly in case aliases aren't set (samdark)
+- Enh: Don't error on config assembly in case aliases aren't set (@samdark)
 
 ## 1.0.2 October 5, 2020
 
-- Enh: Add a config for composer-config-plugin (xepozz)
+- Enh: Add a config for composer-config-plugin (@xepozz)
 
 ## 1.0.1 August 21, 2020
 
-- Enh: Allow installing on PHP 8 (samdark)
+- Enh: Allow installing on PHP 8 (@samdark)
 
 ## 1.0.0 June 7, 2020
 

diff --git a/composer.json b/composer.json
@@ -58,7 +58,7 @@
         },
         "config-plugin": {
             "params": "params.php",
-            "common": "common.php"
+            "di": "di.php"
         }
     },
     "scripts": {

diff --git a/config/common.php → config/di.php b/config/common.php → config/di.php
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -41,17 +41,17 @@ private function createContainer(?array $params = null): Container
     {
         return new Container(
             ContainerConfig::create()->withDefinitions(
-                $this->getCommonDefinitions($params)
+                $this->getDiConfig($params)
             )
         );
     }
 
-    private function getCommonDefinitions(?array $params = null): array
+    private function getDiConfig(?array $params = null): array
     {
         if ($params === null) {
             $params = $this->getParams();
         }
-        return require dirname(__DIR__) . '/config/common.php';
+        return require dirname(__DIR__) . '/config/di.php';
     }
 
     private function getParams(): array