From 6a6c115d463671fdef2a59f2ee434ba1a0f014a1 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Thu, 2 Feb 2023 12:02:33 -0500 Subject: [PATCH] allow symfony 6 --- composer.json | 18 +++++++++--------- composer.lock | 8 ++++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 9f49ec02a9..a372ebfd1d 100644 --- a/composer.json +++ b/composer.json @@ -55,16 +55,16 @@ "dompdf/dompdf" : "~2.0.2", "firebase/php-jwt": ">=3 <6", "rubobaquero/phpquery": "^0.9.15", - "symfony/config": "~4.4", + "symfony/config": "~4.4 || ~6.0", "symfony/polyfill-iconv": "~1.0", - "symfony/dependency-injection": "~4.4", - "symfony/event-dispatcher": "~4.4", - "symfony/filesystem": "~4.4", - "symfony/process": "~4.4", - "symfony/var-dumper": "~3.0 || ~4.4 || ~5.1", - "symfony/service-contracts": "~2.2", + "symfony/dependency-injection": "~4.4 || ~6.0", + "symfony/event-dispatcher": "~4.4 || ~6.0", + "symfony/filesystem": "~4.4 || ~6.0", + "symfony/process": "~4.4 || ~6.0", + "symfony/var-dumper": "~3.0 || ~4.4 || ~5.1 || ~6.0", + "symfony/service-contracts": "~2.2 || ~3.1", "psr/log": "~1.0 || ~2.0 || ~3.0", - "symfony/finder": "~4.4", + "symfony/finder": "~4.4 || ~6.0", "tecnickcom/tcpdf" : "6.4.*", "totten/ca-config": "~22.11", "zetacomponents/base": "1.9.*", @@ -103,7 +103,7 @@ "symfony/polyfill-php81": "^1.0", "symfony/polyfill-php82": "^1.0", "html2text/html2text": "^4.3.1", - "psr/container": "~1.0", + "psr/container": "~1.0 || ~2.0", "ext-fileinfo": "*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 1253ab990d..250e11e7e8 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": "ee2bb131990e95f3b0ec72818d8c9b8c", + "content-hash": "46f0f98fa6b4756cd9d5491842b6c614", "packages": [ { "name": "adrienrn/php-mimetyper", @@ -1399,9 +1399,13 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/master" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0" }, "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, { "url": "https://opencollective.com/zipstream", "type": "open_collective" -- 2.25.1