From 9285746342def826fe49064407e45d38f9926a98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 25 May 2022 15:49:19 +0200 Subject: [PATCH] Update composer dependencies --- .../files/lib/system/api/composer.lock | 22 +++++++-------- .../lib/system/api/composer/installed.json | 28 +++++++++---------- .../lib/system/api/composer/installed.php | 14 +++++----- .../laminas-diactoros/.laminas-ci.json | 8 ------ .../src/Response/JsonResponse.php | 17 +++++++---- .../api/scssphp/scssphp/src/Compiler.php | 8 +++--- .../scssphp/src/Logger/QuietLogger.php | 2 ++ .../scssphp/src/Logger/StreamLogger.php | 2 ++ .../api/scssphp/scssphp/src/Version.php | 2 +- 9 files changed, 52 insertions(+), 51 deletions(-) delete mode 100644 wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/.laminas-ci.json diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index b59e7ad5a3..569f8ccef4 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/composer.lock @@ -479,16 +479,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4" + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/d1bc565b23c2040fafde398a8a5db083c47928c0", + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0", "shasum": "" }, "require": { @@ -574,7 +574,7 @@ "type": "community_bridge" } ], - "time": "2022-05-04T15:16:15+00:00" + "time": "2022-05-17T10:57:52+00:00" }, { "name": "laminas/laminas-httphandlerrunner", @@ -1394,16 +1394,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": { @@ -1462,9 +1462,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 3d75439c09..aad85efaf8 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -483,17 +483,17 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.10.0", - "version_normalized": "2.10.0.0", + "version": "2.11.0", + "version_normalized": "2.11.0.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4" + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", - "reference": "a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/d1bc565b23c2040fafde398a8a5db083c47928c0", + "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0", "shasum": "" }, "require": { @@ -522,7 +522,7 @@ "psalm/plugin-phpunit": "^0.14.0", "vimeo/psalm": "^4.3" }, - "time": "2022-05-04T15:16:15+00:00", + "time": "2022-05-17T10:57:52+00:00", "type": "library", "extra": { "laminas": { @@ -1429,17 +1429,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": { @@ -1462,7 +1462,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" ], @@ -1500,7 +1500,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" }, @@ -1778,6 +1778,6 @@ "install-path": "../true/punycode" } ], - "dev": true, + "dev": false, "dev-package-names": [] } diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index de3b627b8c..231226b88b 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -7,7 +7,7 @@ 'aliases' => array(), 'reference' => NULL, 'name' => '__root__', - 'dev' => true, + 'dev' => false, ), 'versions' => array( '__root__' => array( @@ -74,12 +74,12 @@ 'dev_requirement' => false, ), 'laminas/laminas-diactoros' => array( - 'pretty_version' => '2.10.0', - 'version' => '2.10.0.0', + 'pretty_version' => '2.11.0', + 'version' => '2.11.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-diactoros', 'aliases' => array(), - 'reference' => 'a3f03b3c158a3a7014c6ba553b0cb83bf7da19c4', + 'reference' => 'd1bc565b23c2040fafde398a8a5db083c47928c0', 'dev_requirement' => false, ), 'laminas/laminas-httphandlerrunner' => array( @@ -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/laminas/laminas-diactoros/.laminas-ci.json b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/.laminas-ci.json deleted file mode 100644 index e50b00a1cd..0000000000 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/.laminas-ci.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extensions": [ - "gd" - ], - "ignore_php_platform_requirements": { - "8.1": true - } -} diff --git a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Response/JsonResponse.php b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Response/JsonResponse.php index ded4ca7929..84baa9592d 100644 --- a/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Response/JsonResponse.php +++ b/wcfsetup/install/files/lib/system/api/laminas/laminas-diactoros/src/Response/JsonResponse.php @@ -16,6 +16,11 @@ use function json_last_error_msg; use function sprintf; use const JSON_ERROR_NONE; +use const JSON_HEX_AMP; +use const JSON_HEX_APOS; +use const JSON_HEX_QUOT; +use const JSON_HEX_TAG; +use const JSON_UNESCAPED_SLASHES; /** * JSON response. @@ -29,15 +34,15 @@ class JsonResponse extends Response use InjectContentTypeTrait; /** - * Default flags for json_encode; value of: - * - * - * JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES - * + * Default flags for json_encode * * @const int */ - public const DEFAULT_JSON_FLAGS = 79; + public const DEFAULT_JSON_FLAGS = JSON_HEX_TAG + | JSON_HEX_APOS + | JSON_HEX_AMP + | JSON_HEX_QUOT + | JSON_UNESCAPED_SLASHES; /** * @var mixed 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