Merge pull request #574 from nextcloud/dependachristoph/composer/scss…

…-1.4.0 Bump scssphp/scssphp from 1.0.3 to 1.4.1
nextcloud · Jan 11, 2021 · 7bbfe82 · 7bbfe82
2 parents 09596e4 + 97ade2b
commit 7bbfe82
Show file tree

Hide file tree

Showing 44 changed files with 5,849 additions and 2,104 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
 		"psr/container": "^1.0",
 		"punic/punic": "^1.6",
 		"sabre/dav": "^4.1.3",
-		"scssphp/scssphp": "1.0.3",
+		"scssphp/scssphp": "^1.4.0",
 		"stecman/symfony-console-completion": "^0.11.0",
 		"swiftmailer/swiftmailer": "^6.0",
 		"symfony/console": "4.4.18",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -24,12 +24,12 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'v21.0.0beta5',
+    'version' => '21.0.0.0-beta5',
     'aliases' => 
     array (
     ),
-    'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
+    'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -297,12 +297,12 @@ class InstalledVersions
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'v21.0.0beta5',
+      'version' => '21.0.0.0-beta5',
       'aliases' => 
       array (
       ),
-      'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
+      'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -653,12 +653,12 @@ class InstalledVersions
     ),
     'scssphp/scssphp' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
+      'pretty_version' => 'v1.4.1',
+      'version' => '1.4.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '616c518333c656eaa23182ac6cfc01453f1e7c78',
+      'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
     ),
     'spomky-labs/base64url' => 
     array (

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -2411,6 +2411,8 @@
     'ScssPhp\\ScssPhp\\Exception\\CompilerException' => $vendorDir . '/scssphp/scssphp/src/Exception/CompilerException.php',
     'ScssPhp\\ScssPhp\\Exception\\ParserException' => $vendorDir . '/scssphp/scssphp/src/Exception/ParserException.php',
     'ScssPhp\\ScssPhp\\Exception\\RangeException' => $vendorDir . '/scssphp/scssphp/src/Exception/RangeException.php',
+    'ScssPhp\\ScssPhp\\Exception\\SassException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassException.php',
+    'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassScriptException.php',
     'ScssPhp\\ScssPhp\\Exception\\ServerException' => $vendorDir . '/scssphp/scssphp/src/Exception/ServerException.php',
     'ScssPhp\\ScssPhp\\Formatter' => $vendorDir . '/scssphp/scssphp/src/Formatter.php',
     'ScssPhp\\ScssPhp\\Formatter\\Compact' => $vendorDir . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -2422,13 +2424,14 @@
     'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => $vendorDir . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
     'ScssPhp\\ScssPhp\\Node' => $vendorDir . '/scssphp/scssphp/src/Node.php',
     'ScssPhp\\ScssPhp\\Node\\Number' => $vendorDir . '/scssphp/scssphp/src/Node/Number.php',
+    'ScssPhp\\ScssPhp\\OutputStyle' => $vendorDir . '/scssphp/scssphp/src/OutputStyle.php',
     'ScssPhp\\ScssPhp\\Parser' => $vendorDir . '/scssphp/scssphp/src/Parser.php',
     'ScssPhp\\ScssPhp\\SourceMap\\Base64' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64.php',
     'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
-    'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
     'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => $vendorDir . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
     'ScssPhp\\ScssPhp\\Type' => $vendorDir . '/scssphp/scssphp/src/Type.php',
     'ScssPhp\\ScssPhp\\Util' => $vendorDir . '/scssphp/scssphp/src/Util.php',
+    'ScssPhp\\ScssPhp\\Util\\Path' => $vendorDir . '/scssphp/scssphp/src/Util/Path.php',
     'ScssPhp\\ScssPhp\\Version' => $vendorDir . '/scssphp/scssphp/src/Version.php',
     'SearchDAV\\Backend\\ISearchBackend' => $vendorDir . '/icewind/searchdav/src/Backend/ISearchBackend.php',
     'SearchDAV\\Backend\\SearchPropertyDefinition' => $vendorDir . '/icewind/searchdav/src/Backend/SearchPropertyDefinition.php',

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -2928,6 +2928,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'ScssPhp\\ScssPhp\\Exception\\CompilerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/CompilerException.php',
         'ScssPhp\\ScssPhp\\Exception\\ParserException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ParserException.php',
         'ScssPhp\\ScssPhp\\Exception\\RangeException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/RangeException.php',
+        'ScssPhp\\ScssPhp\\Exception\\SassException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassException.php',
+        'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassScriptException.php',
         'ScssPhp\\ScssPhp\\Exception\\ServerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ServerException.php',
         'ScssPhp\\ScssPhp\\Formatter' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter.php',
         'ScssPhp\\ScssPhp\\Formatter\\Compact' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -2939,13 +2941,14 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
         'ScssPhp\\ScssPhp\\Node' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node.php',
         'ScssPhp\\ScssPhp\\Node\\Number' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node/Number.php',
+        'ScssPhp\\ScssPhp\\OutputStyle' => __DIR__ . '/..' . '/scssphp/scssphp/src/OutputStyle.php',
         'ScssPhp\\ScssPhp\\Parser' => __DIR__ . '/..' . '/scssphp/scssphp/src/Parser.php',
         'ScssPhp\\ScssPhp\\SourceMap\\Base64' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64.php',
         'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
-        'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQEncoder' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQEncoder.php',
         'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
         'ScssPhp\\ScssPhp\\Type' => __DIR__ . '/..' . '/scssphp/scssphp/src/Type.php',
         'ScssPhp\\ScssPhp\\Util' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util.php',
+        'ScssPhp\\ScssPhp\\Util\\Path' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util/Path.php',
         'ScssPhp\\ScssPhp\\Version' => __DIR__ . '/..' . '/scssphp/scssphp/src/Version.php',
         'SearchDAV\\Backend\\ISearchBackend' => __DIR__ . '/..' . '/icewind/searchdav/src/Backend/ISearchBackend.php',
         'SearchDAV\\Backend\\SearchPropertyDefinition' => __DIR__ . '/..' . '/icewind/searchdav/src/Backend/SearchPropertyDefinition.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -3938,29 +3938,33 @@
         },
         {
             "name": "scssphp/scssphp",
-            "version": "1.0.3",
-            "version_normalized": "1.0.3.0",
+            "version": "v1.4.1",
+            "version_normalized": "1.4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "616c518333c656eaa23182ac6cfc01453f1e7c78"
+                "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/616c518333c656eaa23182ac6cfc01453f1e7c78",
-                "reference": "616c518333c656eaa23182ac6cfc01453f1e7c78",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
+                "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6.0 || ^7"
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.6",
-                "squizlabs/php_codesniffer": "~2.5",
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
+                "sass/sass-spec": "2020.12.29",
+                "squizlabs/php_codesniffer": "~3.5",
+                "symfony/phpunit-bridge": "^5.1",
                 "twbs/bootstrap": "~4.3",
                 "zurb/foundation": "~6.5"
             },
