From 68c43dab9f5eaa71cfae289155fb95b0eaa739b7 Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Wed, 20 Dec 2023 13:09:58 +1100
Subject: [PATCH 1/2] Update composer.json

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 9e7705b73db9..327ae0babf83 100644
--- a/composer.json
+++ b/composer.json
@@ -119,6 +119,7 @@
         "psr/simple-cache-implementation": "1.0|2.0|3.0"
     },
     "conflict": {
+        "carbonphp/carbon-doctrine-types": "^3.0",
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {

From fc169a1e7c95d89f97564e59d2cb4ff4f30ba208 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Wed, 20 Dec 2023 08:18:25 -0600
Subject: [PATCH 2/2] Update composer.json

Co-authored-by: Dries Vints <dries@vints.be>
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 327ae0babf83..903b947b077c 100644
--- a/composer.json
+++ b/composer.json
@@ -119,7 +119,8 @@
         "psr/simple-cache-implementation": "1.0|2.0|3.0"
     },
     "conflict": {
-        "carbonphp/carbon-doctrine-types": "^3.0",
+        "carbonphp/carbon-doctrine-types": ">=3.0",
+        "doctrine/dbal": ">=4.0",
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {