From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Wed, 29 Jan 2025 08:18:19 +0100 Subject: Drop conflicts currently incompatible in Debian Forwarded: not-needed --- composer.json | 4 +--- src/Illuminate/Database/composer.json | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index b082c03..1f03491 100644 --- a/composer.json +++ b/composer.json @@ -117,10 +117,8 @@ }, "conflict": { "carbonphp/carbon-doctrine-types": ">=3.0", - "doctrine/dbal": ">=4.0", "mockery/mockery": "1.6.8", - "tightenco/collect": "<5.5.33", - "phpunit/phpunit": ">=11.0.0" + "tightenco/collect": "<5.5.33" }, "autoload": { "files": [ diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index d807f33..724ec69 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -35,8 +35,7 @@ } }, "conflict": { - "carbonphp/carbon-doctrine-types": ">=3.0", - "doctrine/dbal": ">=4.0" + "carbonphp/carbon-doctrine-types": ">=3.0" }, "suggest": { "ext-filter": "Required to use the Postgres database driver.",