From 46286a6d43ec5e0917ebb2ddf8f73e460291fd37 Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 2 Nov 2023 13:53:48 +0100 Subject: [PATCH] Fix composer dependency update --- composer.lock | 12 ++++++------ vendor/bin/yaml-lint | 5 +++-- vendor/bin/yaml-lint.bat | 5 ----- vendor/composer/installed.json | 14 +++++++------- vendor/composer/installed.php | 6 +++--- vendor/symfony/yaml/Inline.php | 4 ++++ 6 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 vendor/bin/yaml-lint.bat diff --git a/composer.lock b/composer.lock index ad7624bf92..759b3a5da5 100644 --- a/composer.lock +++ b/composer.lock @@ -1029,16 +1029,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.3", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add" + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", "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.3" + "source": "https://github.com/symfony/yaml/tree/v6.3.7" }, "funding": [ { @@ -1097,7 +1097,7 @@ "type": "tidelift" } ], - "time": "2023-07-31T07:08:24+00:00" + "time": "2023-10-28T23:31:00+00:00" } ], "packages-dev": [], diff --git a/vendor/bin/yaml-lint b/vendor/bin/yaml-lint index 388092f5b4..b5cdff984a 100755 --- a/vendor/bin/yaml-lint +++ b/vendor/bin/yaml-lint @@ -112,8 +112,9 @@ 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')) ) { - return include("phpvfscomposer://" . __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'); + include("phpvfscomposer://" . __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'); + exit(0); } } -return include __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'; +include __DIR__ . '/..'.'/symfony/yaml/Resources/bin/yaml-lint'; diff --git a/vendor/bin/yaml-lint.bat b/vendor/bin/yaml-lint.bat deleted file mode 100644 index fbce06e043..0000000000 --- a/vendor/bin/yaml-lint.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF -setlocal DISABLEDELAYEDEXPANSION -SET BIN_TARGET=%~dp0/yaml-lint -SET COMPOSER_RUNTIME_BIN_DIR=%~dp0 -php "%BIN_TARGET%" %* diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c35e3b921d..bec6c1aada 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1068,17 +1068,17 @@ }, { "name": "symfony/yaml", - "version": "v6.3.3", - "version_normalized": "6.3.3.0", + "version": "v6.3.7", + "version_normalized": "6.3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add" + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", "shasum": "" }, "require": { @@ -1092,7 +1092,7 @@ "require-dev": { "symfony/console": "^5.4|^6.0" }, - "time": "2023-07-31T07:08:24+00:00", + "time": "2023-10-28T23:31:00+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.3" + "source": "https://github.com/symfony/yaml/tree/v6.3.7" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 3458cc56d7..b3a98ed23e 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -167,9 +167,9 @@ ), ), 'symfony/yaml' => array( - 'pretty_version' => 'v6.3.3', - 'version' => '6.3.3.0', - 'reference' => 'e23292e8c07c85b971b44c1c4b87af52133e2add', + 'pretty_version' => 'v6.3.7', + 'version' => '6.3.7.0', + 'reference' => '9758b6c69d179936435d0ffb577c3708d57e38a8', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/yaml', 'aliases' => array(), diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php index c2a93bab6c..1bd2fe0c7a 100644 --- a/vendor/symfony/yaml/Inline.php +++ b/vendor/symfony/yaml/Inline.php @@ -57,6 +57,10 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri */ public static function parse(string $value = null, int $flags = 0, array &$references = []): mixed { + if (null === $value) { + return ''; + } + self::initialize($flags); $value = trim($value);