MAGETWO-34363: Pull request processing

Author: sivaschenko

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

@@ -48,6 +48,7 @@ class DataProvider implements DataProviderInterface
     /**
      * @param State $appState
      * @param Config $config
+     * @param Filesystem $filesystem
      * @param Files $filesUtility
      */
     public function __construct(State $appState, Config $config, Filesystem $filesystem, Files $filesUtility = null)

app/code/Magento/Translation/view/base/templates/translate.phtml

@@ -6,12 +6,12 @@
 ?>
 <?php /** @var $block \Magento\Translation\Block\Js */ ?>
 <?php if ($block->dictionaryEnabled()): ?>
-<script>
-//<![CDATA[
-    require(
-        ["jquery", "mage/translate", "text!<?php echo Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME?>"],
-        function($, translate, data){ $.mage.translate.add(JSON.parse(data)); }
-    );
-// ]]>
-</script>
+    <script>
+    //<![CDATA[
+        require(
+            ["jquery", "mage/translate", "text!<?php echo Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME?>"],
+            function($, translate, data){ $.mage.translate.add(JSON.parse(data)); }
+        );
+    // ]]>
+    </script>
 <?php endif; ?>

dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/JsTest.php

@@ -91,24 +91,6 @@ protected function setUp()
         );
     }
 
-    public function testGetFileNoOriginalFile()
-    {
-        $this->viewFileResolution->expects($this->once())
-            ->method('getFile')
-            ->with('frontend', $this->theme, 'en_US', 'some/file.ext', 'Magento_Module')
-            ->will($this->returnValue(false));
-        $this->assertFalse($this->object->getFile($this->getAsset()));
-    }
-
-    public function testGetFileNoOriginalFileBasic()
-    {
-        $this->staticDirRead->expects($this->once())
-            ->method('getAbsolutePath')
-            ->with('some/file.ext')
-            ->will($this->returnValue(false));
-        $this->assertFalse($this->object->getFile($this->getAsset(false)));
-    }
-
     public function testGetFileCached()
     {
         $root = '/root/some/file.ext';

dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Translation\Model\Js;
 
-class StrategyTest extends \PHPUnit_Framework_TestCase
+class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Config

dev/tests/unit/testsuite/Magento/Translation/Model/Js/ConfigTest.php

@@ -102,6 +102,7 @@ public function __construct(
      * @param ObjectManagerFactory $omFactory
      * @param array $locales
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function deploy(ObjectManagerFactory $omFactory, array $locales)
     {
@@ -223,6 +224,7 @@ private function emulateApplicationArea($areaCode)
      *
      * @param string $locale
      * @param string $area
+     * @return void
      */
     protected function emulateApplicationLocale($locale, $area)
     {

dev/tools/Magento/Tools/View/Deployer.php

@@ -4,52 +4,43 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\App\View\Asset;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\View\Asset;
-
 /**
  * A publishing service for view assets
  */
 class Publisher
 {
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $appState;
-
     /**
      * @var \Magento\Framework\Filesystem
      */
     protected $filesystem;
-
     /**
-     * @param \Magento\Framework\App\State $appState
+     * @var MaterializationStrategy\Factory
+     */
+    private $materializationStrategyFactory;
+    /**
      * @param \Magento\Framework\Filesystem $filesystem
+     * @param MaterializationStrategy\Factory $materializationStrategyFactory
      */
     public function __construct(
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Filesystem $filesystem
+        \Magento\Framework\Filesystem $filesystem,
+        MaterializationStrategy\Factory $materializationStrategyFactory
     ) {
-        $this->appState = $appState;
         $this->filesystem = $filesystem;
+        $this->materializationStrategyFactory = $materializationStrategyFactory;
     }
-
     /**
      * {@inheritdoc}
      */
     public function publish(Asset\LocalInterface $asset)
     {
-        if ($this->appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
-            return false;
-        }
         $dir = $this->filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
         if ($dir->isExist($asset->getPath())) {
             return true;
         }
         return $this->publishAsset($asset);
     }
-
     /**
      * Publish the asset
      *
@@ -58,10 +49,11 @@ public function publish(Asset\LocalInterface $asset)
      */
     private function publishAsset(Asset\LocalInterface $asset)
     {
-        if ($asset->getContent()) {
-            $dir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
-            return (bool) $dir->writeFile($asset->getPath(), $asset->getContent());
-        }
-        return false;
+        $targetDir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
+        $rootDir = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $rootDir->getRelativePath($asset->getSourceFile());
+        $destination = $asset->getPath();
+        $strategy = $this->materializationStrategyFactory->create($asset);
+        return $strategy->publishFile($rootDir, $targetDir, $source, $destination);
     }
-}
+}

lib/internal/Magento/Framework/App/View/Asset/Publisher.php

@@ -157,7 +157,7 @@ public function createAsset($fileId, array $params = [])
             UrlInterface::URL_TYPE_STATIC,
             $isSecure,
             $params['area'],
-            $themePath ,
+            $themePath,
             $params['locale']
         );
         return new File(