Adapt configuration group names to Yii conventions (#117)

vjik · web-flow · commit 94bb931d667a · 2023-02-15T17:28:18.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Yii Cache Change Log
 
-## 2.0.1 under development
+## 3.0.0 under development
 
-- no changes in this release.
+- Chg #117: Adapt configuration group names to Yii conventions (@vjik)
 
 ## 2.0.0 June 29, 2022
 
diff --git a/composer.json b/composer.json
@@ -39,7 +39,8 @@
         "rector/rector": "^0.15.2",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6"
+        "vimeo/psalm": "^4.30|^5.6",
+        "yiisoft/di": "^1.2"
     },
     "provide": {
         "psr/simple-cache-implementation": "2.0|3.0"
@@ -67,7 +68,7 @@
             "source-directory": "config"
         },
         "config-plugin": {
-            "common": "common.php"
+            "di": "di.php"
         }
     },
     "config": {
diff --git a/config/di.php b/config/di.php
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Cache\Tests;
+
+use Yiisoft\Cache\ArrayCache;
+use Yiisoft\Cache\Cache;
+use Yiisoft\Di\Container;
+use Yiisoft\Di\ContainerConfig;
+
+final class ConfigTest extends TestCase
+{
+    public function testBase(): void
+    {
+        $container = $this->createContainer();
+
+        $yiiCache = $container->get(\Yiisoft\Cache\CacheInterface::class);
+        $psrCache = $container->get(\Psr\SimpleCache\CacheInterface::class);
+
+        $this->assertInstanceOf(Cache::class, $yiiCache);
+        $this->assertInstanceOf(ArrayCache::class, $psrCache);
+    }
+
+    private function createContainer(): Container
+    {
+        return new Container(
+            ContainerConfig::create()->withDefinitions(
+                $this->getDiConfig()
+            )
+        );
+    }
+
+    private function getDiConfig(): array
+    {
+        return require dirname(__DIR__) . '/config/di.php';
+    }
+}
