Merge pull request #787 from andrewtch/bs4-fix

Added SassUtils for better compatibility with bootstrap 4 (and scss comments overall)

src/Assetic/Filter/Sass/BaseSassFilter.php

@@ -6,7 +6,7 @@
 use Assetic\Factory\AssetFactory;
 use Assetic\Filter\BaseProcessFilter;
 use Assetic\Filter\DependencyExtractorInterface;
-use Assetic\Util\CssUtils;
+use Assetic\Util\SassUtils;
 
 abstract class BaseSassFilter extends BaseProcessFilter implements DependencyExtractorInterface
 {
@@ -34,7 +34,7 @@ public function getChildren(AssetFactory $factory, $content, $loadPath = null)
         }
 
         $children = array();
-        foreach (CssUtils::extractImports($content) as $reference) {
+        foreach (SassUtils::extractImports($content) as $reference) {
             if ('.css' === substr($reference, -4)) {
                 // skip normal css imports
                 // todo: skip imports with media queries

src/Assetic/Util/CssUtils.php

@@ -129,7 +129,7 @@ public static function extractImports($content)
             $imports[] = $matches['url'];
         });
 
-        return array_unique($imports);
+        return array_unique(array_filter($imports));
     }
 
     final private function __construct()

src/Assetic/Util/SassUtils.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Assetic package, an OpenSky project.
+ *
+ * (c) 2010-2015 OpenSky Project Inc
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Assetic\Util;
+
+/**
+ * Sass Utils.
+ *
+ * @author Kris Wallsmith <[email protected]>
+ */
+abstract class SassUtils extends CssUtils
+{
+    const REGEX_COMMENTS = '/((?:\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)|\/\/[^\n]+)/';
+}

tests/Assetic/Test/Filter/ScssphpFilterTest.php

@@ -92,7 +92,7 @@ public function testCompassExtensionCanBeDisabled()
     {
         $this->setExpectedExceptionRegExp(
             'Exception',
-            '/Undefined mixin box\-shadow\: failed at `@include box\-shadow\(10px 10px 8px red\);`.*? line:? 4/'
+            '/^Undefined mixin box-shadow:.*line:* 4$/'
         );
 
         $asset = new FileAsset(__DIR__.'/fixtures/sass/main_compass.scss');

tests/Assetic/Test/Util/SassUtilsTest.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Assetic package, an OpenSky project.
+ *
+ * (c) 2010-2015 OpenSky Project Inc
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Assetic\Test\Util;
+
+use Assetic\Util\SassUtils;
+
+class SassUtilsTest extends \PHPUnit_Framework_TestCase
+{
+    public function testExtractImports()
+    {
+
+        $content = <<<CSS
+// @import 'not_needed.css';
+//@import "not_needed.css";
+body{} // @import 'nod_needed.css';
+@import 'custom.css';
+@import "common.css" screen, projection;
+body { background: url(../images/bg.gif); }
+CSS;
+
+        $expected = array('common.css', 'custom.css');
+        $actual = SassUtils::extractImports($content);
+
+        $this->assertEquals($expected, array_intersect($expected, $actual), '::extractImports() returns all expected URLs');
+        $this->assertEquals(array(), array_diff($actual, $expected), '::extractImports() does not return unexpected URLs');
+    }
+}