Fixed Travis issues

diff --git a/CodeSniff/WCF/ruleset.xml b/CodeSniff/WCF/ruleset.xml
index 8c7fb0a697dbf67734eb0399967ee18281ec20de..89816545d73701e57490281a9c6cc5b23b2b7157 100644 (file)
--- a/CodeSniff/WCF/ruleset.xml
+++ b/CodeSniff/WCF/ruleset.xml
@@ -4,6 +4,7 @@
        <exclude-pattern>*/zend/*</exclude-pattern>
        <exclude-pattern>*/CodeSniff/*</exclude-pattern>
        <exclude-pattern>*/parsedown/*</exclude-pattern>
+       <exclude-pattern>*/scssphp/*</exclude-pattern>
        
        <rule ref="Generic.Classes.DuplicateClassName" />
        <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />

diff --git a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
index b728974a52e774f43e8594e73858a02ff9aaccde..aafa2486af6cf71451604b45356cec5b3969ae94 100644 (file)
--- a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\style;
+use Leafo\ScssPhp\Compiler;
 use wcf\data\application\Application;
 use wcf\data\option\Option;
 use wcf\data\style\Style;
@@ -40,7 +41,7 @@ class StyleCompiler extends SingletonFactory {
         */
        protected function init() {
                require_once(WCF_DIR.'lib/system/style/scssphp/scss.inc.php');
-               $this->compiler = new \Leafo\ScssPhp\Compiler();
+               $this->compiler = new Compiler();
                $this->compiler->setImportPaths([WCF_DIR]);
        }
        
@@ -210,7 +211,7 @@ class StyleCompiler extends SingletonFactory {
                        WCF_DIR.'acp/style/style',
                        $files,
                        $variables,
-                       '',//file_get_contents(WCF_DIR.'acp/style/blueTemptation/individual.scss'),
+                       '',
                        new Callback(function($content) {
                                // fix relative paths
                                $content = str_replace('../font/', '../../font/', $content);