ENGCOM-7286: Prevent leaking of variables to global scope #27622

Author: slavvka

lib/internal/Magento/Framework/RequireJs/Config.php

@@ -293,25 +293,26 @@ protected function getConfigFileName()
      */
     public function getMinResolverCode()
     {
-        $excludes = ['url.indexOf(baseUrl) === 0'];
+        $excludes = ['url.indexOf(baseUrl)===0'];
         foreach ($this->minification->getExcludes('js') as $expression) {
             $excludes[] = '!url.match(/' . str_replace('/', '\/', $expression) . '/)';
         }
         $excludesCode = empty($excludes) ? 'true' : implode('&&', $excludes);
 
         $result = <<<code
-    var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl,
-        baseUrl = ctx.config.baseUrl;
-
-    ctx.nameToUrl = function() {
-        var url = origNameToUrl.apply(ctx, arguments);
-        if ({$excludesCode}) {
-            url = url.replace(/(\.min)?\.js$/, '.min.js');
-        }
-        return url;
-    };
-
+    (function () {
+        var ctx = require.s.contexts._,
+            origNameToUrl = ctx.nameToUrl,
+            baseUrl = ctx.config.baseUrl;
+
+        ctx.nameToUrl = function() {
+            var url = origNameToUrl.apply(ctx, arguments);
+            if ({$excludesCode}) {
+                url = url.replace(/(\.min)?\.js$/, '.min.js');
+            }
+            return url;
+        };
+    })();
 code;
 
         if ($this->minification->isEnabled('js')) {

lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php

@@ -193,18 +193,19 @@ public function testGetMinResolverCode()
             ->willReturnArgument(0);
 
         $expected = <<<code
-    var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl,
-        baseUrl = ctx.config.baseUrl;
-
-    ctx.nameToUrl = function() {
-        var url = origNameToUrl.apply(ctx, arguments);
-        if (url.indexOf(baseUrl) === 0&&!url.match(/\.min\./)) {
-            url = url.replace(/(\.min)?\.js$/, '.min.js');
-        }
-        return url;
-    };
+    (function () {
+        var ctx = require.s.contexts._,
+            origNameToUrl = ctx.nameToUrl,
+            baseUrl = ctx.config.baseUrl;
 
+        ctx.nameToUrl = function() {
+            var url = origNameToUrl.apply(ctx, arguments);
+            if (url.indexOf(baseUrl)===0&&!url.match(/\.min\./)) {
+                url = url.replace(/(\.min)?\.js$/, '.min.js');
+            }
+            return url;
+        };
+    })();
 code;
         $this->assertEquals($expected, $this->object->getMinResolverCode());
     }