MAGETWO-44603: Styles are lost on Storefront if CSS files minification is enabled in "default" mode

- Fixed test
- Create new integration test

Author: Dell-

app/code/Magento/Deploy/composer.json

@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "magento/framework": "1.0.0-beta",
-        "magento/module-developer": "1.0.0-beta",
         "magento/module-store": "1.0.0-beta",
         "magento/module-theme": "1.0.0-beta",
         "magento/module-require-js": "1.0.0-beta"

app/code/Magento/Deploy/etc/module.xml

@@ -9,7 +9,6 @@
     <module name="Magento_Deploy" setup_version="2.0.0">
         <sequence>
             <module name="Magento_Store"/>
-            <module name="Magento_Developer"/>
         </sequence>
     </module>
 </config>

app/code/Magento/Email/Model/Template/Filter.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Email\Model\Template;
 
+use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
 
 /**
@@ -885,10 +886,15 @@ public function getCssFilesContent(array $files)
             );
         }
         $css = '';
-        foreach ($files as $file) {
-            $asset = $this->_assetRepo->createAsset($file, $designParams);
-            $css .= $asset->getContent();
+        try {
+            foreach ($files as $file) {
+                $asset = $this->_assetRepo->createAsset($file, $designParams);
+                $css .= $asset->getContent();
+            }
+        } catch (ContentProcessorException $exception) {
+            $css = $exception->getMessage();
         }
+
         return $css;
     }
 

dev/tests/integration/testsuite/Magento/Developer/Console/Command/SourceThemeDeployCommandTest.php

@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Developer\Console\Command;
+
+use Magento\Framework\Validator\Locale;
+use Magento\TestFramework\Helper\Bootstrap;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Class SourceThemeDeployCommandTest
+ *
+ * @see \Magento\Developer\Console\Command\SourceThemeDeployCommand
+ */
+class SourceThemeDeployCommandTest extends \PHPUnit_Framework_TestCase
+{
+    const PUB_STATIC_DIRECTORY = 'pub_static';
+
+    const AREA_TEST_VALUE = 'frontend';
+
+    const LOCALE_TEST_VALUE = 'en_US';
+
+    const THEME_TEST_VALUE = 'Magento/luma';
+
+    const TYPE_TEST_VALUE = 'less';
+
+    /**
+     * @var Locale|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorMock;
+
+    /**
+     * @var SourceThemeDeployCommand
+     */
+    private $command;
+
+    /**
+     * @var string
+     */
+    private $pubStatic;
+
+    /**
+     * @var array
+     */
+    private $compiledFiles = ['css/styles-m', 'css/styles-l'];
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        global $installDir;
+
+        $this->validatorMock = $this->getMockBuilder(Locale::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pubStatic = $installDir . DIRECTORY_SEPARATOR . self::PUB_STATIC_DIRECTORY;
+        $this->command = Bootstrap::getObjectManager()->get(SourceThemeDeployCommand::class);
+    }
+
+    /**
+     * Run test for execute method
+     */
+    public function testExecute()
+    {
+        $error = [];
+
+        /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject $outputMock */
+        $outputMock = $this->getMockBuilder(OutputInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->clearStaticDirectory();
+
+        $this->command->run($this->getInputMock(), $outputMock);
+
+        /** @var \SplFileInfo $file */
+        foreach ($this->collectFiles($this->pubStatic) as $file) {
+            $fileInfo = pathinfo($file->getFilename());
+            if (!in_array('css/' . $fileInfo['filename'], $this->compiledFiles, true)
+                && !$file->isLink()
+            ) {
+                $error[] = 'Bad file -> ' . $file->getFilename() . PHP_EOL;
+            }
+        }
+
+        $this->clearStaticDirectory();
+
+        self::assertEmpty($error, implode($error));
+    }
+
+    /**
+     * @return void
+     */
+    private function clearStaticDirectory()
+    {
+        /** @var \SplFileInfo $file */
+        foreach ($this->collectFiles($this->pubStatic) as $file) {
+            @unlink($file->getPathname());
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \RegexIterator
+     */
+    private function collectFiles($path)
+    {
+        $flags = \FilesystemIterator::CURRENT_AS_FILEINFO
+            | \FilesystemIterator::SKIP_DOTS;
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, $flags));
+
+        return new \RegexIterator(
+            $iterator,
+            '#\.less$#',
+            \RegexIterator::MATCH,
+            \RegexIterator::USE_KEY
+        );
+    }
+
+    /**
+     * @return InputInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getInputMock()
+    {
+        $inputMock = $this->getMockBuilder(InputInterface::class)
+            ->getMockForAbstractClass();
+
+        $inputMock->expects(self::exactly(4))
+            ->method('getOption')
+            ->willReturnMap(
+                [
+                    ['area', self::AREA_TEST_VALUE],
+                    ['locale', self::LOCALE_TEST_VALUE],
+                    ['theme', self::THEME_TEST_VALUE],
+                    ['type', self::TYPE_TEST_VALUE]
+                ]
+            );
+        $inputMock->expects(self::once())
+            ->method('getArgument')
+            ->with('file')
+            ->willReturn($this->compiledFiles);
+
+        return $inputMock;
+    }
+}

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter\Less;
 
-use Magento\Setup\Module\I18n\Dictionary\Phrase;
+use Magento\Framework\Phrase;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State;
 use Magento\Framework\View\Asset\File;