-            "time": "2019-08-07T20:16:04+00:00",
+            "time": "2021-01-04T13:23:23+00:00",
             "bin": [
                 "bin/pscss"
             ],
@@ -3996,6 +4000,10 @@
                 "scss",
                 "stylesheet"
             ],
+            "support": {
+                "issues": "https://github.com/scssphp/scssphp/issues",
+                "source": "https://github.com/scssphp/scssphp/tree/v1.4.1"
+            },
             "install-path": "../scssphp/scssphp"
         },
         {

diff --git a/composer/installed.php b/composer/installed.php
@@ -1,12 +1,12 @@
 <?php return array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'v21.0.0beta5',
+    'version' => '21.0.0.0-beta5',
     'aliases' => 
     array (
     ),
-    'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
+    'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -274,12 +274,12 @@
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'v21.0.0beta5',
+      'version' => '21.0.0.0-beta5',
       'aliases' => 
       array (
       ),
-      'reference' => '65a8a4553327c818931876ac1aa80a2143e02733',
+      'reference' => '09596e43fba86a3643879595a8fb6fece4af6a78',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -630,12 +630,12 @@
     ),
     'scssphp/scssphp' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
+      'pretty_version' => 'v1.4.1',
+      'version' => '1.4.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '616c518333c656eaa23182ac6cfc01453f1e7c78',
+      'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
     ),
     'spomky-labs/base64url' => 
     array (

diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -92,7 +92,7 @@ final class Versions
   'sabre/uri' => '2.2.1@f502edffafea8d746825bd5f0b923a60fd2715ff',
   'sabre/vobject' => '4.3.3@58f9f9b46a1080c0130bd86f4df9a568aacb9c79',
   'sabre/xml' => '2.2.3@c3b959f821c19b36952ec4a595edd695c216bfc6',
-  'scssphp/scssphp' => '1.0.3@616c518333c656eaa23182ac6cfc01453f1e7c78',
+  'scssphp/scssphp' => 'v1.4.1@ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
   'spomky-labs/base64url' => 'v2.0.1@3eb46a1de803f0078962d910e3a2759224a68c61',
   'spomky-labs/cbor-php' => 'v1.0.8@575a66dc406575b030e3ba541b33447842f93185',
   'stecman/symfony-console-completion' => '0.11.0@a9502dab59405e275a9f264536c4e1cb61fc3518',
@@ -117,7 +117,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.1.1@bc28b39608b0674546d89318e55fb37eaec1a9e9',
   'web-auth/metadata-service' => 'v3.1.1@0e9d9b85590a0c5155b99d9a4b5bdaa01b1748e3',
   'web-auth/webauthn-lib' => 'v3.1.1@a8a11bc30480e98768987fe0fc266aef08ec99da',
-  'nextcloud/3rdparty' => 'dev-master@65a8a4553327c818931876ac1aa80a2143e02733',
+  'nextcloud/3rdparty' => 'v21.0.0beta5@09596e43fba86a3643879595a8fb6fece4af6a78',
 );
 
     private function __construct()

