Merge branch '2.4-develop' into Arrows_regression_issues_2_4_develop_13jan22

Author: rimple-saini

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

@@ -33,6 +33,20 @@ class EnvironmentConfigSource implements ConfigSourceInterface
      */
     private $placeholder;
 
+    /**
+     * cache for loadConfig()
+     *
+     * @var array|null
+     */
+    private $loadConfigCache;
+
+    /**
+     * cache for loadConfig()
+     *
+     * @var string|null
+     */
+    private $loadConfigCacheEnv;
+
     /**
      * @param ArrayManager $arrayManager
      * @param PlaceholderFactory $placeholderFactory
@@ -57,27 +71,32 @@ public function get($path = '')
 
     /**
      * Loads config from environment variables.
+     * Caching the result for when this method is called multiple times.
+     * The environment variables don't change in run time,  so it is safe to cache.
      *
      * @return array
      */
     private function loadConfig()
     {
         $config = [];
-
+        // phpcs:disable Magento2.Security.Superglobal
         $environmentVariables = $_ENV;
-
+        // phpcs:enable
+        if (null !== $this->loadConfigCache && $this->loadConfigCacheEnv === $environmentVariables) {
+            return $this->loadConfigCache;
+        }
         foreach ($environmentVariables as $template => $value) {
             if (!$this->placeholder->isApplicable($template)) {
                 continue;
             }
-
             $config = $this->arrayManager->set(
                 $this->placeholder->restore($template),
                 $config,
                 $value
             );
         }
-
+        $this->loadConfigCache = $config;
+        $this->loadConfigCacheEnv = $environmentVariables;
         return $config;
     }
 }

app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php

@@ -323,18 +323,11 @@ private function filterPaths(string $prefix, array $groups, array $systemXmlConf
     public function filterNodes(array $configData): array
     {
         if (!empty($configData['groups'])) {
-            $systemXmlPathsFromKeys = array_keys($this->_configStructure->getFieldPaths());
-            $systemXmlPathsFromValues = array_reduce(
-                array_values($this->_configStructure->getFieldPaths()),
-                'array_merge',
-                []
-            );
             //Full list of paths defined in system.xml
-            $systemXmlConfig = array_merge($systemXmlPathsFromKeys, $systemXmlPathsFromValues);
-
+            $fieldPaths = $this->_configStructure->getFieldPaths();
+            $systemXmlConfig = array_merge(array_keys($fieldPaths), ...array_values($fieldPaths));
             $configData['groups'] = $this->filterPaths($configData['section'], $configData['groups'], $systemXmlConfig);
         }
-
         return $configData;
     }
 

app/code/Magento/Config/Model/Config/Structure.php

@@ -384,32 +384,22 @@ public function getFieldPaths()
      * Iteration that collects config field paths recursively from config files.
      *
      * @param array $elements The elements to be parsed
+     * @param array $result used for recursive calls
      * @return array An array of config path to config structure path map
      */
-    private function getFieldsRecursively(array $elements = [])
+    private function getFieldsRecursively(array $elements = [], &$result = [])
     {
-        $result = [];
-
         foreach ($elements as $element) {
             if (isset($element['children'])) {
-                $result = array_merge_recursive(
-                    $result,
-                    $this->getFieldsRecursively($element['children'])
-                );
+                $this->getFieldsRecursively($element['children'], $result);
             } else {
                 if ($element['_elementType'] === 'field') {
                     $structurePath = (isset($element['path']) ? $element['path'] . '/' : '') . $element['id'];
                     $configPath = isset($element['config_path']) ? $element['config_path'] : $structurePath;
-
-                    if (!isset($result[$configPath])) {
-                        $result[$configPath] = [];
-                    }
-
                     $result[$configPath][] = $structurePath;
                 }
             }
         }
-
         return $result;
     }
 }

app/code/Magento/Store/Model/Config/Placeholder.php

@@ -43,48 +43,30 @@ public function __construct(\Magento\Framework\App\RequestInterface $request, $u
      *
      * @param array $data
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(array $data = [])
     {
-        // check provided arguments
         if (empty($data)) {
             return [];
         }
-
-        // initialize $pointer, $parents and $level variable
-        reset($data);
-        $pointer = &$data;
-        $parents = [];
-        $level   = 0;
-
-        while ($level >= 0) {
-            $current = &$pointer[key($pointer)];
-            if (is_array($current)) {
-                reset($current);
-                $parents[$level] = &$pointer;
-                $pointer         = &$current;
-                $level++;
-            } else {
-                $current = $this->_processPlaceholders($current, $data);
-
-                // move pointer of last queue layer to next element
-                // or remove layer if all path elements were processed
-                while ($level >= 0 && next($pointer) === false) {
-                    $level--;
-                    // removal of last element of $parents is skipped here for better performance
-                    // on next iteration that element will be overridden
-                    $pointer = &$parents[$level];
+        array_walk_recursive(
+            $data,
+            function (&$value, $key, $data) {
+                if (is_string($value) && str_contains($value, '{')) {  // If _getPlaceholder() would do nothing, skip
+                    $value = $this->_processPlaceholders($value, $data);
                 }
-            }
-        }
-
+            },
+            $data
+        );
         return $data;
     }
 
     /**
      * Process array data recursively
      *
      * @deprecated 101.0.4 This method isn't used in process() implementation anymore
+     * @see process()
      *
      * @param array &$data
      * @param string $path
@@ -179,6 +161,7 @@ protected function _getValue($path, array $data)
      * Set array value by path
      *
      * @deprecated 101.0.4 This method isn't used in process() implementation anymore
+     * @see process()
      *
      * @param array &$container
      * @param string $path
@@ -187,7 +170,7 @@ protected function _getValue($path, array $data)
      */
     protected function _setValue(array &$container, $path, $value)
     {
-        $segments       = explode('/', (string)$path);
+        $segments = explode('/', (string)$path);
         $currentPointer = &$container;
         foreach ($segments as $segment) {
             if (!isset($currentPointer[$segment])) {