1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Thu, 8 Apr 2021 16:55:56 -0400
Subject: Adapt conflict to Debian expectations
Forwarded: not-needed
---
composer.json | 6 +++---
src/Symfony/Bundle/FrameworkBundle/composer.json | 4 ++--
src/Symfony/Component/DependencyInjection/composer.json | 2 +-
src/Symfony/Component/Form/composer.json | 2 +-
src/Symfony/Component/HttpFoundation/composer.json | 2 +-
src/Symfony/Component/Mime/composer.json | 4 ++--
src/Symfony/Component/Security/Core/composer.json | 2 +-
src/Symfony/Component/Validator/composer.json | 4 ++--
src/Symfony/Contracts/Service/composer.json | 2 +-
src/Symfony/Contracts/composer.json | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/composer.json b/composer.json
index b8ae634..9626b38 100644
--- a/composer.json
+++ b/composer.json
@@ -169,7 +169,7 @@
"web-token/jwt-library": "^3.3.2|^4.0"
},
"conflict": {
- "ext-psr": "<1.1|>=2",
+ "ext-psr": "<1.1",
"ext-redis": "<6.1",
"ext-relay": "<0.12.1",
"amphp/amp": "<2.5",
@@ -177,11 +177,11 @@
"doctrine/collections": "<1.8",
"doctrine/dbal": "<3.6",
"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/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index e5421ff..ef78a54 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -97,8 +97,8 @@
"symfony/mime": "<6.4",
"symfony/property-info": "<6.4",
"symfony/property-access": "<6.4",
- "symfony/runtime": "<6.4.13|>=7.0,<7.1.6",
- "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
+ "symfony/runtime": "<7.1.6",
+ "symfony/scheduler": "<7.0.4",
"symfony/security-csrf": "<7.2",
"symfony/security-core": "<6.4",
"symfony/serializer": "<7.2.5",
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 0a69633..aea5626 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -28,7 +28,7 @@
"symfony/expression-language": "^6.4|^7.0|^8.0"
},
"conflict": {
- "ext-psr": "<1.1|>=2",
+ "ext-psr": "<1.1",
"symfony/config": "<6.4",
"symfony/finder": "<6.4",
"symfony/yaml": "<6.4"
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 6254199..d487494 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -52,7 +52,7 @@
"symfony/framework-bundle": "<6.4",
"symfony/http-kernel": "<6.4",
"symfony/intl": "<7.4",
- "symfony/translation": "<6.4.3|>=7.0,<7.0.3",
+ "symfony/translation": "<7.0.3",
"symfony/translation-contracts": "<2.5",
"symfony/twig-bridge": "<6.4"
},
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index dba1835..359ea7b 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -33,7 +33,7 @@
},
"conflict": {
"doctrine/dbal": "<3.6",
- "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
+ "symfony/cache": "<7.1.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
index 94cc6d3..06b8b9a 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|^8.0"
},
"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": "<6.4",
- "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
+ "symfony/serializer": "<7.0.3"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Mime\\": "" },
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 9d662f7..0f650bb 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -41,7 +41,7 @@
"symfony/event-dispatcher": "<6.4",
"symfony/http-foundation": "<6.4",
"symfony/ldap": "<6.4",
- "symfony/translation": "<6.4.3|>=7.0,<7.0.3",
+ "symfony/translation": "<7.0.3",
"symfony/validator": "<6.4"
},
"autoload": {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 0af6833..59bbfe3 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -52,8 +52,8 @@
"symfony/http-kernel": "<6.4",
"symfony/intl": "<6.4",
"symfony/property-info": "<6.4",
- "symfony/translation": "<6.4.3|>=7.0,<7.0.3",
- "symfony/var-exporter": "<6.4.25|>=7.0,<7.3.3",
+ "symfony/translation": "<7.0.3",
+ "symfony/var-exporter": "<7.3.3",
"symfony/yaml": "<6.4"
},
"autoload": {
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index bc2e99a..e927c4a 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -21,7 +21,7 @@
"symfony/deprecation-contracts": "^2.5|^3"
},
"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 be90b35..e540098 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",
|