MAGETWO-34363: Pull request processing

app/code/Magento/Translation/Model/Js/DataProvider.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Translation\Model\Js;
 
-use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\App\Utility\Files;
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;

app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php

@@ -6,7 +6,7 @@
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Framework\App\State;
-use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -45,7 +45,7 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase
     {
         $this->appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $this->configMock = $this->getMock('Magento\Translation\Model\Js\Config', [], [], '', false);
-        $this->filesUtilityMock = $this->getMock('Magento\Framework\Test\Utility\Files', [], [], '', false);
+        $this->filesUtilityMock = $this->getMock('Magento\Framework\App\Utility\Files', [], [], '', false);
         $filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
         $this->rootDirectoryMock = $this->getMock('Magento\Framework\Filesystem\Directory\Read', [], [], '', false);
         $filesystem->expects($this->once())

lib/internal/Magento/Framework/App/Utility/Files.php

@@ -490,18 +490,18 @@ class Files
     /**
      * Returns list of Javascript files in Magento
      *
+     * @param string $area
+     * @param string $themePath
+     * @param string $namespace
+     * @param string $module
      * @return array
      */
-    public function getJsFiles()
+    public function getJsFiles($area = '*', $themePath = '*/*', $namespace = '*', $module = '*')
     {
-        $key = __METHOD__ . $this->_path;
+        $key = $area . $themePath . $namespace . $module . __METHOD__ . $this->_path;
         if (isset(self::$_cache[$key])) {
             return self::$_cache[$key];
         }
-        $namespace = '*';
-        $module = '*';
-        $area = '*';
-        $themePath = '*/*';
         $files = self::getFiles(
             [
                 "{$this->_path}/app/code/{$namespace}/{$module}/view/{$area}/web",