Merge remote-tracking branch 'origin/MAGETWO-55510' into PR

Author: eug123

app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php

@@ -74,10 +74,6 @@ public function __construct(
      */
     public function process(PreProcessor\Chain $chain)
     {
-        $content = $chain->getContent();
-        if (trim($content) !== '') {
-            return;
-        }
 
         try {
             $this->lockerProcess->lockProcess($this->lockName);
@@ -88,7 +84,7 @@ public function process(PreProcessor\Chain $chain)
             /** @var FallbackContext $context */
             $context = $chain->getAsset()->getContext();
 
-            $result = $this->processContent($path, $content, $module, $context);
+            $result = $this->processContent($path, $chain->getContent(), $module, $context);
             $chain->setContent($result['content']);
             $chain->setContentType($result['sourceType']);
         } finally {
@@ -107,14 +103,14 @@ public function process(PreProcessor\Chain $chain)
      */
     private function processContent($path, $content, $module, FallbackContext $context)
     {
-        $sourceType = '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION), '#') . '$#';
+        $sourceTypePattern = '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION), '#') . '$#';
 
         foreach ($this->alternativeSource->getAlternativesExtensionsNames() as $name) {
             $asset = $this->assetBuilder->setArea($context->getAreaCode())
                 ->setTheme($context->getThemePath())
                 ->setLocale($context->getLocale())
                 ->setModule($module)
-                ->setPath(preg_replace($sourceType, '.' . $name, $path))
+                ->setPath(preg_replace($sourceTypePattern, '.' . $name, $path))
                 ->build();
 
             $processedContent = $this->assetSource->getContent($asset);
@@ -129,7 +125,7 @@ private function processContent($path, $content, $module, FallbackContext $conte
 
         return [
             'content' => $content,
-            'sourceType' => $sourceType
+            'sourceType' => pathinfo($path, PATHINFO_EXTENSION)
         ];
     }
 }

app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php

@@ -189,38 +189,6 @@ public function testProcess()
         $frontendCompilation->process($this->getChainMockExpects('', 1, 1, $newContentType));
     }
 
-    /**
-     * Run test for process method (content not empty)
-     */
-    public function testProcessContentNotEmpty()
-    {
-        $chainMock = $this->getChainMock();
-        $assetMock = $this->getAssetMock();
-
-        $chainMock->expects(self::once())
-            ->method('getContent')
-            ->willReturn('test-content');
-
-        $chainMock->expects(self::never())
-            ->method('getAsset')
-            ->willReturn($assetMock);
-
-        $this->lockerProcessMock->expects(self::never())
-            ->method('lockProcess');
-        $this->lockerProcessMock->expects(self::never())
-            ->method('unlockProcess');
-
-        $frontendCompilation = new FrontendCompilation(
-            $this->assetSourceMock,
-            $this->assetBuilderMock,
-            $this->alternativeSourceMock,
-            $this->lockerProcessMock,
-            'lock'
-        );
-
-        $frontendCompilation->process($chainMock);
-    }
-
     /**
      * @return Chain|\PHPUnit_Framework_MockObject_MockObject
      */