Merge branch 'MAGETWO-83646' into Chaika_2.1.13_PR4

Author: veloraven

app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\App\Config\Source;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
@@ -84,12 +85,12 @@ private function loadConfig()
             }
         }
 
-        foreach ($config as $scope => &$item) {
+        foreach ($config as $scope => $item) {
             if ($scope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
-                $item = $this->converter->convert($item);
+                $config[$scope] = $this->converter->convert($item);
             } else {
-                foreach ($item as &$scopeItems) {
-                    $scopeItems = $this->converter->convert($scopeItems);
+                foreach ($item as $scopeCode => $scopeItems) {
+                    $config[$scope][$scopeCode] = $this->converter->convert($scopeItems);
                 }
             }
         }

lib/internal/Magento/Framework/App/Config/Scope/Converter.php

@@ -5,6 +5,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Config\Scope;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
@@ -19,29 +20,36 @@ public function convert($source)
     {
         $output = [];
         foreach ($source as $key => $value) {
-            $this->_setArrayValue($output, $key, $value);
+            $output = $this->_setArrayValue($output, $key, $value);
         }
         return $output;
     }
 
     /**
      * Set array value by path
      *
-     * @param array &$container
+     * @param array $container
      * @param string $path
      * @param string $value
-     * @return void
+     * @return array
      */
-    protected function _setArrayValue(array &$container, $path, $value)
+    protected function _setArrayValue(array $container, $path, $value)
     {
-        $segments = explode('/', $path);
-        $currentPointer = & $container;
-        foreach ($segments as $segment) {
-            if (!isset($currentPointer[$segment])) {
-                $currentPointer[$segment] = [];
+        $parts = explode('/', $path);
+
+        if (count($parts) > 0) {
+            $parts = array_reverse($parts);
+
+            $result = $value;
+            foreach ($parts as $part) {
+                $part = trim($part);
+                if ($part !== '') {
+                    $result = [$part => $result];
+                }
             }
-            $currentPointer = & $currentPointer[$segment];
+
+            $container = array_merge_recursive($container, $result);
         }
-        $currentPointer = $value;
+        return $container;
     }
 }

lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ConverterTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit\Config\Scope;
 
 class ConverterTest extends \PHPUnit_Framework_TestCase
@@ -19,8 +20,29 @@ protected function setUp()
 
     public function testConvert()
     {
-        $data = ['some/config/path1' => 'value1', 'some/config/path2' => 'value2'];
-        $expectedResult = ['some' => ['config' => ['path1' => 'value1', 'path2' => 'value2']]];
+        $data = [
+            'some/config/path1' => 'value1',
+            'some/config/path2' => 'value2',
+            'some/config/path2' => 'value3',
+            'some2/config/path2' => 'value4',
+            'some/bad/path////' => 'value5',
+        ];
+        $expectedResult = [
+            'some' => [
+                'config' => [
+                    'path1' => 'value1',
+                    'path2' => 'value3',
+                ],
+                'bad' => [
+                    'path' => 'value5',
+                ],
+            ],
+            'some2' => [
+                'config' => [
+                    'path2' => 'value4',
+                ]
+            ]
+        ];
         $this->assertEquals($expectedResult, $this->_model->convert($data));
     }
 }