Config class should use config constant instead of using config key #9 (

#10)
elie29 · Jun 4, 2018 · 739921b · 739921b
1 parent a2f9dfc
commit 739921b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- [#9](https://github.com/elie29/zend-di-config/issues/9) Config class should use config constant instead of using config key.
 
 ### Deprecated
 
@@ -29,7 +29,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- [#8](https://github.com/elie29/zend-di-config/issues/8) Update composer.
+- [#8](https://github.com/elie29/zend-di-config/issues/8) Updated composer.
 - [#7](https://github.com/elie29/zend-di-config/issues/7) Renamed test folder.
 
 ### Changed

diff --git a/src/Config.php b/src/Config.php
@@ -21,7 +21,7 @@ class Config implements ConfigInterface
 
     public function __construct(array $config)
     {
-        $this->definitions = ['config' => $config];
+        $this->definitions = [$this::CONFIG => $config];
     }
 
     public function configureContainer(ContainerBuilder $builder): void
@@ -34,7 +34,7 @@ public function configureContainer(ContainerBuilder $builder): void
 
     private function setDependencies(): void
     {
-        $this->dependencies = $this->definitions['config']['dependencies'] ?? [];
+        $this->dependencies = $this->definitions[$this::CONFIG]['dependencies'] ?? [];
     }
 
     private function addDefinitions(ContainerBuilder $builder): void
@@ -104,14 +104,14 @@ private function addDelegators(): void
 
     private function enableCompilation(ContainerBuilder $builder): void
     {
-        if (! empty($this->definitions['config'][static::DI_CACHE_PATH])) {
-            $builder->enableCompilation($this->definitions['config'][static::DI_CACHE_PATH]);
+        if (! empty($this->definitions[$this::CONFIG][$this::DI_CACHE_PATH])) {
+            $builder->enableCompilation($this->definitions[$this::CONFIG][$this::DI_CACHE_PATH]);
         }
     }
 
     private function enableCache(ContainerBuilder $builder): void
     {
-        if (! empty($this->definitions['config'][static::ENABLE_CACHE_DEFINITION])) {
+        if (! empty($this->definitions[$this::CONFIG][$this::ENABLE_CACHE_DEFINITION])) {
             $builder->enableDefinitionCache();
         }
     }

diff --git a/src/ConfigInterface.php b/src/ConfigInterface.php
@@ -8,6 +8,8 @@
 
 interface ConfigInterface
 {
+
+    const CONFIG = 'config';
     const DI_CACHE_PATH = 'di_cache_path';
     const ENABLE_CACHE_DEFINITION = 'enable_cache_definition';
 

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -26,7 +26,7 @@ public function testConfigurationKeysValues()
 
         $container = $this->getContainer($config);
 
-        $config = $container->get('config');
+        $config = $container->get(Config::CONFIG);
 
         self::assertNotEmpty($config);
         self::assertInstanceOf(\DateTime::class, $config['a']);
@@ -40,7 +40,7 @@ public function testConfigurationEnableCompilation()
 
         $container = $this->getContainer($config);
 
-        $config = $container->get('config');
+        $config = $container->get(Config::CONFIG);
 
         self::assertNotEmpty($config);
         self::assertSame(__DIR__, $config[Config::DI_CACHE_PATH]);