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
|
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
---
composer.json | 6 +++---
src/Symfony/Component/DependencyInjection/composer.json | 2 +-
src/Symfony/Component/Mime/composer.json | 2 +-
src/Symfony/Contracts/Service/composer.json | 2 +-
src/Symfony/Contracts/composer.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index 6383f38..66c3932 100644
--- a/composer.json
+++ b/composer.json
@@ -166,7 +166,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": "<3",
@@ -174,11 +174,11 @@
"doctrine/collections": "<1.8",
"doctrine/dbal": "<4.3",
"doctrine/orm": "<3.4",
- "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",
"symfony/flex": "<2.10"
},
"config": {
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 0209644..8f9d9ba 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -28,7 +28,7 @@
"symfony/yaml": "^7.4|^8.0"
},
"conflict": {
- "ext-psr": "<1.1|>=2"
+ "ext-psr": "<1.1"
},
"provide": {
"psr/container-implementation": "1.1|2.0",
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
index f22b158..b59fa68 100644
--- a/src/Symfony/Component/Mime/composer.json
+++ b/src/Symfony/Component/Mime/composer.json
@@ -31,7 +31,7 @@
"symfony/serializer": "^7.4|^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"
},
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",
|
