From 76753088391921e41f43da8cc9dd8211725290a7 Mon Sep 17 00:00:00 2001
From: "J. Eric Ellis" <jellisii@gmail.com>
Date: Fri, 23 May 2025 13:05:42 -0400
Subject: [PATCH 1/2] Fix argument types for
 Illuminate/Database/Query/Builder::upsert()

Ensures IDE hinting isn't out of order.
---
 src/Illuminate/Database/Query/Builder.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index d2b97d5d121..60de96c7ec8 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -6,6 +6,7 @@
 use Carbon\CarbonPeriod;
 use Closure;
 use DateTimeInterface;
+use function Illuminate\Support\enum_value;
 use Illuminate\Contracts\Database\Query\Builder as BuilderContract;
 use Illuminate\Contracts\Database\Query\ConditionExpression;
 use Illuminate\Contracts\Database\Query\Expression as ExpressionContract;
@@ -28,9 +29,8 @@
 use InvalidArgumentException;
 use LogicException;
 use RuntimeException;
-use UnitEnum;
 
-use function Illuminate\Support\enum_value;
+use UnitEnum;
 
 class Builder implements BuilderContract
 {
@@ -3898,11 +3898,9 @@ public function updateOrInsert(array $attributes, array|callable $values = [])
     /**
      * Insert new records or update the existing ones.
      *
-     * @param  array|string  $uniqueBy
-     * @param  array|null  $update
      * @return int
      */
-    public function upsert(array $values, $uniqueBy, $update = null)
+    public function upsert(array $values, array|string $uniqueBy, ?array $update = null)
     {
         if (empty($values)) {
             return 0;

From 5365e5b43384ec2908c8f47ef860705ddcb4eedb Mon Sep 17 00:00:00 2001
From: "J. Eric Ellis" <jellisii@gmail.com>
Date: Fri, 23 May 2025 14:09:16 -0400
Subject: [PATCH 2/2] Restore previous sorting of imports

---
 src/Illuminate/Database/Query/Builder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index 60de96c7ec8..29e4cf764f2 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -6,7 +6,6 @@
 use Carbon\CarbonPeriod;
 use Closure;
 use DateTimeInterface;
-use function Illuminate\Support\enum_value;
 use Illuminate\Contracts\Database\Query\Builder as BuilderContract;
 use Illuminate\Contracts\Database\Query\ConditionExpression;
 use Illuminate\Contracts\Database\Query\Expression as ExpressionContract;
@@ -29,9 +28,10 @@
 use InvalidArgumentException;
 use LogicException;
 use RuntimeException;
-
 use UnitEnum;
 
+use function Illuminate\Support\enum_value;
+
 class Builder implements BuilderContract
 {
     /** @use \Illuminate\Database\Concerns\BuildsQueries<object> */