From 7ade3f89bcc4e2ec8828816470fcaf541272eca1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Oct 2021 10:12:26 +0200 Subject: update to 2.10.0 drop dependency on doctrine/annotations add dependency on symfony/polyfill-php80 --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 0e9c649..2a6df9d 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,10 @@ "ext-ctype": "*", "ext-pdo": "*", "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.13", "doctrine/cache": "^1.12.1 || ^2.1.1", "doctrine/collections": "^1.5", "doctrine/common": "^3.0.3", - "doctrine/dbal": "^2.13.0", + "doctrine/dbal": "^2.13.1 || ^3.1.1", "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", @@ -32,9 +31,12 @@ "doctrine/lexer": "^1.0", "doctrine/persistence": "^2.2", "psr/cache": "^1 || ^2 || ^3", - "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/polyfill-php72": "^1.23", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { + "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", "phpstan/phpstan": "0.12.99", @@ -44,6 +46,9 @@ "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", "vimeo/psalm": "4.10.0" }, + "conflict": { + "doctrine/annotations": "<1.13 || >= 2.0" + }, "suggest": { "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" -- cgit