From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 24 Oct 2015 18:46:49 +0000 (+0200)
Subject: Fixed Travis issues
X-Git-Tag: 3.0.0_Beta_1~2030^2~266
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e87bc50e29aec87c09e8f09b95e2b95fd84696a;p=GitHub%2FWoltLab%2FWCF.git

Fixed Travis issues
---

diff --git a/CodeSniff/WCF/ruleset.xml b/CodeSniff/WCF/ruleset.xml
index 8c7fb0a697..89816545d7 100644
--- 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 b728974a52..aafa2486af 100644
--- 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);