Merge pull request #24 from learn-symfony/master

sync with main repository

Author: Eugene Matvejev

.scrutinizer.yml

@@ -12,12 +12,9 @@ build:
         php:
             version: "7.0.4"
     tests:
-        override:
-            -
-                command: "composer validate"
         override:
             -
                 command: "php bin/phpunit -c phpunit.xml --colors=always --verbose --coverage-clover=coverage.xml"
                 coverage:
                     file: "coverage.xml"
-                    format: "php-clover"
+                    format: "clover"

src/Processor/Processor.php

@@ -6,7 +6,7 @@
 use EM\CssCompiler\Container\FileContainer;
 use EM\CssCompiler\Exception\CompilerException;
 use EM\CssCompiler\Exception\FileException;
-use Leafo\ScssPhp\Compiler as SASSCompiler;
+use Leafo\ScssPhp\Compiler as SCSSCompiler;
 use Leafo\ScssPhp\Exception\ParserException;
 use lessc as LESSCompiler;
 use scss_compass as CompassCompiler;
@@ -39,9 +39,9 @@ class Processor
      */
     private $files = [];
     /**
-     * @var SASSCompiler
+     * @var SCSSCompiler
      */
-    private $sass;
+    private $scss;
     /**
      * @var LESSCompiler
      */
@@ -50,15 +50,10 @@ class Processor
     public function __construct(IOInterface $io)
     {
         $this->io = $io;
-        $this->initCompilers();
-    }
-
-    protected function initCompilers()
-    {
         $this->less = new LESSCompiler();
-        $this->sass = new SASSCompiler();
-        /** attaches compass functionality to the SASS compiler */
-        new CompassCompiler($this->sass);
+        $this->scss = new SCSSCompiler();
+        /** attaches compass functionality to the SCSS compiler */
+        new CompassCompiler($this->scss);
     }
 
     /**
@@ -132,7 +127,7 @@ public function saveOutput()
      */
     public function processFiles($formatter)
     {
-        $this->sass->setFormatter($this->getFormatterClass($formatter));
+        $this->scss->setFormatter($this->getFormatterClass($formatter));
         $this->io->write("<info>use '{$formatter}' formatting</info>");
 
         foreach ($this->files as $file) {
@@ -174,8 +169,8 @@ public function processFile(FileContainer $file)
     protected function compileSCSS(FileContainer $file)
     {
         try {
-            $this->sass->addImportPath(dirname($file->getInputPath()));
-            $content = $this->sass->compile($file->getInputContent());
+            $this->scss->addImportPath(dirname($file->getInputPath()));
+            $content = $this->scss->compile($file->getInputContent());
 
             return $file->setOutputContent($content);
         } catch (ParserException $e) {

tests/phpunit/Processor/ProcessorTest.php

@@ -247,4 +247,25 @@ private function processFiles($input, $output)
 
         return $processor->getFiles();
     }
+
+    /**
+     * @see ScriptHandler::processFiles
+     * @test
+     */
+    public function saveOutput()
+    {
+        $processor = new Processor($this->io);
+
+        $expectedOutputFile = $this->getRootDirectory() . '/../var/tests/' . __FUNCTION__ . '.css';
+        @unlink($expectedOutputFile);
+        $processor->attachFiles(
+            $this->getSharedFixturesDirectory() . '/scss',
+            $expectedOutputFile
+        );
+        $processor->processFiles(Processor::FORMATTER_COMPRESSED);
+
+        $processor->saveOutput();
+
+        $this->assertFileExists($expectedOutputFile);
+    }
 }