MAGETWO-83646: Encrypted scope-specific config values fail to decrypt on PHP7 #8591

Author: Sergey Shvets

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

@@ -28,19 +28,28 @@ public function convert($source)
     /**
      * Set array value by path
      *
-     * @param array $output
+     * @param array $container
      * @param string $path
      * @param string $value
      * @return array
      */
-    protected function _setArrayValue(array $output, $path, $value)
+    protected function _setArrayValue(array $container, $path, $value)
     {
-        $parts = array_reverse(explode('/', $path));
+        $parts = explode('/', $path);
 
-        $result = $value;
-        foreach ($parts as $part) {
-            $result = [$part => $result];
+        if (count($parts) > 0) {
+            $parts = array_reverse($parts);
+
+            $result = $value;
+            foreach ($parts as $part) {
+                $part = trim($part);
+                if ($part !== '') {
+                    $result = [$part => $result];
+                }
+            }
+
+            $container = array_merge_recursive($container, $result);
         }
-        return array_merge_recursive($output, $result);
+        return $container;
     }
 }

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

@@ -25,13 +25,17 @@ public function testConvert()
             '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' => [