diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0f88204..f9910621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.10.37
+## mm/dd/2022
+
+1. [](#improved)
+ * Updated vendor libraries to latest versions
+ * Removed a reference to `SwiftMailer` library to support new **Email** plugin v4.0
+
# v1.10.36
## 09/08/2022
diff --git a/composer.lock b/composer.lock
index 51928908..62b00f2e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -190,16 +190,16 @@
},
{
"name": "scssphp/scssphp",
- "version": "v1.10.4",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
- "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c"
+ "reference": "33749d12c2569bb24071f94e9af828662dabb068"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scssphp/scssphp/zipball/8ed20753db2d3d82629e6f5d35535bbbd3893b0c",
- "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c",
+ "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
+ "reference": "33749d12c2569bb24071f94e9af828662dabb068",
"shasum": ""
},
"require": {
@@ -264,9 +264,9 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
- "source": "https://github.com/scssphp/scssphp/tree/v1.10.4"
+ "source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
},
- "time": "2022-07-26T16:28:33+00:00"
+ "time": "2022-09-02T21:24:55+00:00"
}
],
"packages-dev": [
@@ -818,16 +818,16 @@
},
{
"name": "guzzlehttp/promises",
- "version": "1.5.1",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
- "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+ "reference": "b94b2807d85443f9719887892882d0329d1e2598",
"shasum": ""
},
"require": {
@@ -882,7 +882,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.1"
+ "source": "https://github.com/guzzle/promises/tree/1.5.2"
},
"funding": [
{
@@ -898,7 +898,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-22T20:56:57+00:00"
+ "time": "2022-08-28T14:55:35+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -1987,16 +1987,16 @@
},
{
"name": "sebastian/comparator",
- "version": "3.0.3",
+ "version": "3.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+ "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
- "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
+ "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
"shasum": ""
},
"require": {
@@ -2049,7 +2049,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5"
},
"funding": [
{
@@ -2057,7 +2057,7 @@
"type": "github"
}
],
- "time": "2020-11-30T08:04:30+00:00"
+ "time": "2022-09-14T12:31:48+00:00"
},
{
"name": "sebastian/diff",
@@ -2190,16 +2190,16 @@
},
{
"name": "sebastian/exporter",
- "version": "3.1.4",
+ "version": "3.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"
+ "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
- "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
+ "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
"shasum": ""
},
"require": {
@@ -2255,7 +2255,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
},
"funding": [
{
@@ -2263,7 +2263,7 @@
"type": "github"
}
],
- "time": "2021-11-11T13:51:24+00:00"
+ "time": "2022-09-14T06:00:17+00:00"
},
{
"name": "sebastian/global-state",
@@ -2596,16 +2596,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "v4.4.37",
+ "version": "v4.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "6e81008cac62369871cb6b8de64576ed138e3998"
+ "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6e81008cac62369871cb6b8de64576ed138e3998",
- "reference": "6e81008cac62369871cb6b8de64576ed138e3998",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb",
+ "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb",
"shasum": ""
},
"require": {
@@ -2648,7 +2648,7 @@
"description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/browser-kit/tree/v4.4.37"
+ "source": "https://github.com/symfony/browser-kit/tree/v4.4.44"
},
"funding": [
{
@@ -2664,20 +2664,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-07-25T12:56:14+00:00"
},
{
"name": "symfony/console",
- "version": "v4.4.43",
+ "version": "v4.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46"
+ "reference": "28b77970939500fb04180166a1f716e75a871ef8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/8a2628d2d5639f35113dc1b833ecd91e1ed1cf46",
- "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46",
+ "url": "https://api.github.com/repos/symfony/console/zipball/28b77970939500fb04180166a1f716e75a871ef8",
+ "reference": "28b77970939500fb04180166a1f716e75a871ef8",
"shasum": ""
},
"require": {
@@ -2738,7 +2738,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/console/tree/v4.4.43"
+ "source": "https://github.com/symfony/console/tree/v4.4.45"
},
"funding": [
{
@@ -2754,20 +2754,20 @@
"type": "tidelift"
}
],
- "time": "2022-06-23T12:22:25+00:00"
+ "time": "2022-08-17T14:50:19+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.4.37",
+ "version": "v4.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436"
+ "reference": "bd0a6737e48de45b4b0b7b6fc98c78404ddceaed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/0628e6c6d7c92f1a7bae543959bdc17347be2436",
- "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/bd0a6737e48de45b4b0b7b6fc98c78404ddceaed",
+ "reference": "bd0a6737e48de45b4b0b7b6fc98c78404ddceaed",
"shasum": ""
},
"require": {
@@ -2804,7 +2804,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v4.4.37"
+ "source": "https://github.com/symfony/css-selector/tree/v4.4.44"
},
"funding": [
{
@@ -2820,7 +2820,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-06-27T13:16:42+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -2891,16 +2891,16 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v4.4.42",
+ "version": "v4.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0"
+ "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be5a04618e5d44e71d013f177df80d3ec4b192a0",
- "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b8daf6c56801e6d664224261cb100b73edc78a5",
+ "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5",
"shasum": ""
},
"require": {
@@ -2945,7 +2945,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dom-crawler/tree/v4.4.42"
+ "source": "https://github.com/symfony/dom-crawler/tree/v4.4.45"
},
"funding": [
{
@@ -2961,20 +2961,20 @@
"type": "tidelift"
}
],
- "time": "2022-04-30T18:34:00+00:00"
+ "time": "2022-08-03T12:57:57+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.42",
+ "version": "v4.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "708e761740c16b02c86e3f0c932018a06b895d40"
+ "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/708e761740c16b02c86e3f0c932018a06b895d40",
- "reference": "708e761740c16b02c86e3f0c932018a06b895d40",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
+ "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
"shasum": ""
},
"require": {
@@ -3029,7 +3029,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.42"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44"
},
"funding": [
{
@@ -3045,7 +3045,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-05T15:33:49+00:00"
+ "time": "2022-07-20T09:59:04+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -3128,16 +3128,16 @@
},
{
"name": "symfony/finder",
- "version": "v4.4.41",
+ "version": "v4.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
+ "reference": "66bd787edb5e42ff59d3523f623895af05043e4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
- "reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f",
+ "reference": "66bd787edb5e42ff59d3523f623895af05043e4f",
"shasum": ""
},
"require": {
@@ -3170,7 +3170,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v4.4.41"
+ "source": "https://github.com/symfony/finder/tree/v4.4.44"
},
"funding": [
{
@@ -3186,7 +3186,7 @@
"type": "tidelift"
}
],
- "time": "2022-04-14T15:36:10+00:00"
+ "time": "2022-07-29T07:35:46+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -3609,16 +3609,16 @@
},
{
"name": "symfony/process",
- "version": "v4.4.41",
+ "version": "v4.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce"
+ "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce",
- "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce",
+ "url": "https://api.github.com/repos/symfony/process/zipball/5cee9cdc4f7805e2699d9fd66991a0e6df8252a2",
+ "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2",
"shasum": ""
},
"require": {
@@ -3651,7 +3651,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v4.4.41"
+ "source": "https://github.com/symfony/process/tree/v4.4.44"
},
"funding": [
{
@@ -3667,7 +3667,7 @@
"type": "tidelift"
}
],
- "time": "2022-04-04T10:19:07+00:00"
+ "time": "2022-06-27T13:16:42+00:00"
},
{
"name": "symfony/service-contracts",
@@ -3754,16 +3754,16 @@
},
{
"name": "symfony/yaml",
- "version": "v4.4.43",
+ "version": "v4.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "07e392f0ef78376d080d5353c081a5e5704835bd"
+ "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/07e392f0ef78376d080d5353c081a5e5704835bd",
- "reference": "07e392f0ef78376d080d5353c081a5e5704835bd",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d",
+ "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d",
"shasum": ""
},
"require": {
@@ -3805,7 +3805,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v4.4.43"
+ "source": "https://github.com/symfony/yaml/tree/v4.4.45"
},
"funding": [
{
@@ -3821,7 +3821,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-20T08:31:17+00:00"
+ "time": "2022-08-02T15:47:23+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2b813319..b0202e11 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -193,17 +193,17 @@
},
{
"name": "scssphp/scssphp",
- "version": "v1.10.4",
- "version_normalized": "1.10.4.0",
+ "version": "v1.11.0",
+ "version_normalized": "1.11.0.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
- "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c"
+ "reference": "33749d12c2569bb24071f94e9af828662dabb068"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scssphp/scssphp/zipball/8ed20753db2d3d82629e6f5d35535bbbd3893b0c",
- "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c",
+ "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
+ "reference": "33749d12c2569bb24071f94e9af828662dabb068",
"shasum": ""
},
"require": {
@@ -226,7 +226,7 @@
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
- "time": "2022-07-26T16:28:33+00:00",
+ "time": "2022-09-02T21:24:55+00:00",
"bin": [
"bin/pscss"
],
@@ -270,7 +270,7 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
- "source": "https://github.com/scssphp/scssphp/tree/v1.10.4"
+ "source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
},
"install-path": "../scssphp/scssphp"
}
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 26e6e852..d946757f 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'getgrav/grav-plugin-admin',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => 'df022eb74c426d927fa952063f853b9875a84f95',
+ 'reference' => '97ab52df8179fad32d1190b530c32053b84d5979',
'type' => 'grav-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'getgrav/grav-plugin-admin' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => 'df022eb74c426d927fa952063f853b9875a84f95',
+ 'reference' => '97ab52df8179fad32d1190b530c32053b84d5979',
'type' => 'grav-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -53,9 +53,9 @@
'dev_requirement' => false,
),
'scssphp/scssphp' => array(
- 'pretty_version' => 'v1.10.4',
- 'version' => '1.10.4.0',
- 'reference' => '8ed20753db2d3d82629e6f5d35535bbbd3893b0c',
+ 'pretty_version' => 'v1.11.0',
+ 'version' => '1.11.0.0',
+ 'reference' => '33749d12c2569bb24071f94e9af828662dabb068',
'type' => 'library',
'install_path' => __DIR__ . '/../scssphp/scssphp',
'aliases' => array(),
diff --git a/vendor/scssphp/scssphp/composer.json b/vendor/scssphp/scssphp/composer.json
index 269a4732..f81203dd 100644
--- a/vendor/scssphp/scssphp/composer.json
+++ b/vendor/scssphp/scssphp/composer.json
@@ -50,16 +50,16 @@
"type": "package",
"package": {
"name": "sass/sass-spec",
- "version": "2022.02.24",
+ "version": "2022.08.19",
"source": {
"type": "git",
"url": "https://github.com/sass/sass-spec.git",
- "reference": "f41b9bfb9a3013392f2136c79f7f3356f15fb8ba"
+ "reference": "2bdc199723a3445d5badac3ac774105698f08861"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sass/sass-spec/zipball/f41b9bfb9a3013392f2136c79f7f3356f15fb8ba",
- "reference": "f41b9bfb9a3013392f2136c79f7f3356f15fb8ba",
+ "url": "https://api.github.com/repos/sass/sass-spec/zipball/2bdc199723a3445d5badac3ac774105698f08861",
+ "reference": "2bdc199723a3445d5badac3ac774105698f08861",
"shasum": ""
}
}
diff --git a/vendor/scssphp/scssphp/phpcs.xml.dist b/vendor/scssphp/scssphp/phpcs.xml.dist
deleted file mode 100644
index b162dbd6..00000000
--- a/vendor/scssphp/scssphp/phpcs.xml.dist
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/vendor/scssphp/scssphp/src/Compiler.php b/vendor/scssphp/scssphp/src/Compiler.php
index f4ab328e..ecafc8cb 100644
--- a/vendor/scssphp/scssphp/src/Compiler.php
+++ b/vendor/scssphp/scssphp/src/Compiler.php
@@ -7947,7 +7947,11 @@ EOL;
$max = 100;
}
- return $number->valueInRange($change ? 0 : -$max, $max, $name);
+ if ($scale || $assertPercent) {
+ return $number->valueInRange($change ? 0 : -$max, $max, $name);
+ }
+
+ return $number->valueInRangeWithUnit($change ? 0 : -$max, $max, $name, $checkPercent ? '%' : '');
};
$alpha = $getParam('alpha', 1);
@@ -8582,7 +8586,7 @@ EOL;
$color = $this->assertColor($args[0], 'color');
$amount = $this->assertNumber($args[1], 'amount');
- $color[4] = (isset($color[4]) ? $color[4] : 1) + $amount->valueInRange(0, 1, 'amount');
+ $color[4] = (isset($color[4]) ? $color[4] : 1) + $amount->valueInRangeWithUnit(0, 1, 'amount', '');
$color[4] = min(1, max(0, $color[4]));
return $color;
@@ -8601,7 +8605,7 @@ EOL;
$color = $this->assertColor($args[0], 'color');
$amount = $this->assertNumber($args[1], 'amount');
- $color[4] = (isset($color[4]) ? $color[4] : 1) - $amount->valueInRange(0, 1, 'amount');
+ $color[4] = (isset($color[4]) ? $color[4] : 1) - $amount->valueInRangeWithUnit(0, 1, 'amount', '');
$color[4] = min(1, max(0, $color[4]));
return $color;
@@ -8769,7 +8773,7 @@ will be an error in future versions of Sass.\n on line $line of $fname";
protected function libNth($args)
{
$list = $this->coerceList($args[0], ',', false);
- $n = $this->assertNumber($args[1])->getDimension();
+ $n = $this->assertInteger($args[1]);
if ($n > 0) {
$n--;
@@ -8784,7 +8788,7 @@ will be an error in future versions of Sass.\n on line $line of $fname";
protected function libSetNth($args)
{
$list = $this->coerceList($args[0]);
- $n = $this->assertNumber($args[1])->getDimension();
+ $n = $this->assertInteger($args[1]);
if ($n > 0) {
$n--;
@@ -9589,7 +9593,25 @@ will be an error in future versions of Sass.\n on line $line of $fname";
protected function libRandom($args)
{
if (isset($args[0]) && $args[0] !== static::$null) {
- $n = $this->assertInteger($args[0], 'limit');
+ $limit = $this->assertNumber($args[0], 'limit');
+
+ if ($limit->hasUnits()) {
+ $unitString = $limit->unitStr();
+ $message = <<addLocationToMessage($message));
+ }
+
+ $n = $this->assertInteger($limit, 'limit');
if ($n < 1) {
throw new SassScriptException("\$limit: Must be greater than 0, was $n.");
diff --git a/vendor/scssphp/scssphp/src/Node/Number.php b/vendor/scssphp/scssphp/src/Node/Number.php
index ca9b5b65..48e711f0 100644
--- a/vendor/scssphp/scssphp/src/Node/Number.php
+++ b/vendor/scssphp/scssphp/src/Node/Number.php
@@ -227,6 +227,16 @@ class Number extends Node implements \ArrayAccess
return \count($this->numeratorUnits) === 0 && \count($this->denominatorUnits) === 0;
}
+ /**
+ * Returns true if the number has any units
+ *
+ * @return bool
+ */
+ public function hasUnits()
+ {
+ return !$this->unitless();
+ }
+
/**
* Checks whether the number has exactly this unit
*
@@ -266,7 +276,27 @@ class Number extends Node implements \ArrayAccess
try {
return Util::checkRange('', new Range($min, $max), $this);
} catch (RangeException $e) {
- throw SassScriptException::forArgument(sprintf('Expected %s to be within %s%s and %s%3$s', $this, $min, $this->unitStr(), $max), $name);
+ throw SassScriptException::forArgument(sprintf('Expected %s to be within %s%s and %s%3$s.', $this, $min, $this->unitStr(), $max), $name);
+ }
+ }
+
+ /**
+ * @param float|int $min
+ * @param float|int $max
+ * @param string $name
+ * @param string $unit
+ *
+ * @return float|int
+ * @throws SassScriptException
+ *
+ * @internal
+ */
+ public function valueInRangeWithUnit($min, $max, $name, $unit)
+ {
+ try {
+ return Util::checkRange('', new Range($min, $max), $this);
+ } catch (RangeException $e) {
+ throw SassScriptException::forArgument(sprintf('Expected %s to be within %s%s and %s%3$s.', $this, $min, $unit, $max), $name);
}
}
diff --git a/vendor/scssphp/scssphp/src/Parser.php b/vendor/scssphp/scssphp/src/Parser.php
index e9cbaf37..1c76e7c6 100644
--- a/vendor/scssphp/scssphp/src/Parser.php
+++ b/vendor/scssphp/scssphp/src/Parser.php
@@ -2461,7 +2461,7 @@ class Parser
$whiteBefore = isset($this->buffer[$this->count - 1]) &&
ctype_space($this->buffer[$this->count - 1]);
- while ($this->match($operators, $m, false) && static::$precedence[$m[1]] >= $minP) {
+ while ($this->match($operators, $m, false) && static::$precedence[strtolower($m[1])] >= $minP) {
$whiteAfter = isset($this->buffer[$this->count]) &&
ctype_space($this->buffer[$this->count]);
$varAfter = isset($this->buffer[$this->count]) &&
@@ -2485,7 +2485,7 @@ class Parser
}
// consume higher-precedence operators on the right-hand side
- $rhs = $this->expHelper($rhs, static::$precedence[$op] + 1);
+ $rhs = $this->expHelper($rhs, static::$precedence[strtolower($op)] + 1);
$lhs = [Type::T_EXPRESSION, $op, $lhs, $rhs, $this->inParens, $whiteBefore, $whiteAfter];
@@ -2804,6 +2804,10 @@ class Parser
$this->argValues($args) &&
$this->matchChar(')')
) {
+ if (strtolower($name) === 'var' && \count($args) === 2 && $args[1][0] === Type::T_NULL) {
+ $args[1] = [null, [Type::T_STRING, '', [' ']], false];
+ }
+
$func = [Type::T_FUNCTION_CALL, $name, $args];
return true;
diff --git a/vendor/scssphp/scssphp/src/Version.php b/vendor/scssphp/scssphp/src/Version.php
index a9efaa36..d604a505 100644
--- a/vendor/scssphp/scssphp/src/Version.php
+++ b/vendor/scssphp/scssphp/src/Version.php
@@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp;
*/
class Version
{
- const VERSION = '1.10.4';
+ const VERSION = '1.11.0';
}