Merge pull request #100 from nextcloud/scssphp-bump

Bump scssphp
nextcloud · Jun 6, 2018 · 29a42b5 · 29a42b5
2 parents 51e7d38 + a3462ac
commit 29a42b5
Show file tree

Hide file tree

Showing 31 changed files with 857 additions and 97 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 		"icewind/Streams": "0.6.1",
 		"interfasys/lognormalizer": "^v1.0",
 		"jeremeamia/superclosure": "2.1.0",
-		"leafo/scssphp": "^0.7.2",
+		"leafo/scssphp": "0.7.6",
 		"league/flysystem": "^1.0",
 		"lukasreschke/id3parser": "^0.0.1",
 		"natxet/CssMin": "dev-master",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -961,6 +961,8 @@
     'Leafo\\ScssPhp\\Node' => $vendorDir . '/leafo/scssphp/src/Node.php',
     'Leafo\\ScssPhp\\Node\\Number' => $vendorDir . '/leafo/scssphp/src/Node/Number.php',
     'Leafo\\ScssPhp\\Parser' => $vendorDir . '/leafo/scssphp/src/Parser.php',
+    'Leafo\\ScssPhp\\SourceMap\\Base64VLQEncoder' => $vendorDir . '/leafo/scssphp/src/SourceMap/Base64VLQEncoder.php',
+    'Leafo\\ScssPhp\\SourceMap\\SourceMapGenerator' => $vendorDir . '/leafo/scssphp/src/SourceMap/SourceMapGenerator.php',
     'Leafo\\ScssPhp\\Type' => $vendorDir . '/leafo/scssphp/src/Type.php',
     'Leafo\\ScssPhp\\Util' => $vendorDir . '/leafo/scssphp/src/Util.php',
     'Leafo\\ScssPhp\\Version' => $vendorDir . '/leafo/scssphp/src/Version.php',

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -1335,6 +1335,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Leafo\\ScssPhp\\Node' => __DIR__ . '/..' . '/leafo/scssphp/src/Node.php',
         'Leafo\\ScssPhp\\Node\\Number' => __DIR__ . '/..' . '/leafo/scssphp/src/Node/Number.php',
         'Leafo\\ScssPhp\\Parser' => __DIR__ . '/..' . '/leafo/scssphp/src/Parser.php',
+        'Leafo\\ScssPhp\\SourceMap\\Base64VLQEncoder' => __DIR__ . '/..' . '/leafo/scssphp/src/SourceMap/Base64VLQEncoder.php',
+        'Leafo\\ScssPhp\\SourceMap\\SourceMapGenerator' => __DIR__ . '/..' . '/leafo/scssphp/src/SourceMap/SourceMapGenerator.php',
         'Leafo\\ScssPhp\\Type' => __DIR__ . '/..' . '/leafo/scssphp/src/Type.php',
         'Leafo\\ScssPhp\\Util' => __DIR__ . '/..' . '/leafo/scssphp/src/Util.php',
         'Leafo\\ScssPhp\\Version' => __DIR__ . '/..' . '/leafo/scssphp/src/Version.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -1283,17 +1283,17 @@
     },
     {
         "name": "leafo/scssphp",
-        "version": "v0.7.2",
-        "version_normalized": "0.7.2.0",
+        "version": "v0.7.6",
+        "version_normalized": "0.7.6.0",
         "source": {
             "type": "git",
             "url": "https://github.com/leafo/scssphp.git",
-            "reference": "4f605a51462c85cf6df5bb45460483a138e04025"
+            "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/leafo/scssphp/zipball/4f605a51462c85cf6df5bb45460483a138e04025",
-            "reference": "4f605a51462c85cf6df5bb45460483a138e04025",
+            "url": "https://api.github.com/repos/leafo/scssphp/zipball/585f6ae84de62ffecf69c23805f25d78d7e4b794",
+            "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794",
             "shasum": ""
         },
         "require": {
@@ -1303,7 +1303,7 @@
             "phpunit/phpunit": "~4.6",
             "squizlabs/php_codesniffer": "~2.5"
         },
-        "time": "2017-10-14T21:35:01+00:00",
+        "time": "2018-05-24T02:18:53+00:00",
         "bin": [
             "bin/pscss"
         ],

diff --git a/leafo/scssphp/scss.inc.php b/leafo/scssphp/scss.inc.php
@@ -11,6 +11,7 @@
     include_once __DIR__ . '/src/Compiler/Environment.php';
     include_once __DIR__ . '/src/Exception/CompilerException.php';
     include_once __DIR__ . '/src/Exception/ParserException.php';
+    include_once __DIR__ . '/src/Exception/RangeException.php';
     include_once __DIR__ . '/src/Exception/ServerException.php';
     include_once __DIR__ . '/src/Formatter.php';
     include_once __DIR__ . '/src/Formatter/Compact.php';
@@ -23,6 +24,8 @@
     include_once __DIR__ . '/src/Node.php';
     include_once __DIR__ . '/src/Node/Number.php';
     include_once __DIR__ . '/src/Parser.php';
+    include_once __DIR__ . '/src/SourceMap/Base64VLQEncoder.php';
+    include_once __DIR__ . '/src/SourceMap/SourceMapGenerator.php';
     include_once __DIR__ . '/src/Type.php';
     include_once __DIR__ . '/src/Util.php';
     include_once __DIR__ . '/src/Version.php';

diff --git a/leafo/scssphp/src/Base/Range.php b/leafo/scssphp/src/Base/Range.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2017 Leaf Corcoran
+ * @copyright 2015-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *

diff --git a/leafo/scssphp/src/Block.php b/leafo/scssphp/src/Block.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -28,6 +28,11 @@ class Block
      */
     public $parent;
 
+    /**
+     * @var string
+     */
+    public $sourceName;
+
     /**
      * @var integer
      */

diff --git a/leafo/scssphp/src/Colors.php b/leafo/scssphp/src/Colors.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *