mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump scssphp/scssphp from 1.0.3 to 1.4.0 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-12-30 14:46:51 +01:00 committed by Morris Jobke
parent 8b656e321b
commit c3cb288268
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 09596e43fba86a3643879595a8fb6fece4af6a78
Subproject commit 7bbfe82c51aa168683ae6e47e3da7d3e587f6ca4

13
lib/private/Template/SCSSCacher.php
View File

@ -47,8 +47,7 @@ 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;
use ScssPhp\ScssPhp\OutputStyle;
class SCSSCacher {
@ -313,14 +312,12 @@ class SCSSCacher {
]);
// Continue after throw
$scss->setIgnoreErrors(true);
if ($this->config->getSystemValue('debug')) {
// Debug mode
$scss->setFormatter(Expanded::class);
$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
$scss->setOutputStyle(OutputStyle::EXPANDED);
} else {
// Compression
$scss->setFormatter(Crunched::class);
$scss->setOutputStyle(OutputStyle::COMPRESSED);
}
try {
@ -391,8 +388,8 @@ class SCSSCacher {
$this->injectedVariables = null;
// do not clear locks
$this->cacheFactory->createDistributed('SCSS-deps-')->clear();
$this->cacheFactory->createDistributed('SCSS-cached-')->clear();
$this->depsCache->clear();
$this->isCachedCache->clear();
$appDirectory = $this->appData->getDirectoryListing();
foreach ($appDirectory as $folder) {

21
tests/lib/Template/SCSSCacherTest.php
View File

@ -56,6 +56,8 @@ class SCSSCacherTest extends \Test\TestCase {
/** @var ICache|\PHPUnit\Framework\MockObject\MockObject */
protected $depsCache;
/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
protected $isCachedCache;
/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
protected $cacheFactory;
/** @var IconsCacher|\PHPUnit\Framework\MockObject\MockObject */
protected $iconsCacher;
@ -88,9 +90,15 @@ class SCSSCacherTest extends \Test\TestCase {
}));
$this->cacheFactory = $this->createMock(ICacheFactory::class);
$this->depsCache = $this->createMock(ICache::class);
$this->cacheFactory->expects($this->at(0))
$this->isCachedCache = $this->createMock(ICache::class);
$this->cacheFactory
->method('createDistributed')
->willReturn($this->depsCache);
->withConsecutive()
->willReturnOnConsecutiveCalls(
$this->depsCache,
$this->isCachedCache,
$this->createMock(ICache::class)
);
$this->themingDefaults = $this->createMock(ThemingDefaults::class);
$this->themingDefaults->expects($this->any())->method('getScssVariables')->willReturn([]);
@ -537,11 +545,10 @@ class SCSSCacherTest extends \Test\TestCase {
->method('getDirectoryListing')
->willReturn([$file]);
$cache = $this->createMock(ICache::class);
$this->cacheFactory->expects($this->exactly(2))
->method('createDistributed')
->willReturn($cache);
$cache->expects($this->exactly(2))
$this->depsCache->expects($this->once())
->method('clear')
->with('');
$this->isCachedCache->expects($this->once())
->method('clear')
->with('');
$this->appData->expects($this->once())