Merge branch 'MAGETWO-53223' of https://github.com/magento-tango/magento2ce into MAGETWO-53991

Author: shiftedreality

lib/internal/Magento/Framework/View/Asset/MergeService.php

@@ -79,10 +79,10 @@ public function getMergedAssets(array $assets, $contentType)
         $isCssMergeEnabled = $this->config->isMergeCssFiles();
         $isJsMergeEnabled = $this->config->isMergeJsFiles();
         if (($isCss && $isCssMergeEnabled) || ($isJs && $isJsMergeEnabled)) {
-            if ($this->state->getMode() == \Magento\Framework\App\State::MODE_PRODUCTION) {
-                $mergeStrategyClass = 'Magento\Framework\View\Asset\MergeStrategy\FileExists';
-            } else {
+            if ($this->state->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
                 $mergeStrategyClass = 'Magento\Framework\View\Asset\MergeStrategy\Checksum';
+            } else {
+                $mergeStrategyClass = 'Magento\Framework\View\Asset\MergeStrategy\FileExists';
             }
             $mergeStrategy = $this->objectManager->get($mergeStrategyClass);
 

lib/internal/Magento/Framework/View/Asset/Merged.php

@@ -5,10 +5,6 @@
  */
 namespace Magento\Framework\View\Asset;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Filesystem;
-
 /**
  * \Iterator that aggregates one or more assets and provides a single public file with equivalent behavior
  */
@@ -34,11 +30,6 @@ class Merged implements \Iterator
      */
     private $assetRepo;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
     /**
      * @var MergeableInterface[]
      */
@@ -103,14 +94,7 @@ protected function initialize()
             $this->isInitialized = true;
             try {
                 $mergedAsset = $this->createMergedAsset($this->assets);
-                $isExists = $this->getFilesystem()
-                    ->getDirectoryRead(DirectoryList::STATIC_VIEW)
-                    ->isExist($mergedAsset->getRelativeSourceFilePath());
-
-                if (!$isExists) {
-                    $this->mergeStrategy->merge($this->assets, $mergedAsset);
-                }
-
+                $this->mergeStrategy->merge($this->assets, $mergedAsset);
                 $this->assets = [$mergedAsset];
             } catch (\Exception $e) {
                 $this->logger->critical($e);
@@ -192,17 +176,4 @@ public static function getRelativeDir()
     {
         return self::CACHE_VIEW_REL . '/merged';
     }
-
-    /**
-     * @return Filesystem
-     * @deprecated
-     */
-    private function getFilesystem()
-    {
-        if (null === $this->filesystem) {
-            $this->filesystem = ObjectManager::getInstance()->get(Filesystem::class);
-        }
-
-        return $this->filesystem;
-    }
 }

lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php

@@ -141,13 +141,13 @@ public static function getMergedAssetsDataProvider()
                 $jsAssets,
                 'js',
                 \Magento\Framework\App\State::MODE_DEFAULT,
-                'Magento\Framework\View\Asset\MergeStrategy\Checksum',
+                'Magento\Framework\View\Asset\MergeStrategy\FileExists',
             ],
             'css default mode' => [
                 $cssAssets,
                 'js',
                 \Magento\Framework\App\State::MODE_DEFAULT,
-                'Magento\Framework\View\Asset\MergeStrategy\Checksum',
+                'Magento\Framework\View\Asset\MergeStrategy\FileExists',
             ],
             'js developer mode' => [
                 $jsAssets,

lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\File;
 use Magento\Framework\View\Asset\Merged;
@@ -22,37 +21,27 @@ class MergedTest extends \PHPUnit_Framework_TestCase
     /**
      * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $logger;
+    private $logger;
 
     /**
      * @var MergeStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $mergeStrategy;
+    private $mergeStrategy;
 
     /**
      * @var MergeableInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $assetJsOne;
+    private $assetJsOne;
 
     /**
      * @var MergeableInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $assetJsTwo;
+    private $assetJsTwo;
 
     /**
      * @var AssetRepository|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $assetRepo;
-
-    /**
-     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filesystemMock;
-
-    /**
-     * @var Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $directoryReadMock;
+    private $assetRepo;
 
     protected function setUp()
     {
@@ -77,15 +66,6 @@ protected function setUp()
         $this->assetRepo = $this->getMockBuilder(AssetRepository::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->filesystemMock = $this->getMockBuilder(Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->directoryReadMock = $this->getMockBuilder(Filesystem\Directory\ReadInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->filesystemMock->expects($this->any())
-            ->method('getDirectoryRead')
-            ->willReturn($this->directoryReadMock);
     }
 
     /**
@@ -144,7 +124,6 @@ public function testIteratorInterfaceMerge()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => $assets,
-            'filesystem' => $this->filesystemMock,
         ]);
 
         $mergedAsset = $this->getMock('Magento\Framework\View\Asset\File', [], [], '', false);
@@ -179,7 +158,6 @@ public function testIteratorInterfaceMergeFailure()
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
             'assets' => [$this->assetJsOne, $this->assetJsTwo, $assetBroken],
-            'filesystem' => $this->filesystemMock,
         ]);
 
         $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($mergeError));
@@ -189,30 +167,6 @@ public function testIteratorInterfaceMergeFailure()
         $this->assertIteratorEquals($expectedResult, $merged); // ensure merging attempt happens only once
     }
 
-    public function testMergedFileCheckbefore()
-    {
-        /** @var Merged $merged */
-        $merged = (new ObjectManager($this))->getObject(Merged::class, [
-            'logger' => $this->logger,
-            'mergeStrategy' => $this->mergeStrategy,
-            'assetRepo' => $this->assetRepo,
-            'assets' => [$this->assetJsOne, $this->assetJsTwo],
-            'filesystem' => $this->filesystemMock,
-        ]);
-
-        $mergedAsset = $this->getMockBuilder(File::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->directoryReadMock->expects($this->once())
-            ->method('isExist')
-            ->willReturn(true);
-        $this->assetRepo->expects($this->once())
-            ->method('createArbitrary')->willReturn($mergedAsset);
-
-        $this->assertIteratorEquals([$mergedAsset], $merged);
-    }
-
     /**
      * Assert that iterator items equal to expected ones
      *