Merge pull request #147 from hassankhan/fix-merge

Fix merge
hassankhan · Mar 26, 2022 · 68a97c5 · 68a97c5
2 parents a3f02c5 + 830e8b2
commit 68a97c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/AbstractConfig.php b/src/AbstractConfig.php
@@ -146,6 +146,7 @@ public function has($key)
     public function merge(ConfigInterface $config)
     {
         $this->data = array_replace_recursive($this->data, $config->all());
+        $this->cache = [];
         return $this;
     }
 

diff --git a/tests/AbstractConfigTest.php b/tests/AbstractConfigTest.php
@@ -290,6 +290,8 @@ public function testMerge()
             ]
         );
 
+        // Trigger the cache
+        $this->config->get('host');
         $this->config->merge($remote);
 
         $this->assertEquals('127.0.0.1', $this->config['host']);