remove doctrine related conflicts

reverts laravel#49438 and laravel#49456
hafezdivandari · Dec 22, 2023 · 29cfb81 · 29cfb81
1 parent 3a8acd2
commit 29cfb81
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -120,8 +120,6 @@
         "psr/simple-cache-implementation": "1.0|2.0|3.0"
     },
     "conflict": {
-        "carbonphp/carbon-doctrine-types": "<3.0.0|>=4.0",
-        "doctrine/dbal": "<4.0.0|>=5.0",
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {

diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json
@@ -34,10 +34,6 @@
             "dev-master": "11.x-dev"
         }
     },
-    "conflict": {
-        "carbonphp/carbon-doctrine-types": "<3.0.0|>=4.0",
-        "doctrine/dbal": "<4.0.0|>=5.0"
-    },
     "suggest": {
         "ext-filter": "Required to use the Postgres database driver.",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.21).",