From 0d422a0619193531ea49d20340d6b2ca7ef799be Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.be>
Date: Mon, 29 Jan 2024 17:00:12 +0100
Subject: [PATCH 1/3] Carbon v3

---
 .github/workflows/tests.yml | 10 +++++-----
 composer.json               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7ab7f290..f8cf4603 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,8 +31,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3]
-        laravel: [10]
+        php: [8.2, 8.3]
+        laravel: [11]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MySQL 5.7
@@ -85,7 +85,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MariaDB 10.5
@@ -139,7 +139,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - PostgreSQL 14
@@ -185,7 +185,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - SQLite
diff --git a/composer.json b/composer.json
index ced0b921..2352e4fc 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "illuminate/support": "^10.34|^11.0",
         "illuminate/view": "^10.34|^11.0",
         "livewire/livewire": "^3.2",
-        "nesbot/carbon": "^2.67"
+        "nesbot/carbon": "^3.0"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.7",

From 86eca5fa3fdb75461b50db8ab2b29a76420065ac Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.be>
Date: Mon, 29 Jan 2024 17:07:07 +0100
Subject: [PATCH 2/3] wip

---
 .github/workflows/tests.yml | 10 +++++-----
 composer.json               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f8cf4603..7ab7f290 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,8 +31,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [8.1, 8.2, 8.3]
+        laravel: [10]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MySQL 5.7
@@ -85,7 +85,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [11]
+        laravel: [10]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MariaDB 10.5
@@ -139,7 +139,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [11]
+        laravel: [10]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - PostgreSQL 14
@@ -185,7 +185,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3]
-        laravel: [11]
+        laravel: [10]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - SQLite
diff --git a/composer.json b/composer.json
index 2352e4fc..a975a857 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "illuminate/support": "^10.34|^11.0",
         "illuminate/view": "^10.34|^11.0",
         "livewire/livewire": "^3.2",
-        "nesbot/carbon": "^3.0"
+        "nesbot/carbon": "^2.67|^3.0"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.7",

From fe02a497315fd6b02a5b2f9950d2fafdfe2e78c8 Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Tue, 30 Jan 2024 08:41:11 +1100
Subject: [PATCH 3/3] Fix type

---
 src/Recorders/SlowRequests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Recorders/SlowRequests.php b/src/Recorders/SlowRequests.php
index 359b874b..44cbbad6 100644
--- a/src/Recorders/SlowRequests.php
+++ b/src/Recorders/SlowRequests.php
@@ -52,7 +52,7 @@ public function record(Carbon $startedAt, Request $request, Response $response):
     {
         if (
             ! $request->route() instanceof Route ||
-            $this->underThreshold($duration = $startedAt->diffInMilliseconds()) ||
+            $this->underThreshold($duration = ((int) $startedAt->diffInMilliseconds())) ||
             ! $this->shouldSample()
         ) {
             return;