diff --git a/composer.json b/composer.json index ca48ba1744..25d8974dfe 100644 --- a/composer.json +++ b/composer.json @@ -151,6 +151,7 @@ "twig/markdown-extra": "^2.12|^3" }, "conflict": { + "ext-psr": "<1.1|>=2", "async-aws/core": "<1.5", "doctrine/annotations": "<1.12", "doctrine/dbal": "<2.10", diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 12fb119fcc..65777679cd 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -35,6 +35,7 @@ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them" }, "conflict": { + "ext-psr": "<1.1|>=2", "symfony/config": "<5.3", "symfony/finder": "<4.4", "symfony/proxy-manager-bridge": "<4.4", diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json index 353413f327..ad4105cef1 100644 --- a/src/Symfony/Contracts/Service/composer.json +++ b/src/Symfony/Contracts/Service/composer.json @@ -19,6 +19,9 @@ "php": ">=7.2.5", "psr/container": "^1.1" }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, "suggest": { "symfony/service-implementation": "" }, diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json index b71a48d1b9..7e011ac3ef 100644 --- a/src/Symfony/Contracts/composer.json +++ b/src/Symfony/Contracts/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",