Merge remote-tracking branch 'upstream/4.0' into 4.1

Author: GromNaN

.github/workflows/build-ci.yml

@@ -22,6 +22,7 @@ jobs:
                 php:
                     - '8.1'
                     - '8.2'
+                    - '8.3'
 
         steps:
             -   uses: actions/checkout@v4

src/Query/Builder.php

@@ -613,6 +613,11 @@ public function whereBetween($column, iterable $values, $boolean = 'and', $not =
     /** @inheritdoc */
     public function insert(array $values)
     {
+        // Allow empty insert batch for consistency with Eloquent SQL
+        if ($values === []) {
+            return true;
+        }
+
         // Since every insert gets treated like a batch insert, we will have to detect
         // if the user is inserting a single document or an array of documents.
         $batch = true;

tests/ModelTest.php

@@ -114,6 +114,14 @@ public function testUpdate(): void
 
         $check = User::find($user->_id);
         $this->assertEquals(20, $check->age);
+
+        $check->age      = 24;
+        $check->fullname = 'Hans Thomas'; // new field
+        $check->save();
+
+        $check = User::find($user->_id);
+        $this->assertEquals(24, $check->age);
+        $this->assertEquals('Hans Thomas', $check->fullname);
     }
 
     public function testManualStringId(): void
@@ -217,6 +225,12 @@ public function testFind(): void
         $this->assertEquals(35, $check->age);
     }
 
+    public function testInsertEmpty(): void
+    {
+        $success = User::insert([]);
+        $this->assertTrue($success);
+    }
+
     public function testGet(): void
     {
         User::insert([

tests/Models/Soft.php

@@ -25,4 +25,9 @@ public function prunable(): Builder
     {
         return $this->newQuery();
     }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
 }

tests/Models/User.php

@@ -51,6 +51,16 @@ public function books()
         return $this->hasMany(Book::class, 'author_id');
     }
 
+    public function softs()
+    {
+        return $this->hasMany(Soft::class);
+    }
+
+    public function softsWithTrashed()
+    {
+        return $this->hasMany(Soft::class)->withTrashed();
+    }
+
     public function sqlBooks()
     {
         return $this->hasMany(SqlBook::class, 'author_id');

tests/RelationsTest.php

@@ -13,6 +13,7 @@
 use MongoDB\Laravel\Tests\Models\Item;
 use MongoDB\Laravel\Tests\Models\Photo;
 use MongoDB\Laravel\Tests\Models\Role;
+use MongoDB\Laravel\Tests\Models\Soft;
 use MongoDB\Laravel\Tests\Models\User;
 
 class RelationsTest extends TestCase
@@ -50,6 +51,24 @@ public function testHasMany(): void
         $this->assertCount(3, $items);
     }
 
+    public function testHasManyWithTrashed(): void
+    {
+        $user   = User::create(['name' => 'George R. R. Martin']);
+        $first  = Soft::create(['title' => 'A Game of Thrones', 'user_id' => $user->_id]);
+        $second = Soft::create(['title' => 'The Witcher', 'user_id' => $user->_id]);
+
+        self::assertNull($first->deleted_at);
+        self::assertEquals($user->_id, $first->user->_id);
+        self::assertEquals([$first->_id, $second->_id], $user->softs->pluck('_id')->toArray());
+
+        $first->delete();
+        $user->refresh();
+
+        self::assertNotNull($first->deleted_at);
+        self::assertEquals([$second->_id], $user->softs->pluck('_id')->toArray());
+        self::assertEquals([$first->_id, $second->_id], $user->softsWithTrashed->pluck('_id')->toArray());
+    }
+
     public function testBelongsTo(): void
     {
         $user = User::create(['name' => 'George R. R. Martin']);