From e9efc6ef71a779e91da14731738d3520339d9d2b Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 28 Jun 2022 23:04:03 +0200 Subject: [PATCH] Update symfony/string To avoid redeclaring functions that already exist: https://github.com/symfony/string/commit/af4b27f47b3a28ae4ac25864c93c79bb5c21315a --- composer.lock | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 90a519f..76d828b 100644 --- a/composer.lock +++ b/composer.lock @@ -3381,16 +3381,16 @@ }, { "name": "symfony/string", - "version": "v5.2.3", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "c95468897f408dd0aca2ff582074423dd0455122" + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122", - "reference": "c95468897f408dd0aca2ff582074423dd0455122", + "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097", + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097", "shasum": "" }, "require": { @@ -3401,11 +3401,14 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "~1.15" }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -3444,7 +3447,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.3" + "source": "https://github.com/symfony/string/tree/v5.4.10" }, "funding": [ { @@ -3460,7 +3463,7 @@ "type": "tidelift" } ], - "time": "2021-01-25T15:14:59+00:00" + "time": "2022-06-26T15:57:47+00:00" }, { "name": "symfony/translation", @@ -9403,5 +9406,5 @@ "platform-overrides": { "php": "7.3.11" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.2.0" }