Skip to content

Commit 97ade2b

Browse files
ChristophWurstjuliusknorr
ChristophWurst
authored and
juliusknorr
committed
Bump scssphp/scssphp from 1.0.3 to 1.4.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 09596e4 commit 97ade2b

44 files changed

Lines changed: 5849 additions & 2104 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"psr/container": "^1.0",
3939
"punic/punic": "^1.6",
4040
"sabre/dav": "^4.1.3",
41-
"scssphp/scssphp": "1.0.3",
41+
"scssphp/scssphp": "^1.4.0",
4242
"stecman/symfony-console-completion": "^0.11.0",
4343
"swiftmailer/swiftmailer": "^6.0",
4444
"symfony/console": "4.4.18",

‎composer.lock‎

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

‎composer/InstalledVersions.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class InstalledVersions
2424
private static $installed = array (
2525
'root' =>
2626
array (
27-
'pretty_version' => 'dev-master',
28-
'version' => 'dev-master',
27+
'pretty_version' => 'v21.0.0beta5',
28+
'version' => '21.0.0.0-beta5',
2929
'aliases' =>
3030
array (
3131
),
32-
'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
32+
'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
3333
'name' => 'nextcloud/3rdparty',
3434
),
3535
'versions' =>
@@ -297,12 +297,12 @@ class InstalledVersions
297297
),
298298
'nextcloud/3rdparty' =>
299299
array (
300-
'pretty_version' => 'dev-master',
301-
'version' => 'dev-master',
300+
'pretty_version' => 'v21.0.0beta5',
301+
'version' => '21.0.0.0-beta5',
302302
'aliases' =>
303303
array (
304304
),
305-
'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
305+
'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
306306
),
307307
'nextcloud/lognormalizer' =>
308308
array (
@@ -653,12 +653,12 @@ class InstalledVersions
653653
),
654654
'scssphp/scssphp' =>
655655
array (
656-
'pretty_version' => '1.0.3',
657-
'version' => '1.0.3.0',
656+
'pretty_version' => 'v1.4.1',
657+
'version' => '1.4.1.0',
658658
'aliases' =>
659659
array (
660660
),
661-
'reference' => '616c518333c656eaa23182ac6cfc01453f1e7c78',
661+
'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
662662
),
663663
'spomky-labs/base64url' =>
664664
array (

‎composer/autoload_classmap.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2411,6 +2411,8 @@
24112411
'ScssPhp\\ScssPhp\\Exception\\CompilerException' => $vendorDir . '/scssphp/scssphp/src/Exception/CompilerException.php',
24122412
'ScssPhp\\ScssPhp\\Exception\\ParserException' => $vendorDir . '/scssphp/scssphp/src/Exception/ParserException.php',
24132413
'ScssPhp\\ScssPhp\\Exception\\RangeException' => $vendorDir . '/scssphp/scssphp/src/Exception/RangeException.php',
2414+
'ScssPhp\\ScssPhp\\Exception\\SassException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassException.php',
2415+
'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassScriptException.php',
24142416
'ScssPhp\\ScssPhp\\Exception\\ServerException' => $vendorDir . '/scssphp/scssphp/src/Exception/ServerException.php',
24152417
'ScssPhp\\ScssPhp\\Formatter' => $vendorDir . '/scssphp/scssphp/src/Formatter.php',
24162418
'ScssPhp\\ScssPhp\\Formatter\\Compact' => $vendorDir . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -2422,13 +2424,14 @@
24222424
'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => $vendorDir . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
24232425
'ScssPhp\\ScssPhp\\Node' => $vendorDir . '/scssphp/scssphp/src/Node.php',
24242426
'ScssPhp\\ScssPhp\\Node\\Number' => $vendorDir . '/scssphp/scssphp/src/Node/Number.php',
2427+
'ScssPhp\\ScssPhp\\OutputStyle' => $vendorDir . '/scssphp/scssphp/src/OutputStyle.php',
24252428
'ScssPhp\\ScssPhp\\Parser' => $vendorDir . '/scssphp/scssphp/src/Parser.php',
24262429
'ScssPhp\\ScssPhp\\SourceMap\\Base64' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64.php',
24272430
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
2428-
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
24292431
'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => $vendorDir . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
24302432
'ScssPhp\\ScssPhp\\Type' => $vendorDir . '/scssphp/scssphp/src/Type.php',
24312433
'ScssPhp\\ScssPhp\\Util' => $vendorDir . '/scssphp/scssphp/src/Util.php',
2434+
'ScssPhp\\ScssPhp\\Util\\Path' => $vendorDir . '/scssphp/scssphp/src/Util/Path.php',
24322435
'ScssPhp\\ScssPhp\\Version' => $vendorDir . '/scssphp/scssphp/src/Version.php',
24332436
'SearchDAV\\Backend\\ISearchBackend' => $vendorDir . '/icewind/searchdav/src/Backend/ISearchBackend.php',
24342437
'SearchDAV\\Backend\\SearchPropertyDefinition' => $vendorDir . '/icewind/searchdav/src/Backend/SearchPropertyDefinition.php',

‎composer/autoload_static.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2928,6 +2928,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
29282928
'ScssPhp\\ScssPhp\\Exception\\CompilerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/CompilerException.php',
29292929
'ScssPhp\\ScssPhp\\Exception\\ParserException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ParserException.php',
29302930
'ScssPhp\\ScssPhp\\Exception\\RangeException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/RangeException.php',
2931+
'ScssPhp\\ScssPhp\\Exception\\SassException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassException.php',
2932+
'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassScriptException.php',
29312933
'ScssPhp\\ScssPhp\\Exception\\ServerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ServerException.php',
29322934
'ScssPhp\\ScssPhp\\Formatter' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter.php',
29332935
'ScssPhp\\ScssPhp\\Formatter\\Compact' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -2939,13 +2941,14 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
29392941
'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
29402942
'ScssPhp\\ScssPhp\\Node' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node.php',
29412943
'ScssPhp\\ScssPhp\\Node\\Number' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node/Number.php',
2944+
'ScssPhp\\ScssPhp\\OutputStyle' => __DIR__ . '/..' . '/scssphp/scssphp/src/OutputStyle.php',
29422945
'ScssPhp\\ScssPhp\\Parser' => __DIR__ . '/..' . '/scssphp/scssphp/src/Parser.php',
29432946
'ScssPhp\\ScssPhp\\SourceMap\\Base64' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64.php',
29442947
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
2945-
'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
29462948
'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
29472949
'ScssPhp\\ScssPhp\\Type' => __DIR__ . '/..' . '/scssphp/scssphp/src/Type.php',
29482950
'ScssPhp\\ScssPhp\\Util' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util.php',
2951+
'ScssPhp\\ScssPhp\\Util\\Path' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util/Path.php',
29492952
'ScssPhp\\ScssPhp\\Version' => __DIR__ . '/..' . '/scssphp/scssphp/src/Version.php',
29502953
'SearchDAV\\Backend\\ISearchBackend' => __DIR__ . '/..' . '/icewind/searchdav/src/Backend/ISearchBackend.php',
29512954
'SearchDAV\\Backend\\SearchPropertyDefinition' => __DIR__ . '/..' . '/icewind/searchdav/src/Backend/SearchPropertyDefinition.php',

‎composer/installed.json‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3938,29 +3938,33 @@
39383938
},
39393939
{
39403940
"name": "scssphp/scssphp",
3941-
"version": "1.0.3",
3942-
"version_normalized": "1.0.3.0",
3941+
"version": "v1.4.1",
3942+
"version_normalized": "1.4.1.0",
39433943
"source": {
39443944
"type": "git",
39453945
"url": "https://github.com/scssphp/scssphp.git",
3946-
"reference": "616c518333c656eaa23182ac6cfc01453f1e7c78"
3946+
"reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7"
39473947
},
39483948
"dist": {
39493949
"type": "zip",
3950-
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/616c518333c656eaa23182ac6cfc01453f1e7c78",
3951-
"reference": "616c518333c656eaa23182ac6cfc01453f1e7c78",
3950+
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
3951+
"reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
39523952
"shasum": ""
39533953
},
39543954
"require": {
3955-
"php": "^5.6.0 || ^7"
3955+
"ext-ctype": "*",
3956+
"ext-json": "*",
3957+
"php": ">=5.6.0"
39563958
},
39573959
"require-dev": {
3958-
"phpunit/phpunit": "~4.6",
3959-
"squizlabs/php_codesniffer": "~2.5",
3960+
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
3961+
"sass/sass-spec": "2020.12.29",
3962+
"squizlabs/php_codesniffer": "~3.5",
3963+
"symfony/phpunit-bridge": "^5.1",
39603964
"twbs/bootstrap": "~4.3",
39613965
"zurb/foundation": "~6.5"
39623966
},
3963-
"time": "2019-08-07T20:16:04+00:00",
3967+
"time": "2021-01-04T13:23:23+00:00",
39643968
"bin": [
39653969
"bin/pscss"
39663970
],
@@ -3996,6 +4000,10 @@
39964000
"scss",
39974001
"stylesheet"
39984002
],
4003+
"support": {
4004+
"issues": "https://github.com/scssphp/scssphp/issues",
4005+
"source": "https://github.com/scssphp/scssphp/tree/v1.4.1"
4006+
},
39994007
"install-path": "../scssphp/scssphp"
40004008
},
40014009
{

‎composer/installed.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php return array (
22
'root' =>
33
array (
4-
'pretty_version' => 'dev-master',
5-
'version' => 'dev-master',
4+
'pretty_version' => 'v21.0.0beta5',
5+
'version' => '21.0.0.0-beta5',
66
'aliases' =>
77
array (
88
),
9-
'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
9+
'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
1010
'name' => 'nextcloud/3rdparty',
1111
),
1212
'versions' =>
@@ -274,12 +274,12 @@
274274
),
275275
'nextcloud/3rdparty' =>
276276
array (
277-
'pretty_version' => 'dev-master',
278-
'version' => 'dev-master',
277+
'pretty_version' => 'v21.0.0beta5',
278+
'version' => '21.0.0.0-beta5',
279279
'aliases' =>
280280
array (
281281
),
282-
'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
282+
'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
283283
),
284284
'nextcloud/lognormalizer' =>
285285
array (
@@ -630,12 +630,12 @@
630630
),
631631
'scssphp/scssphp' =>
632632
array (
633-
'pretty_version' => '1.0.3',
634-
'version' => '1.0.3.0',
633+
'pretty_version' => 'v1.4.1',
634+
'version' => '1.4.1.0',
635635
'aliases' =>
636636
array (
637637
),
638-
'reference' => '616c518333c656eaa23182ac6cfc01453f1e7c78',
638+
'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
639639
),
640640
'spomky-labs/base64url' =>
641641
array (

‎composer/package-versions-deprecated/src/PackageVersions/Versions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ final class Versions
9292
'sabre/uri' => '2.2.1@f502edffafea8d746825bd5f0b923a60fd2715ff',
9393
'sabre/vobject' => '4.3.3@58f9f9b46a1080c0130bd86f4df9a568aacb9c79',
9494
'sabre/xml' => '2.2.3@c3b959f821c19b36952ec4a595edd695c216bfc6',
95-
'scssphp/scssphp' => '1.0.3@616c518333c656eaa23182ac6cfc01453f1e7c78',
95+
'scssphp/scssphp' => 'v1.4.1@ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
9696
'spomky-labs/base64url' => 'v2.0.1@3eb46a1de803f0078962d910e3a2759224a68c61',
9797
'spomky-labs/cbor-php' => 'v1.0.8@575a66dc406575b030e3ba541b33447842f93185',
9898
'stecman/symfony-console-completion' => '0.11.0@a9502dab59405e275a9f264536c4e1cb61fc3518',
@@ -117,7 +117,7 @@ final class Versions
117117
'web-auth/cose-lib' => 'v3.1.1@bc28b39608b0674546d89318e55fb37eaec1a9e9',
118118
'web-auth/metadata-service' => 'v3.1.1@0e9d9b85590a0c5155b99d9a4b5bdaa01b1748e3',
119119
'web-auth/webauthn-lib' => 'v3.1.1@a8a11bc30480e98768987fe0fc266aef08ec99da',
120-
'nextcloud/3rdparty' => 'dev-master@65a8a4553327c818931876ac1aa80a2143e02733',
120+
'nextcloud/3rdparty' => 'v21.0.0beta5@09596e43fba86a3643879595a8fb6fece4af6a78',
121121
);
122122

123123
private function __construct()

‎scssphp/scssphp/README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# scssphp
2-
### <http://scssphp.github.io/scssphp>
2+
### <https://scssphp.github.io/scssphp>
33

4-
[![Build](https://travis-ci.org/scssphp/scssphp.svg?branch=master)](http://travis-ci.org/scssphp/scssphp)
4+
![Build](https://github.com/scssphp/scssphp/workflows/CI/badge.svg)
55
[![License](https://poser.pugx.org/scssphp/scssphp/license)](https://packagist.org/packages/scssphp/scssphp)
66

77
`scssphp` is a compiler for SCSS written in PHP.
88

9-
Checkout the homepage, <http://scssphp.github.io/scssphp>, for directions on how to use.
9+
Checkout the homepage, <https://scssphp.github.io/scssphp>, for directions on how to use.
1010

1111
## Running Tests
1212

@@ -23,25 +23,25 @@ There are several tests in the `tests/` directory:
2323
* `FailingTest.php` contains tests reported in Github issues that demonstrate compatibility bugs.
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.
26-
* `ScssTest.php` extracts (ruby) `scss` tests from the `tests/scss_test.rb` file.
27-
* `ServerTest.php` contains functional tests for the `Server` class.
26+
* `SassSpecTest.php` extracts tests from the `sass/sass-spec` repository.
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
3130
you can run the following command to rebuild all the tests:
3231

3332
BUILD=1 vendor/bin/phpunit tests
3433

35-
This will compile all the tests, and save results into `tests/outputs`.
34+
This will compile all the tests, and save results into `tests/outputs`. It also
35+
updates the list of excluded specs from sass-spec.
3636

37-
To enable the `scss` compatibility tests:
37+
To enable the full `sass-spec` compatibility tests:
3838

39-
TEST_SCSS_COMPAT=1 vendor/bin/phpunit tests
39+
TEST_SASS_SPEC=1 vendor/bin/phpunit tests
4040

4141
## Coding Standard
4242

43-
`scssphp` source conforms to [PSR2](http://www.php-fig.org/psr/psr-2/).
43+
`scssphp` source conforms to [PSR12](https://www.php-fig.org/psr/psr-12/).
4444

4545
Run the following command from the root directory to check the code for "sniffs".
4646

47-
vendor/bin/phpcs --standard=PSR2 bin src tests
47+
vendor/bin/phpcs --standard=PSR12 --extensions=php bin src tests *.php

‎scssphp/scssphp/composer.json‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,43 @@
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+
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
35+
"sass/sass-spec": "2020.12.29",
36+
"squizlabs/php_codesniffer": "~3.5",
37+
"symfony/phpunit-bridge": "^5.1",
3438
"twbs/bootstrap": "~4.3",
3539
"zurb/foundation": "~6.5"
3640
},
41+
"repositories": [
42+
{
43+
"type": "package",
44+
"package": {
45+
"name": "sass/sass-spec",
46+
"version": "2020.12.29",
47+
"source": {
48+
"type": "git",
49+
"url": "https://github.com/sass/sass-spec.git",
50+
"reference": "d975d33146fb679a6b359ceca329012f02e4a794"
51+
},
52+
"dist": {
53+
"type": "zip",
54+
"url": "https://api.github.com/repos/sass/sass-spec/zipball/d975d33146fb679a6b359ceca329012f02e4a794",
55+
"reference": "d975d33146fb679a6b359ceca329012f02e4a794",
56+
"shasum": ""
57+
}
58+
}
59+
}
60+
],
3761
"bin": ["bin/pscss"],
38-
"archive": {
39-
"exclude": [
40-
"/Makefile",
41-
"/.gitattributes",
42-
"/.gitignore",
43-
"/.travis.yml",
44-
"/phpunit.xml.dist",
45-
"/tests"
46-
]
62+
"config": {
63+
"sort-packages": true
4764
}
4865
}

0 commit comments

Comments
 (0)