Merge pull request #499 from openeuropa/GH-498

GH-498 - Fixing ConfigContext backup strategy.
jhedstrom · Oct 17, 2018 · 3e2cfb9 · 3e2cfb9
2 parents 2d98cc6 + 245fec6
commit 3e2cfb9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Drupal/DrupalExtension/Context/ConfigContext.php b/src/Drupal/DrupalExtension/Context/ConfigContext.php
@@ -107,6 +107,13 @@ public function setConfig($name, $key, $value)
     {
         $backup = $this->getDriver()->configGet($name, $key);
         $this->getDriver()->configSet($name, $key, $value);
-        $this->config[$name][$key] = $backup;
+        if (!array_key_exists($name, $this->config)) {
+            $this->config[$name][$key] = $backup;
+            return;
+        }
+
+        if (!array_key_exists($key, $this->config[$name])) {
+            $this->config[$name][$key] = $backup;
+        }
     }
 }