瀏覽代碼

Migrate leafo/scssphp to scssphp/scssphp

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst 4 年之前
父節點
當前提交
30d985b639

+ 1 - 1
3rdparty

@@ -1 +1 @@
-Subproject commit c6d97ae32edcfc3703a63c838c2accc8d9fa6c57
+Subproject commit 235e4f338e92e75ee64a0a06c16de6f882b0a114

+ 3 - 3
apps/accessibility/lib/Controller/AccessibilityController.php

@@ -32,9 +32,6 @@ declare(strict_types=1);
 
 namespace OCA\Accessibility\Controller;
 
-use Leafo\ScssPhp\Compiler;
-use Leafo\ScssPhp\Exception\ParserException;
-use Leafo\ScssPhp\Formatter\Crunched;
 use OC\Template\IconsCacher;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
@@ -48,6 +45,9 @@ use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Exception\ParserException;
+use ScssPhp\ScssPhp\Formatter\Crunched;
 
 class AccessibilityController extends Controller {
 

+ 1 - 1
apps/theming/lib/Util.php

@@ -28,13 +28,13 @@
 
 namespace OCA\Theming;
 
-use Leafo\ScssPhp\Compiler;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
+use ScssPhp\ScssPhp\Compiler;
 
 class Util {
 

+ 5 - 6
lib/private/Template/SCSSCacher.php

@@ -29,13 +29,8 @@
 
 namespace OC\Template;
 
-use Leafo\ScssPhp\Compiler;
-use Leafo\ScssPhp\Exception\ParserException;
-use Leafo\ScssPhp\Formatter\Crunched;
-use Leafo\ScssPhp\Formatter\Expanded;
 use OC\Files\AppData\Factory;
 use OC\Memcache\NullCache;
-use OC\Template\IconsCacher;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
@@ -48,6 +43,10 @@ use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IMemcache;
 use OCP\IURLGenerator;
+use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Exception\ParserException;
+use ScssPhp\ScssPhp\Formatter\Crunched;
+use ScssPhp\ScssPhp\Formatter\Expanded;
 
 class SCSSCacher {
 
@@ -499,7 +498,7 @@ class SCSSCacher {
 	}
 
 	/**
-	 * Add the icons css cache in the header if needed 
+	 * Add the icons css cache in the header if needed
 	 *
 	 * @return boolean true
 	 */