Merge pull request #2160 from magento-thunder/MAGETWO-88336

Yevhen Miroshnychenko · web-flow · commit df09179684bd · 2018-03-05T16:54:08.000+02:00
Fixed issues:
- MAGETWO-88336: [Backport] JS merging fails when JS bundling is enabled and bundle folder contains any other files
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -164,6 +164,9 @@ public function createBundleJsPool()
             }
 
             foreach ($libDir->read($bundleDir) as $bundleFile) {
+                if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {
+                    continue;
+                }
                 $relPath = $libDir->getRelativePath($bundleFile);
                 $bundles[] = $this->assetRepo->createArbitrary($relPath, '');
             }
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -150,7 +150,7 @@ public function testCreateBundleJsPool()
             ->expects($this->once())
             ->method('read')
             ->with('path/to/bundle/dir/js/bundle')
-            ->willReturn(['bundle1.js', 'bundle2.js']);
+            ->willReturn(['bundle1.js', 'bundle2.js', 'some_file.not_js']);
         $dirRead
             ->expects($this->exactly(2))
             ->method('getRelativePath')

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,9 @@ public function createBundleJsPool()`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`foreach ($libDir->read($bundleDir) as $bundleFile) {`
	`167`	`+ if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {`
	`168`	`+ continue;`
	`169`	`+ }`
`167`	`170`	`$relPath = $libDir->getRelativePath($bundleFile);`
`168`	`171`	`$bundles[] = $this->assetRepo->createArbitrary($relPath, '');`
`169`	`172`	`}`