summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index b71a48d..f70b8b7 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,9 @@
"require-dev": {
"symfony/polyfill-intl-idn": "^1.10"
},
+ "conflict": {
+ "ext-psr": "<1.1|>=2"
+ },
"replace": {
"symfony/cache-contracts": "self.version",
"symfony/deprecation-contracts": "self.version",
@@ -49,7 +52,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "2.4-dev"
+ "dev-main": "2.5-dev"
}
}
}