MAGETWO-35026: JS error on all pages if bundling and minification for js files enabled

Maxim Medinskiy · Maxim Medinskiy · commit 0b035d9bd2cd · 2015-03-17T19:10:56.000+02:00
- fixed static tests
diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -74,7 +74,11 @@ protected function _prepareLayout()
             /** @var \Magento\Framework\View\Asset\File $bundleAsset */
             if (!empty($bundleAssets) && $staticAsset !== false) {
                 foreach ($bundleAssets as $bundleAsset) {
-                    $assetCollection->insert($bundleAsset->getFilePath(), $bundleAsset, RequireJsConfig::REQUIRE_JS_FILE_NAME);
+                    $assetCollection->insert(
+                        $bundleAsset->getFilePath(),
+                        $bundleAsset,
+                        RequireJsConfig::REQUIRE_JS_FILE_NAME
+                    );
                 }
                 $assetCollection->insert($staticAsset->getFilePath(), $staticAsset, RequireJsConfig::CONFIG_FILE_NAME);
             }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,11 @@ protected function _prepareLayout()`
`74`	`74`	`/** @var \Magento\Framework\View\Asset\File $bundleAsset */`
`75`	`75`	`if (!empty($bundleAssets) && $staticAsset !== false) {`
`76`	`76`	`foreach ($bundleAssets as $bundleAsset) {`
`77`		`- $assetCollection->insert($bundleAsset->getFilePath(), $bundleAsset, RequireJsConfig::REQUIRE_JS_FILE_NAME);`
	`77`	`+ $assetCollection->insert(`
	`78`	`+ $bundleAsset->getFilePath(),`
	`79`	`+ $bundleAsset,`
	`80`	`+ RequireJsConfig::REQUIRE_JS_FILE_NAME`
	`81`	`+ );`
`78`	`82`	`}`
`79`	`83`	`$assetCollection->insert($staticAsset->getFilePath(), $staticAsset, RequireJsConfig::CONFIG_FILE_NAME);`
`80`	`84`	`}`