From 3ee43bd03388d278cf67d9b4f505751a15cb0153 Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Tue, 21 Nov 2023 10:38:00 +0100 Subject: [PATCH] Update composer dependencies --- composer.json | 4 ++-- composer.lock | 18 +++++++++--------- vendor/bin/yaml-lint | 5 ++--- vendor/composer/installed.json | 20 ++++++++++---------- vendor/composer/installed.php | 18 +++++++++--------- vendor/symfony/yaml/Inline.php | 2 +- vendor/symfony/yaml/Parser.php | 7 +++++-- 7 files changed, 38 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index b970be3faa..0d2ee8d265 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "The Kirby core", "license": "proprietary", "type": "kirby-cms", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "keywords": [ "kirby", "cms", @@ -46,7 +46,7 @@ "phpmailer/phpmailer": "6.8.1", "symfony/polyfill-intl-idn": "1.28.0", "symfony/polyfill-mbstring": "1.28.0", - "symfony/yaml": "6.3.7" + "symfony/yaml": "6.3.8" }, "replace": { "symfony/polyfill-php72": "*" diff --git a/composer.lock b/composer.lock index 56c0feaf05..8d4f0d19db 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "98e712fd34f395cf5adb90233cc22416", + "content-hash": "5561c16523a088cede532cb00d5a89d7", "packages": [ { "name": "christian-riesen/base32", @@ -626,7 +626,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -673,7 +673,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -1029,16 +1029,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { @@ -1081,7 +1081,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.7" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { @@ -1097,7 +1097,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:31:00+00:00" + "time": "2023-11-06T10:58:05+00:00" } ], "packages-dev": [], diff --git a/vendor/bin/yaml-lint b/vendor/bin/yaml-lint index b5cdff984a..388092f5b4 100755 --- a/vendor/bin/yaml-lint +++ b/vendor/bin/yaml-lint @@ -112,9 +112,8 @@ if (PHP_VERSION_ID < 80000) { (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) ) { - include("phpvfscomposer://" . __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'); - exit(0); + return include("phpvfscomposer://" . __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'); } } -include __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'; +return include __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9ca847667f..1f1426cca2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -650,8 +650,8 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", - "version_normalized": "3.3.0.0", + "version": "v3.4.0", + "version_normalized": "3.4.0.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -700,7 +700,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -1068,17 +1068,17 @@ }, { "name": "symfony/yaml", - "version": "v6.3.7", - "version_normalized": "6.3.7.0", + "version": "v6.3.8", + "version_normalized": "6.3.8.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { @@ -1092,7 +1092,7 @@ "require-dev": { "symfony/console": "^5.4|^6.0" }, - "time": "2023-10-28T23:31:00+00:00", + "time": "2023-11-06T10:58:05+00:00", "bin": [ "Resources/bin/yaml-lint" ], @@ -1123,7 +1123,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.7" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index af40dd84c6..b00d04f316 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,8 +1,8 @@ array( 'name' => 'getkirby/cms', - 'pretty_version' => '4.0.0-rc.1', - 'version' => '4.0.0.0-RC1', + 'pretty_version' => '4.0.0-rc.2', + 'version' => '4.0.0.0-RC2', 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../', @@ -47,8 +47,8 @@ 'dev_requirement' => false, ), 'getkirby/cms' => array( - 'pretty_version' => '4.0.0-rc.1', - 'version' => '4.0.0.0-RC1', + 'pretty_version' => '4.0.0-rc.2', + 'version' => '4.0.0.0-RC2', 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../', @@ -116,8 +116,8 @@ 'dev_requirement' => false, ), 'symfony/deprecation-contracts' => array( - 'pretty_version' => 'v3.3.0', - 'version' => '3.3.0.0', + 'pretty_version' => 'v3.4.0', + 'version' => '3.4.0.0', 'reference' => '7c3aff79d10325257a001fcf92d991f24fc967cf', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/deprecation-contracts', @@ -167,9 +167,9 @@ ), ), 'symfony/yaml' => array( - 'pretty_version' => 'v6.3.7', - 'version' => '6.3.7.0', - 'reference' => '9758b6c69d179936435d0ffb577c3708d57e38a8', + 'pretty_version' => 'v6.3.8', + 'version' => '6.3.8.0', + 'reference' => '3493af8a8dad7fa91c77fa473ba23ecd95334a92', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/yaml', 'aliases' => array(), diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php index 1bd2fe0c7a..23fdedf778 100644 --- a/vendor/symfony/yaml/Inline.php +++ b/vendor/symfony/yaml/Inline.php @@ -531,7 +531,7 @@ private static function parseMapping(string $mapping, int $flags, int &$i = 0, a if ('<<' === $key) { $output += $value; } elseif ($allowOverwrite || !isset($output[$key])) { - if (!$isValueQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) { + if (!$isValueQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && !self::isBinaryString($value) && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) { $references[$matches['ref']] = $matches['value']; $value = $matches['value']; } diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php index ddfbcfd83a..21bb7f8b63 100644 --- a/vendor/symfony/yaml/Parser.php +++ b/vendor/symfony/yaml/Parser.php @@ -182,9 +182,8 @@ private function doParse(string $value, int $flags): mixed || self::preg_match('#^(?P'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P.+?))?\s*$#u', $this->trimTag($values['value']), $matches) ) ) { - // this is a compact notation element, add to next block and parse $block = $values['value']; - if ($this->isNextLineIndented()) { + if ($this->isNextLineIndented() || isset($matches['value']) && '>-' === $matches['value']) { $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + \strlen($values['leadspaces']) + 1); } @@ -932,6 +931,10 @@ private function isNextLineIndented(): bool } while (!$EOF && ($this->isCurrentLineEmpty() || $this->isCurrentLineComment())); if ($EOF) { + for ($i = 0; $i < $movements; ++$i) { + $this->moveToPreviousLine(); + } + return false; }