From 69d0b76213c1cf6fdf595b44564ccb0ecc4d7349 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 1 Jun 2022 15:32:00 +0200 Subject: [PATCH] Update composer dependencies --- .../install/files/lib/system/api/composer.lock | 12 ++++++------ .../files/lib/system/api/composer/installed.json | 14 +++++++------- .../files/lib/system/api/composer/installed.php | 6 +++--- .../system/api/scssphp/scssphp/src/Compiler.php | 8 ++++---- .../api/scssphp/scssphp/src/Logger/QuietLogger.php | 2 ++ .../scssphp/scssphp/src/Logger/StreamLogger.php | 2 ++ .../lib/system/api/scssphp/scssphp/src/Version.php | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 3f9017bf1f..91f396fa50 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -1403,16 +1403,16 @@ }, { "name": "scssphp/scssphp", - "version": "v1.10.2", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46" + "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/387f4f4abf5d99f16be16314c5ab856f81c82f46", - "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713", + "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713", "shasum": "" }, "require": { @@ -1471,9 +1471,9 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.10.2" + "source": "https://github.com/scssphp/scssphp/tree/v1.10.3" }, - "time": "2022-03-02T21:15:09+00:00" + "time": "2022-05-16T07:22:18+00:00" }, { "name": "symfony/css-selector", diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index 60332ca07c..eed914df7e 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -1438,17 +1438,17 @@ }, { "name": "scssphp/scssphp", - "version": "v1.10.2", - "version_normalized": "1.10.2.0", + "version": "v1.10.3", + "version_normalized": "1.10.3.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46" + "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/387f4f4abf5d99f16be16314c5ab856f81c82f46", - "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713", + "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713", "shasum": "" }, "require": { @@ -1471,7 +1471,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-03-02T21:15:09+00:00", + "time": "2022-05-16T07:22:18+00:00", "bin": [ "bin/pscss" ], @@ -1509,7 +1509,7 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.10.2" + "source": "https://github.com/scssphp/scssphp/tree/v1.10.3" }, "install-path": "../scssphp/scssphp" }, diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index 751ec5a04b..cdadb9c0d4 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -227,12 +227,12 @@ 'dev_requirement' => false, ), 'scssphp/scssphp' => array( - 'pretty_version' => 'v1.10.2', - 'version' => '1.10.2.0', + 'pretty_version' => 'v1.10.3', + 'version' => '1.10.3.0', 'type' => 'library', 'install_path' => __DIR__ . '/../scssphp/scssphp', 'aliases' => array(), - 'reference' => '387f4f4abf5d99f16be16314c5ab856f81c82f46', + 'reference' => '0f1e1516ed2412ad43e42a6a319e77624ba1f713', 'dev_requirement' => false, ), 'symfony/css-selector' => array( diff --git a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Compiler.php b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Compiler.php index e414436c88..eecfa481ab 100644 --- a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Compiler.php +++ b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Compiler.php @@ -2350,9 +2350,9 @@ class Compiler } /** - * Compile children and throw exception if unexpected `@return` + * Compile children and throw exception if unexpected at-return * - * @param array $stms + * @param array[] $stms * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out * @param \ScssPhp\ScssPhp\Block $selfParent * @param string $traceName @@ -2367,13 +2367,13 @@ class Compiler foreach ($stms as $stm) { if ($selfParent && isset($stm[1]) && \is_object($stm[1]) && $stm[1] instanceof Block) { + $oldSelfParent = $stm[1]->selfParent; $stm[1]->selfParent = $selfParent; $ret = $this->compileChild($stm, $out); - $stm[1]->selfParent = null; + $stm[1]->selfParent = $oldSelfParent; } elseif ($selfParent && \in_array($stm[0], [Type::T_INCLUDE, Type::T_EXTEND])) { $stm['selfParent'] = $selfParent; $ret = $this->compileChild($stm, $out); - unset($stm['selfParent']); } else { $ret = $this->compileChild($stm, $out); } diff --git a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/QuietLogger.php b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/QuietLogger.php index 0f358c6467..ad7c07537f 100644 --- a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/QuietLogger.php +++ b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/QuietLogger.php @@ -14,6 +14,8 @@ namespace ScssPhp\ScssPhp\Logger; /** * A logger that silently ignores all messages. + * + * @final */ class QuietLogger implements LoggerInterface { diff --git a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/StreamLogger.php b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/StreamLogger.php index f5da6c9cf6..7db7cc1892 100644 --- a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/StreamLogger.php +++ b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Logger/StreamLogger.php @@ -14,6 +14,8 @@ namespace ScssPhp\ScssPhp\Logger; /** * A logger that prints to a PHP stream (for instance stderr) + * + * @final */ class StreamLogger implements LoggerInterface { diff --git a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Version.php b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Version.php index 0cf18ff7b9..c7f144125f 100644 --- a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Version.php +++ b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Version.php @@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp; */ class Version { - const VERSION = '1.10.2'; + const VERSION = '1.10.3'; } -- 2.20.1