Merge pull request #20 from learn-symfony/master

sync with main repository

Author: Eugene Matvejev

src/Processor/Processor.php

@@ -7,6 +7,7 @@
 use EM\CssCompiler\Exception\CompilerException;
 use EM\CssCompiler\Exception\FileException;
 use Leafo\ScssPhp\Compiler as SASSCompiler;
+use Leafo\ScssPhp\Exception\ParserException;
 use lessc as LESSCompiler;
 use scss_compass as CompassCompiler;
 
@@ -156,12 +157,20 @@ public function processFile(FileContainer $file)
     {
         switch ($file->getType()) {
             case FileContainer::TYPE_SCSS:
-                $this->sass->addImportPath(dirname($file->getInputPath()));
-                $content = $this->sass->compile($file->getInputContent());
-
-                return $file->setOutputContent($content);
+                try {
+                    $this->sass->addImportPath(dirname($file->getInputPath()));
+                    $content = $this->sass->compile($file->getInputContent());
+
+                    return $file->setOutputContent($content);
+                } catch (ParserException $e) {
+                    throw new CompilerException($e->getMessage(), 1, $e);
+                }
             case FileContainer::TYPE_LESS:
-                return $file->setOutputContent($this->less->compileFile($file->getInputPath()));
+                try {
+                    return $file->setOutputContent($this->less->compileFile($file->getInputPath()));
+                } catch (\Exception $e) {
+                    throw new CompilerException($e->getMessage(), 1, $e);
+                }
         }
 
         throw new CompilerException('unknown compiler');

tests/phpunit/Processor/ProcessorTest.php

@@ -12,9 +12,7 @@
  */
 class ProcessorTest extends IntegrationTestSuite
 {
-    protected $event;
     protected $io;
-    protected $package;
 
     protected function setUp()
     {
@@ -32,7 +30,7 @@ public function attachFiles()
             static::getSharedFixturesDirectory() . '/compass'          => 1,
             static::getSharedFixturesDirectory() . '/scss/layout.scss' => 1,
             static::getSharedFixturesDirectory() . '/scss'             => 4,
-            static::getSharedFixturesDirectory()                       => 7
+            static::getSharedFixturesDirectory()                       => 9
         ];
         foreach ($paths as $path => $expectedFiles) {
             $processor = new Processor($this->io);
@@ -169,4 +167,84 @@ public function fetchInputContextIntoFileOnException()
     {
         $this->invokeMethod(new Processor($this->io), 'fetchInputContextIntoFile', [new FileContainer('input', 'output')]);
     }
+
+    /**
+     * @see Processor::processFiles
+     * @test
+     */
+    public function processFilesOnSCSS()
+    {
+        $this->assertProcessFilesOnValid($this->getSharedFixturesDirectory() . '/scss', '');
+    }
+
+    /**
+     * @see Processor::processFiles
+     * @test
+     */
+    public function processFilesOnNotValidSCSS()
+    {
+        $this->assertProcessFilesOnNotValid($this->getSharedFixturesDirectory() . '/not-valid-scss', '');
+    }
+
+    /**
+     * @see Processor::processFiles
+     * @test
+     */
+    public function processFilesOnLESS()
+    {
+        $this->assertProcessFilesOnValid($this->getSharedFixturesDirectory() . '/less', '');
+    }
+
+    /**
+     * @see Processor::processFiles
+     * @test
+     */
+    public function processFilesOnNotValidLESS()
+    {
+        $this->assertProcessFilesOnNotValid($this->getSharedFixturesDirectory() . '/not-valid-less', '');
+    }
+
+    /**
+     * @see Processor::processFiles
+     *
+     * @param string $input
+     * @param string $output
+     */
+    private function assertProcessFilesOnValid($input, $output)
+    {
+        foreach ($this->processFiles($input, $output) as $file) {
+            $this->assertNotNull($file->getOutputContent());
+        }
+    }
+
+    /**
+     * @see Processor::processFiles
+     *
+     * @param string $input
+     * @param string $output
+     */
+    private function assertProcessFilesOnNotValid($input, $output)
+    {
+        foreach ($this->processFiles($input, $output) as $file) {
+            $this->assertNull($file->getOutputContent());
+        }
+    }
+
+    /**
+     * @see Processor::processFiles
+     *
+     * @param string $input
+     * @param string $output
+     *
+     * @return FileContainer[]
+     */
+    private function processFiles($input, $output)
+    {
+        $processor = new Processor($this->io);
+
+        $processor->attachFiles($input, $output);
+        $processor->processFiles(Processor::FORMATTER_COMPRESSED);
+
+        return $processor->getFiles();
+    }
 }

tests/shared-fixtures/less/print.less

@@ -1,10 +1,3 @@
-/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
-
-// ==========================================================================
-// Print styles.
-// Inlined to avoid the additional HTTP request: h5bp.com/r
-// ==========================================================================
-
 @media print {
     *,
     *:before,
@@ -45,27 +38,6 @@
         display: table-header-group; // h5bp.com/t
     }
 
-    tr,
-    img {
-        page-break-inside: avoid;
-    }
-
-    img {
-        max-width: 100% !important;
-    }
-
-    p,
-    h2,
-    h3 {
-        orphans: 3;
-        widows: 3;
-    }
-
-    h2,
-    h3 {
-        page-break-after: avoid;
-    }
-
     // Bootstrap specific changes start
 
     // Bootstrap components
@@ -78,24 +50,4 @@
             border-top-color: #000 !important;
         }
     }
-    .label {
-        border: 1px solid #000;
-    }
-
-    .table {
-        border-collapse: collapse !important;
-
-        td,
-        th {
-            background-color: #fff !important;
-        }
-    }
-    .table-bordered {
-        th,
-        td {
-            border: 1px solid #ddd !important;
-        }
-    }
-
-    // Bootstrap specific changes end
 }

tests/shared-fixtures/not-valid-less/print.less

@@ -0,0 +1,32 @@
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+
+// ==========================================================================
+// Print styles.
+// Inlined to avoid the additional HTTP request: h5bp.com/r
+// ==========================================================================
+
+@media print
+
+    //*,
+    12, // ERROR
+    *:before,
+    *:after {
+        background: transparent !important;
+        color: #000 !important; // Black prints faster: h5bp.com/s
+        box-shadow: none !important;
+        text-shadow: none !important;
+    }
+
+    a,
+    a:visited {
+        text-decoration: underline;
+    }
+
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+}

tests/shared-fixtures/not-valid-scss/game-results.scss

@@ -0,0 +1,3 @@
+div#game-results-area table.table {
+    margin 20px 0; // ERROR
+}