diff --git a/CONFLICTS.md b/CONFLICTS.md index ae548e9100..2538404bf1 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -70,3 +70,7 @@ references related issues. - https://github.com/stof/StofDoctrineExtensionsBundle/issues/455 - https://github.com/doctrine-extensions/DoctrineExtensions/issues/2600 + +- `doctrine/doctrine-bundle:2.11.0`: + + This version uses the [readonly property](https://github.com/doctrine/DoctrineBundle/blob/2.11.0/Repository/ServiceEntityRepositoryProxy.php#L34), which is available from PHP 8.1 while the package also supports PHP 7.4 and 8.0, leading to compatibility issues. diff --git a/composer.json b/composer.json index 6d5432e137..0243a9213e 100644 --- a/composer.json +++ b/composer.json @@ -180,7 +180,7 @@ }, "conflict": { "api-platform/core": "2.7.0", - "doctrine/doctrine-bundle": "2.3.0", + "doctrine/doctrine-bundle": "2.3.0 || 2.11.0", "doctrine/migrations": "3.5.3", "doctrine/orm": ">= 2.16.0", "jms/serializer-bundle": "4.1.0",