From cd9115f5246a8a27fef02a293f97762d19f97450 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Thu, 16 Feb 2023 13:40:25 +0300
Subject: [PATCH] Adapt configuration group names to Yii conventions (#25)

---
 CHANGELOG.md                  | 4 ++--
 composer.json                 | 2 +-
 config/{common.php => di.php} | 0
 tests/ConfigTest.php          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename config/{common.php => di.php} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26ce8b..a205bf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Yii RBAC Rules Container Change Log
 
-## 1.1.1 under development
+## 2.0.0 under development
 
-- no changes in this release.
+- Chg #25: Adapt configuration group names to Yii conventions (@vjik)
 
 ## 1.1.0 November 10, 2022
 
diff --git a/composer.json b/composer.json
index 27a327d..206c924 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
         },
         "config-plugin": {
             "params": "params.php",
-            "common": "common.php"
+            "di": "di.php"
         }
     },
     "scripts": {
diff --git a/config/common.php b/config/di.php
similarity index 100%
rename from config/common.php
rename to config/di.php
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index ee3f7fd..119c7d5 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -55,17 +55,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