MAGECLOUD-2173: The "recursion detected" error during a deployment (#345)

Author: shiftedreality

patches.json

@@ -124,6 +124,9 @@
     },
     "Zendframework1 should use TLS 1.2": {
       ">=2.1.4 <2.3": "MAGECLOUD-2521__zendframework1_use_TLS_1.2.patch"
+    },
+    "The recursion detected error during deployment": {
+      "2.2.0 - 2.2.6": "MAGECLOUD-2173__the_recursion_error_during_deployment__2.2.0.patch"
     }
   }
 }

patches/MAGECLOUD-2173__the_recursion_error_during_deployment__2.2.0.patch

@@ -0,0 +1,16 @@
+diff -Nuar a/vendor/magento/module-config/App/Config/Type/System.php b/vendor/magento/module-config/App/Config/Type/System.php
+--- a/vendor/magento/module-config/App/Config/Type/System.php
++++ b/vendor/magento/module-config/App/Config/Type/System.php
+@@ -155,7 +155,11 @@ class System implements ConfigTypeInterface
+         }
+         $scopeId = array_shift($pathParts);
+         if (!isset($this->data[$scopeType][$scopeId])) {
+-            $this->data = array_replace_recursive($this->loadScopeData($scopeType, $scopeId), $this->data);
++            $scopeData = $this->loadScopeData($scopeType, $scopeId);
++            /* Starting from 2.2.0 $this->data can be already loaded with $this->loadScopeData  */
++            if (!isset($this->data[$scopeType][$scopeId])) {
++                $this->data = array_replace_recursive($scopeData, $this->data);
++            }
+         }
+         return isset($this->data[$scopeType][$scopeId])
+             ? $this->getDataByPathParts($this->data[$scopeType][$scopeId], $pathParts)