From 30d985b639b2def47ace858e00c1bb6a44e9d682 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Thu, 23 Jan 2020 14:52:16 +0100
Subject: [PATCH] Migrate leafo/scssphp to scssphp/scssphp
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
3rdparty | 2 +-
.../lib/Controller/AccessibilityController.php | 6 +++---
apps/theming/lib/Util.php | 2 +-
lib/private/Template/SCSSCacher.php | 11 +++++------
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/3rdparty b/3rdparty
index c6d97ae32ed..235e4f338e9 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit c6d97ae32edcfc3703a63c838c2accc8d9fa6c57
+Subproject commit 235e4f338e92e75ee64a0a06c16de6f882b0a114
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
index fd907a361b8..95be3daa248 100644
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/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 {
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 41a6a712e59..9e4efb6a4dc 100644
--- a/apps/theming/lib/Util.php
+++ b/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 {
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 2f01a60ffb8..f571967ea1c 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/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
*/
--
GitLab