From 556c02ba1b7f4918eb8b494f39dc96b926ba8442 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms <tleilax+studip@gmail.com> Date: Wed, 15 May 2024 20:19:29 +0000 Subject: [PATCH] update symfony/yaml to 6.4.7, fixes #4177 Closes #4177 Merge request studip/studip!3015 --- composer.json | 2 +- composer.lock | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index f48cd959d7c..b56c364383c 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "tuupola/cors-middleware": "^1.2.1", "tecnickcom/tcpdf": "6.7.5", "scssphp/scssphp": "1.12.1", - "symfony/yaml": "^5.0", + "symfony/yaml": "6.4.7", "ezyang/htmlpurifier": "^4.13", "jasig/phpcas": "1.5", "phpxmlrpc/phpxmlrpc": "^4.9.0", diff --git a/composer.lock b/composer.lock index aa7c3f8c951..fb3b1929b09 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": "0ad301d5d24df185fd5982cd805d4a98", + "content-hash": "fca457dd82eba76b259880bcfbac376d", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -4549,31 +4549,28 @@ }, { "name": "symfony/yaml", - "version": "v5.4.39", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "bc780e16879000f77a1022163c052f5323b5e640" + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/bc780e16879000f77a1022163c052f5323b5e640", - "reference": "bc780e16879000f77a1022163c052f5323b5e640", + "url": "https://api.github.com/repos/symfony/yaml/zipball/53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", + "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.3" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.3|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -4604,7 +4601,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.39" + "source": "https://github.com/symfony/yaml/tree/v6.4.7" }, "funding": [ { @@ -4620,7 +4617,7 @@ "type": "tidelift" } ], - "time": "2024-04-23T11:57:27+00:00" + "time": "2024-04-28T10:28:08+00:00" }, { "name": "tecnickcom/tcpdf", -- GitLab