diff --git a/app/code/Magento/Developer/Console/Command/CssDeployCommand.php b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php index 11961852dbb080f5dbc501c283e69e277103e7b0..1d8d859956ec278b26f962627ababa64163192bb 100644 --- a/app/code/Magento/Developer/Console/Command/CssDeployCommand.php +++ b/app/code/Magento/Developer/Console/Command/CssDeployCommand.php @@ -22,7 +22,7 @@ use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface; use Magento\Framework\App\Filesystem\DirectoryList; /** - * Class CssDeployCommand + * Class CssDeployCommand - collects, processes and publishes source files like LESS or SASS * @SuppressWarnings("PMD.CouplingBetweenObjects") */ class CssDeployCommand extends Command @@ -174,6 +174,7 @@ class CssDeployCommand extends Command /** * {@inheritdoc} + * @throws \InvalidArgumentException */ protected function execute(InputInterface $input, OutputInterface $output) { @@ -198,7 +199,7 @@ class CssDeployCommand extends Command foreach ($input->getArgument(self::FILES_ARGUMENT) as $file) { $file .= '.' . $type; - $output->writeln("Gathering {$file} sources."); + $output->writeln("<info>Gathering {$file} sources.</info>"); $asset = $this->assetRepo->createAsset( $file, @@ -228,7 +229,7 @@ class CssDeployCommand extends Command $destination = $asset->getPath(); $rootDir->copyFile($source, $destination, $targetDir); - $output->writeln("Done"); + $output->writeln("<info>Successfully processed LESS and/or SASS files</info>"); } } } diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php index 93f545aefe3bb70800d7ba65905118d9fa6c206c..445ac332fbce55384b13aca04504e2d800603887 100644 --- a/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php +++ b/app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php @@ -14,14 +14,13 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Framework\App\ObjectManager\ConfigLoader; use Magento\Framework\View\Asset\SourceFileGeneratorPool; use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface; -use Magento\Framework\App\Filesystem\DirectoryList; use Magento\Developer\Console\Command\CssDeployCommand; use Symfony\Component\Console\Tester\CommandTester; class CssDeployCommandTest extends \PHPUnit_Framework_TestCase { /** - * @var DevTestsRunCommand + * @var CssDeployCommand */ private $command; diff --git a/dev/tools/grunt/configs/combo.js b/dev/tools/grunt/configs/combo.js index cb80592c9808855c86febf17169ffacf7bfc8cb4..cd3484eee7836c516e6cacd766fecc4410c71707 100644 --- a/dev/tools/grunt/configs/combo.js +++ b/dev/tools/grunt/configs/combo.js @@ -16,7 +16,7 @@ module.exports = { var cmdPlus = /^win/.test(process.platform) ? ' & ' : ' && ', command = 'grunt --force clean:' + themeName + cmdPlus; - command = command + 'bin/magento dev:css:deploy ' + theme[themeName].dsl + ' ' + theme[themeName].files.join(' ') + + command = command + 'php bin/magento dev:css:deploy ' + theme[themeName].dsl + ' ' + theme[themeName].files.join(' ') + ' --locale=' + theme[themeName].locale + ' --area=' + theme[themeName].area + ' --theme=' + theme[themeName].name;