diff --git a/composer.json b/composer.json index 5e6c66b..ad920b5 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ "phpstan/phpstan": "^1.0.0" }, "conflict": { - "phpspec/prophecy": "<1.7.0,>=2.0.0", - "phpunit/phpunit": "<6.0.0,>=10.0.0" + "phpspec/prophecy": "<1.7.0 || >=2.0.0", + "phpunit/phpunit": "<6.0.0 || >=10.0.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.1.1", diff --git a/composer.lock b/composer.lock index 437be97..75b5781 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9acf80128cdf0db1b699ab00cb87b800", + "content-hash": "1dcbe78f56a7d77fa5e2827e6cb4f612", "packages": [ { "name": "phpstan/phpstan", @@ -3926,5 +3926,5 @@ "php": "^7.1 || ^8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }