Skip to content

Commit 1bb5ca4

Browse files
dependabot-preview[bot]rullzer
authored andcommitted
Bump scssphp/scssphp from 1.0.3 to 1.1.0
Bumps [scssphp/scssphp](https://github.com/scssphp/scssphp) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/scssphp/scssphp/releases) - [Commits](scssphp/scssphp@1.0.3...1.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
1 parent 62a762f commit 1bb5ca4

35 files changed

+2288
-1129
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"pimple/pimple": "3.2.3",
3636
"punic/punic": "^1.6",
3737
"sabre/dav": "^4.0.0",
38-
"scssphp/scssphp": "1.0.3",
38+
"scssphp/scssphp": "1.1.0",
3939
"stecman/symfony-console-completion": "^0.8.0",
4040
"swiftmailer/swiftmailer": "^6.0",
4141
"symfony/console": "4.4.4",

composer.lock

Lines changed: 13 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2503,7 +2503,6 @@
25032503
'ScssPhp\\ScssPhp\\Parser' => $vendorDir . '/scssphp/scssphp/src/Parser.php',
25042504
'ScssPhp\\ScssPhp\\SourceMap\\Base64' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64.php',
25052505
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
2506-
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
25072506
'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => $vendorDir . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
25082507
'ScssPhp\\ScssPhp\\Type' => $vendorDir . '/scssphp/scssphp/src/Type.php',
25092508
'ScssPhp\\ScssPhp\\Util' => $vendorDir . '/scssphp/scssphp/src/Util.php',

composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3023,7 +3023,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
30233023
'ScssPhp\\ScssPhp\\Parser' => __DIR__ . '/..' . '/scssphp/scssphp/src/Parser.php',
30243024
'ScssPhp\\ScssPhp\\SourceMap\\Base64' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64.php',
30253025
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
3026-
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
30273026
'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
30283027
'ScssPhp\\ScssPhp\\Type' => __DIR__ . '/..' . '/scssphp/scssphp/src/Type.php',
30293028
'ScssPhp\\ScssPhp\\Util' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util.php',

composer/installed.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,8 @@
17141714
"serializable",
17151715
"serialize",
17161716
"tokenizer"
1717-
]
1717+
],
1718+
"abandoned": "opis/closure"
17181719
},
17191720
{
17201721
"name": "justinrainbow/json-schema",
@@ -3985,29 +3986,31 @@
39853986
},
39863987
{
39873988
"name": "scssphp/scssphp",
3988-
"version": "1.0.3",
3989-
"version_normalized": "1.0.3.0",
3989+
"version": "1.1.0",
3990+
"version_normalized": "1.1.0.0",
39903991
"source": {
39913992
"type": "git",
39923993
"url": "https://github.com/scssphp/scssphp.git",
3993-
"reference": "616c518333c656eaa23182ac6cfc01453f1e7c78"
3994+
"reference": "4363ddce8d750f055c436833dd77d83517946532"
39943995
},
39953996
"dist": {
39963997
"type": "zip",
3997-
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/616c518333c656eaa23182ac6cfc01453f1e7c78",
3998-
"reference": "616c518333c656eaa23182ac6cfc01453f1e7c78",
3998+
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/4363ddce8d750f055c436833dd77d83517946532",
3999+
"reference": "4363ddce8d750f055c436833dd77d83517946532",
39994000
"shasum": ""
40004001
},
40014002
"require": {
4002-
"php": "^5.6.0 || ^7"
4003+
"ext-ctype": "*",
4004+
"ext-json": "*",
4005+
"php": ">=5.6.0"
40034006
},
40044007
"require-dev": {
4005-
"phpunit/phpunit": "~4.6",
4006-
"squizlabs/php_codesniffer": "~2.5",
4008+
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
4009+
"squizlabs/php_codesniffer": "~3.5",
40074010
"twbs/bootstrap": "~4.3",
40084011
"zurb/foundation": "~6.5"
40094012
},
4010-
"time": "2019-08-07T20:16:04+00:00",
4013+
"time": "2020-04-21T15:53:32+00:00",
40114014
"bin": [
40124015
"bin/pscss"
40134016
],

scssphp/scssphp/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ There are several tests in the `tests/` directory:
2424
* `InputTest.php` compiles every `.scss` file in the `tests/inputs` directory
2525
then compares to the respective `.css` file in the `tests/outputs` directory.
2626
* `ScssTest.php` extracts (ruby) `scss` tests from the `tests/scss_test.rb` file.
27-
* `ServerTest.php` contains functional tests for the `Server` class.
2827

2928
When changing any of the tests in `tests/inputs`, the tests will most likely
3029
fail because the output has changed. Once you verify that the output is correct

scssphp/scssphp/composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@
2323
"psr-4": { "ScssPhp\\ScssPhp\\": "src/" }
2424
},
2525
"autoload-dev": {
26-
"psr-4": { "ScssPhp\\ScssPhp\\Test\\": "tests/" }
26+
"psr-4": { "ScssPhp\\ScssPhp\\Tests\\": "tests/" }
2727
},
2828
"require": {
29-
"php": "^5.6.0 || ^7"
29+
"php": ">=5.6.0",
30+
"ext-json": "*",
31+
"ext-ctype": "*"
3032
},
3133
"require-dev": {
32-
"squizlabs/php_codesniffer": "~2.5",
33-
"phpunit/phpunit": "~4.6",
34+
"squizlabs/php_codesniffer": "~3.5",
35+
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
3436
"twbs/bootstrap": "~4.3",
3537
"zurb/foundation": "~6.5"
3638
},
39+
"minimum-stability": "dev",
3740
"bin": ["bin/pscss"],
3841
"archive": {
3942
"exclude": [

scssphp/scssphp/src/Base/Range.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2015-2019 Leaf Corcoran
5+
* @copyright 2015-2020 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*

scssphp/scssphp/src/Block.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2012-2019 Leaf Corcoran
5+
* @copyright 2012-2020 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*

scssphp/scssphp/src/Cache.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* SCSSPHP
44
*
5-
* @copyright 2012-2019 Leaf Corcoran
5+
* @copyright 2012-2020 Leaf Corcoran
66
*
77
* @license http://opensource.org/licenses/MIT MIT
88
*
@@ -22,13 +22,12 @@
2222
* taking in account options that affects the result
2323
*
2424
* The cache manager is agnostic about data format and only the operation is expected to be described by string
25-
*
2625
*/
2726

2827
/**
2928
* SCSS cache
3029
*
31-
* @author Cedric Morin
30+
* @author Cedric Morin <[email protected]>
3231
*/
3332
class Cache
3433
{
@@ -57,12 +56,12 @@ class Cache
5756
public function __construct($options)
5857
{
5958
// check $cacheDir
60-
if (isset($options['cache_dir'])) {
61-
self::$cacheDir = $options['cache_dir'];
59+
if (isset($options['cacheDir'])) {
60+
self::$cacheDir = $options['cacheDir'];
6261
}
6362

6463
if (empty(self::$cacheDir)) {
65-
throw new Exception('cache_dir not set');
64+
throw new Exception('cacheDir not set');
6665
}
6766

6867
if (isset($options['prefix'])) {
@@ -74,7 +73,7 @@ public function __construct($options)
7473
}
7574

7675
if (isset($options['forceRefresh'])) {
77-
self::$forceRefresh = $options['force_refresh'];
76+
self::$forceRefresh = $options['forceRefresh'];
7877
}
7978

8079
self::checkCacheDir();
@@ -97,18 +96,18 @@ public function getCache($operation, $what, $options = [], $lastModified = null)
9796
{
9897
$fileCache = self::$cacheDir . self::cacheName($operation, $what, $options);
9998

100-
if ((! self::$forceRefresh || (self::$forceRefresh === 'once' &&
99+
if (((self::$forceRefresh === false) || (self::$forceRefresh === 'once' &&
101100
isset(self::$refreshed[$fileCache]))) && file_exists($fileCache)
102101
) {
103102
$cacheTime = filemtime($fileCache);
104103

105-
if ((is_null($lastModified) || $cacheTime > $lastModified) &&
104+
if ((\is_null($lastModified) || $cacheTime > $lastModified) &&
106105
$cacheTime + self::$gcLifetime > time()
107106
) {
108107
$c = file_get_contents($fileCache);
109108
$c = unserialize($c);
110109

111-
if (is_array($c) && isset($c['value'])) {
110+
if (\is_array($c) && isset($c['value'])) {
112111
return $c['value'];
113112
}
114113
}
@@ -132,6 +131,7 @@ public function setCache($operation, $what, $value, $options = [])
132131

133132
$c = ['value' => $value];
134133
$c = serialize($c);
134+
135135
file_put_contents($fileCache, $c);
136136

137137
if (self::$forceRefresh === 'once') {
@@ -176,13 +176,13 @@ public static function checkCacheDir()
176176
self::$cacheDir = str_replace('\\', '/', self::$cacheDir);
177177
self::$cacheDir = rtrim(self::$cacheDir, '/') . '/';
178178

179-
if (! file_exists(self::$cacheDir)) {
179+
if (! is_dir(self::$cacheDir)) {
180180
if (! mkdir(self::$cacheDir)) {
181181
throw new Exception('Cache directory couldn\'t be created: ' . self::$cacheDir);
182182
}
183-
} elseif (! is_dir(self::$cacheDir)) {
184-
throw new Exception('Cache directory doesn\'t exist: ' . self::$cacheDir);
185-
} elseif (! is_writable(self::$cacheDir)) {
183+
}
184+
185+
if (! is_writable(self::$cacheDir)) {
186186
throw new Exception('Cache directory isn\'t writable: ' . self::$cacheDir);
187187
}
188188
}

0 commit comments

Comments
 (0)