From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Thu, 8 Apr 2021 16:55:56 -0400 Subject: Adapt conflict to Debian expectations --- composer.json | 6 +++--- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 6 +++--- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 4 ++-- src/Symfony/Component/HttpFoundation/composer.json | 2 +- src/Symfony/Component/Mime/composer.json | 4 ++-- src/Symfony/Component/PropertyInfo/composer.json | 2 +- src/Symfony/Component/Security/Core/composer.json | 2 +- src/Symfony/Component/Security/Http/composer.json | 2 +- src/Symfony/Component/Serializer/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- src/Symfony/Contracts/Service/composer.json | 2 +- src/Symfony/Contracts/composer.json | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 53f24f5..89ee98d 100644 --- a/composer.json +++ b/composer.json @@ -165,16 +165,16 @@ "web-token/jwt-signature-algorithm-ecdsa": "^3.1" }, "conflict": { - "ext-psr": "<1.1|>=2", + "ext-psr": "<1.1", "async-aws/core": "<1.5", "doctrine/annotations": "<1.13.1", "doctrine/dbal": "<2.13.1", "doctrine/orm": "<2.15", - "egulias/email-validator": "~3.0.0", + "egulias/email-validator": "<3.1", "masterminds/html5": "<2.6", "phpdocumentor/reflection-docblock": "<5.2", "phpdocumentor/type-resolver": "<1.5.1", - "phpunit/phpunit": "<7.5|9.1.2" + "phpunit/phpunit": "<7.5" }, "config": { "allow-plugins": { diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 17828ca..d426958 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -55,7 +55,7 @@ "doctrine/orm": "<2.15", "symfony/cache": "<5.4", "symfony/dependency-injection": "<6.2", - "symfony/form": "<5.4.38|>=6,<6.4.6|>=7,<7.0.6", + "symfony/form": "<6.4.6", "symfony/http-foundation": "<6.3", "symfony/http-kernel": "<6.2", "symfony/lock": "<6.3", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index c3aab84..0a2e8c0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -82,7 +82,7 @@ "symfony/asset": "<5.4", "symfony/asset-mapper": "<6.4", "symfony/clock": "<6.3", - "symfony/console": "<5.4|>=7.0", + "symfony/console": ">=7.0", "symfony/dotenv": "<5.4", "symfony/dom-crawler": "<6.4", "symfony/http-client": "<6.3", @@ -93,8 +93,8 @@ "symfony/mime": "<6.4", "symfony/property-info": "<5.4", "symfony/property-access": "<5.4", - "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6", - "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", + "symfony/runtime": "<6.4.13", + "symfony/scheduler": "<6.4.4", "symfony/serializer": "<6.4", "symfony/security-csrf": "<5.4", "symfony/security-core": "<5.4", diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 86b05b9..9768d3f 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -28,7 +28,7 @@ "symfony/expression-language": "^5.4|^6.0|^7.0" }, "conflict": { - "ext-psr": "<1.1|>=2", + "ext-psr": "<1.1", "symfony/config": "<6.1", "symfony/finder": "<5.4", "symfony/proxy-manager-bridge": "<6.3", diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 0042f8b..68ec9f9 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -46,11 +46,11 @@ "conflict": { "symfony/console": "<5.4", "symfony/dependency-injection": "<5.4", - "symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7", + "symfony/doctrine-bridge": "<6.2.7", "symfony/error-handler": "<5.4", "symfony/framework-bundle": "<5.4", "symfony/http-kernel": "<5.4", - "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/translation": "<6.4.3", "symfony/translation-contracts": "<2.5", "symfony/twig-bridge": "<6.3" }, diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 732a011..801c9f7 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -32,7 +32,7 @@ "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, "conflict": { - "symfony/cache": "<6.4.12|>=7.0,<7.1.5" + "symfony/cache": "<6.4.12" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json index ae5ca36..5e39446 100644 --- a/src/Symfony/Component/Mime/composer.json +++ b/src/Symfony/Component/Mime/composer.json @@ -32,11 +32,11 @@ "symfony/serializer": "^6.4.3|^7.0.3" }, "conflict": { - "egulias/email-validator": "~3.0.0", + "egulias/email-validator": "<3.1", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<6.4.3|>7.0,<7.0.3" + "symfony/serializer": "<6.4.3" }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" }, diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json index 495b51d..45be246 100644 --- a/src/Symfony/Component/PropertyInfo/composer.json +++ b/src/Symfony/Component/PropertyInfo/composer.json @@ -38,7 +38,7 @@ "doctrine/annotations": "<1.12", "phpdocumentor/reflection-docblock": "<5.2", "phpdocumentor/type-resolver": "<1.5.1", - "symfony/dependency-injection": "<5.4|>=6.0,<6.4", + "symfony/dependency-injection": "<6.4", "symfony/cache": "<5.4", "symfony/serializer": "<5.4" }, diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 54a7e39..e0cf97d 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -40,7 +40,7 @@ "symfony/http-foundation": "<5.4", "symfony/security-guard": "<5.4", "symfony/ldap": "<5.4", - "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/translation": "<6.4.3", "symfony/validator": "<5.4" }, "autoload": { diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index d5b3a50..f5fd177 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -40,7 +40,7 @@ }, "conflict": { "symfony/clock": "<6.3", - "symfony/event-dispatcher": "<5.4.9|>=6,<6.0.9", + "symfony/event-dispatcher": "<6.0.9", "symfony/http-client-contracts": "<3.0", "symfony/security-bundle": "<5.4", "symfony/security-csrf": "<5.4" diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index a463937..f8c4c1c 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -50,7 +50,7 @@ "phpdocumentor/type-resolver": "<1.4.0", "symfony/dependency-injection": "<5.4", "symfony/property-access": "<5.4", - "symfony/property-info": "<5.4.24|>=6,<6.2.11", + "symfony/property-info": "<6.2.11", "symfony/validator": "<6.4", "symfony/uid": "<5.4", "symfony/yaml": "<5.4" diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index ece01e2..b38c3f8 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -50,7 +50,7 @@ "symfony/http-kernel": "<5.4", "symfony/intl": "<5.4", "symfony/property-info": "<5.4", - "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/translation": "<6.4.3", "symfony/yaml": "<5.4" }, "autoload": { diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json index 32bb8a3..a4624c3 100644 --- a/src/Symfony/Contracts/Service/composer.json +++ b/src/Symfony/Contracts/Service/composer.json @@ -20,7 +20,7 @@ "psr/container": "^1.1|^2.0" }, "conflict": { - "ext-psr": "<1.1|>=2" + "ext-psr": "<1.1" }, "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" }, diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json index b4be947..820d5df 100644 --- a/src/Symfony/Contracts/composer.json +++ b/src/Symfony/Contracts/composer.json @@ -25,7 +25,7 @@ "symfony/polyfill-intl-idn": "^1.10" }, "conflict": { - "ext-psr": "<1.1|>=2" + "ext-psr": "<1.1" }, "replace": { "symfony/cache-contracts": "self.version",