Merge remote-tracking branch 'mainline/2.3.0-release' into 2.3.0-qwerty-bugs

Author: cpartica

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml

@@ -17,6 +17,9 @@
             <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95725"/>
+            <skip>
+                <issueId value="MC-5371" />
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

app/code/Magento/Config/App/Config/Type/System.php

@@ -22,6 +22,7 @@
  *
  * @api
  * @since 100.1.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class System implements ConfigTypeInterface
 {
@@ -131,6 +132,32 @@ public function get($path = '')
         return $this->getWithParts($path);
     }
 
+    /**
+     * Merge newly loaded config data into already loaded.
+     *
+     * @param array $newData
+     * @return void
+     */
+    private function mergeData(array $newData): void
+    {
+        if (array_key_exists(ScopeInterface::SCOPE_DEFAULT, $newData)) {
+            //Sometimes new data may contain links to arrays and we don't want that.
+            $this->data[ScopeInterface::SCOPE_DEFAULT] = (array)$newData[ScopeInterface::SCOPE_DEFAULT];
+            unset($newData[ScopeInterface::SCOPE_DEFAULT]);
+        }
+        foreach ($newData as $scopeType => $scopeTypeData) {
+            if (!array_key_exists($scopeType, $this->data)) {
+                //Sometimes new data may contain links to arrays and we don't want that.
+                $this->data[$scopeType] = (array)$scopeTypeData;
+            } else {
+                foreach ($scopeTypeData as $scopeId => $scopeData) {
+                    //Sometimes new data may contain links to arrays and we don't want that.
+                    $this->data[$scopeType][$scopeId] = (array)$scopeData;
+                }
+            }
+        }
+    }
+
     /**
      * Proceed with parts extraction from path.
      *
@@ -143,8 +170,10 @@ private function getWithParts($path)
 
         if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$pathParts[0]])) {
+                //First filling data property with unprocessed data for post-processors to be able to use.
                 $data = $this->readData();
-                $this->data = array_replace_recursive($this->data, $this->postProcessor->process($data));
+                //Post-processing only the data we know is not yet processed.
+                $this->mergeData($this->postProcessor->process($data));
             }
 
             return $this->data[$pathParts[0]];
@@ -154,12 +183,11 @@ private function getWithParts($path)
 
         if ($scopeType === ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$scopeType])) {
-                $this->data = array_replace_recursive(
-                    $this->data,
-                    $scopeData = $this->loadDefaultScopeData($scopeType)
-                );
+                //Adding unprocessed data to the data property so it can be used in post-processing.
+                $this->mergeData($scopeData = $this->loadDefaultScopeData($scopeType));
+                //Only post-processing the data we know is raw.
                 $scopeData = $this->postProcessor->process($scopeData);
-                $this->data = array_replace_recursive($this->data, $scopeData);
+                $this->mergeData($scopeData);
             }
 
             return $this->getDataByPathParts($this->data[$scopeType], $pathParts);
@@ -169,9 +197,11 @@ private function getWithParts($path)
 
         if (!isset($this->data[$scopeType][$scopeId])) {
             $scopeData = $this->loadScopeData($scopeType, $scopeId);
-            $this->data = array_replace_recursive($this->data, $scopeData);
+            //Adding unprocessed data to the data property so it can be used in post-processing.
+            $this->mergeData($scopeData);
+            //Only post-processing the data we know is raw.
             $scopeData = $this->postProcessor->process($scopeData);
-            $this->data = array_replace_recursive($this->data, $scopeData);
+            $this->mergeData($scopeData);
         }
 
         return isset($this->data[$scopeType][$scopeId])

composer.json

@@ -84,7 +84,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
-        "magento/magento2-functional-testing-framework": "2.3.6",
+        "magento/magento2-functional-testing-framework": "2.3.9",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "~6.5.0",