From f9024361ae282412e6938d9c0ed2aabe46006ce3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 07:18:08 +0100 Subject: update to 2.1.0 switch to phpunit9 --- composer.json | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index b914d79..35b7701 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ {"name": "Marco Pivetta", "email": "ocramius@gmail.com"} ], "require": { - "php": "^7.1", + "php": "^7.1 || ^8.0", "doctrine/annotations": "^1.0", "doctrine/cache": "^1.0", "doctrine/collections": "^1.0", @@ -28,9 +28,10 @@ "doctrine/reflection": "^1.2" }, "require-dev": { - "phpstan/phpstan": "^0.11", - "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.0", + "composer/package-versions-deprecated": "^1.11", + "phpstan/phpstan": "^0.12", + "doctrine/coding-standard": "^6.0 || ^8.0", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "vimeo/psalm": "^3.11" }, "conflict": { @@ -47,10 +48,5 @@ "Doctrine\\Tests\\": "tests/Doctrine/Tests", "Doctrine\\Tests_PHP74\\": "tests/Doctrine/Tests_PHP74" } - }, - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } } } -- cgit