diff --git a/scssphp/scssphp/README.md b/scssphp/scssphp/README.md
@@ -1,12 +1,12 @@
 # scssphp
-### <http://scssphp.github.io/scssphp>
+### <https://scssphp.github.io/scssphp>
 
-[![Build](https://travis-ci.org/scssphp/scssphp.svg?branch=master)](http://travis-ci.org/scssphp/scssphp)
+![Build](https://github.com/scssphp/scssphp/workflows/CI/badge.svg)
 [![License](https://poser.pugx.org/scssphp/scssphp/license)](https://packagist.org/packages/scssphp/scssphp)
 
 `scssphp` is a compiler for SCSS written in PHP.
 
-Checkout the homepage, <http://scssphp.github.io/scssphp>, for directions on how to use.
+Checkout the homepage, <https://scssphp.github.io/scssphp>, for directions on how to use.
 
 ## Running Tests
 
@@ -23,25 +23,25 @@ There are several tests in the `tests/` directory:
 * `FailingTest.php` contains tests reported in Github issues that demonstrate compatibility bugs.
 * `InputTest.php` compiles every `.scss` file in the `tests/inputs` directory
   then compares to the respective `.css` file in the `tests/outputs` directory.
-* `ScssTest.php` extracts (ruby) `scss` tests from the `tests/scss_test.rb` file.
-* `ServerTest.php` contains functional tests for the `Server` class.
+* `SassSpecTest.php` extracts tests from the `sass/sass-spec` repository.
 
 When changing any of the tests in `tests/inputs`, the tests will most likely
 fail because the output has changed. Once you verify that the output is correct
 you can run the following command to rebuild all the tests:
 
     BUILD=1 vendor/bin/phpunit tests
 
-This will compile all the tests, and save results into `tests/outputs`.
+This will compile all the tests, and save results into `tests/outputs`. It also
+updates the list of excluded specs from sass-spec.
 
-To enable the `scss` compatibility tests:
+To enable the full `sass-spec` compatibility tests:
 
-    TEST_SCSS_COMPAT=1 vendor/bin/phpunit tests
+    TEST_SASS_SPEC=1 vendor/bin/phpunit tests
 
 ## Coding Standard
 
-`scssphp` source conforms to [PSR2](http://www.php-fig.org/psr/psr-2/).
+`scssphp` source conforms to [PSR12](https://www.php-fig.org/psr/psr-12/).
 
 Run the following command from the root directory to check the code for "sniffs".
 
-    vendor/bin/phpcs --standard=PSR2 bin src tests
+    vendor/bin/phpcs --standard=PSR12 --extensions=php bin src tests *.php
diff --git a/scssphp/scssphp/composer.json b/scssphp/scssphp/composer.json
@@ -23,26 +23,43 @@
         "psr-4": { "ScssPhp\\ScssPhp\\": "src/" }
     },
     "autoload-dev": {
-        "psr-4": { "ScssPhp\\ScssPhp\\Test\\": "tests/" }
+        "psr-4": { "ScssPhp\\ScssPhp\\Tests\\": "tests/" }
     },
     "require": {
-        "php": "^5.6.0 || ^7"
+        "php": ">=5.6.0",
+        "ext-json": "*",
+        "ext-ctype": "*"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~2.5",
-        "phpunit/phpunit": "~4.6",
+        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
+        "sass/sass-spec": "2020.12.29",
+        "squizlabs/php_codesniffer": "~3.5",
+        "symfony/phpunit-bridge": "^5.1",
         "twbs/bootstrap": "~4.3",
         "zurb/foundation": "~6.5"
     },
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "sass/sass-spec",
+                "version": "2020.12.29",
+                "source": {
+                    "type": "git",
+                    "url": "https://github.com/sass/sass-spec.git",
+                    "reference": "d975d33146fb679a6b359ceca329012f02e4a794"
+                },
+                "dist": {
+                    "type": "zip",
+                    "url": "https://api.github.com/repos/sass/sass-spec/zipball/d975d33146fb679a6b359ceca329012f02e4a794",
+                    "reference": "d975d33146fb679a6b359ceca329012f02e4a794",
+                    "shasum": ""
+                }
+            }
+        }
+    ],
     "bin": ["bin/pscss"],
-    "archive": {
-        "exclude": [
-            "/Makefile",
-            "/.gitattributes",
-            "/.gitignore",
-            "/.travis.yml",
-            "/phpunit.xml.dist",
-            "/tests"
-        ]
+    "config": {
+        "sort-packages": true
     }
 }