wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19100 from nextcloud/refactor/leafo-to-scssphp

Browse source 
Migrate leafo/scssphp to scssphp/scssphp
This commit is contained in:
Roeland Jago Douma 2020-01-24 13:13:20 +01:00 committed by GitHub
commit 4c566f7498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit c6d97ae32edcfc3703a63c838c2accc8d9fa6c57
Subproject commit 97b5fa3e9364f21961edad6ed1315d48bc45bd80

6
apps/accessibility/lib/Controller/AccessibilityController.php
View file

@ -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 {

2
apps/theming/lib/Util.php
View file

@ -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 {

11
lib/private/Template/SCSSCacher.php
View file

@ -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
*/