Merge branch 'ACP2E-2069' of https://github.com/magento-l3/magento2ce into Tier4-PR-10-30-2023

Author: thiaramus

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Sanitizer.php

@@ -43,28 +43,19 @@ private function extractConfig(array $data)
     public function sanitize(array $data): array
     {
         $config = $this->extractConfig($data);
-        $toProcess = [];
-        array_walk(
-            $data,
-            function ($datum, string $key) use (&$config, &$toProcess) : void {
-                if (is_array($datum)) {
-                    //Each array must have it's own __disableTmpl property
-                    $toProcess[$key] = $datum;
-                } elseif ((
-                        !is_bool($config) && !array_key_exists($key, $config)
-                    )
-                    && (is_string($datum) || $datum instanceof Phrase)
-                    && preg_match('/\$\{.+\}/', (string)$datum)
-                ) {
-                    //Templating is not disabled for all properties or for this property specifically
-                    //Property is a string that contains template syntax so we are disabling it's rendering
-                    $config[$key] = true;
-                }
+        foreach ($data as $key => $datum) {
+            if (is_array($datum)) {
+                //Each array must have its own __disableTmpl property
+                $data[$key] = $this->sanitize($datum);
+            } elseif (!is_bool($config)
+                && !array_key_exists($key, $config)
+                && (is_string($datum) || $datum instanceof Phrase)
+                && preg_match('/\$\{.+\}/', (string)$datum)
+            ) {
+                //Templating is not disabled for all properties or for this property specifically
+                //Property is a string that contains template syntax, so we are disabling its rendering
+                $config[$key] = true;
             }
-        );
-        if ($toProcess) {
-            //Processing sub-arrays
-            $data = array_replace($data, array_map([$this, 'sanitize'], $toProcess));
         }
         if ($config !== []) {
             //Some properties require rendering configuration.