Merge 5.4 into 5.x

src/Query/Builder.php

@@ -745,7 +745,10 @@ public function insert(array $values)
             $values = [$values];
         }
 
-        $values = $this->aliasIdForQuery($values);
+        $values = array_map(
+            $this->aliasIdForQuery(...),
+            $values,
+        );
 
         $options = $this->inheritConnectionOptions();
 

tests/ModelTest.php

@@ -25,6 +25,7 @@
 use MongoDB\Laravel\Tests\Models\IdIsString;
 use MongoDB\Laravel\Tests\Models\Item;
 use MongoDB\Laravel\Tests\Models\MemberStatus;
+use MongoDB\Laravel\Tests\Models\NonIncrementing;
 use MongoDB\Laravel\Tests\Models\Soft;
 use MongoDB\Laravel\Tests\Models\SqlUser;
 use MongoDB\Laravel\Tests\Models\User;
@@ -56,6 +57,7 @@ public function tearDown(): void
         Book::truncate();
         Item::truncate();
         Guarded::truncate();
+        NonIncrementing::truncate();
 
         parent::tearDown();
     }
@@ -106,6 +108,26 @@ public function testInsert(): void
         $this->assertEquals(35, $user->age);
     }
 
+    public function testInsertNonIncrementable(): void
+    {
+        $connection = DB::connection('mongodb');
+        $connection->setRenameEmbeddedIdField(false);
+
+        $nonIncrementing        = new NonIncrementing();
+        $nonIncrementing->id    = '12345';
+        $nonIncrementing->name  = 'John Doe';
+
+        $nonIncrementing->save();
+
+        $this->assertTrue($nonIncrementing->exists);
+        $this->assertEquals(1, NonIncrementing::count());
+
+        $check = NonIncrementing::find($nonIncrementing->id);
+        $this->assertInstanceOf(NonIncrementing::class, $check);
+        $this->assertSame('12345', $check->id);
+        $this->assertEquals('John Doe', $check->name);
+    }
+
     public function testUpdate(): void
     {
         $user        = new User();

tests/Models/NonIncrementing.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MongoDB\Laravel\Tests\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use MongoDB\Laravel\Eloquent\DocumentModel;
+
+/**
+ * @property string $id
+ * @property string $name
+ */
+class NonIncrementing extends Model
+{
+    use DocumentModel;
+
+    protected $keyType = 'string';
+    protected $connection = 'mongodb';
+
+    protected $fillable = [
+        'name',
+    ];
+    protected static $unguarded = true;
+    public $incrementing = false;
+}

tests/QueryBuilderTest.php

@@ -126,6 +126,22 @@ public function testInsert()
         $this->assertIsArray($user->tags);
     }
 
+    #[TestWith([true])]
+    #[TestWith([false])]
+    public function testInsertWithCustomId(bool $renameEmbeddedIdField)
+    {
+        $connection = DB::connection('mongodb');
+        $connection->setRenameEmbeddedIdField($renameEmbeddedIdField);
+
+        $data = ['id' => 'abcdef', 'name' => 'John Doe'];
+
+        DB::table('users')->insert($data);
+
+        $user = User::find('abcdef');
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertSame('abcdef', $user->id);
+    }
+
     public function testInsertGetId()
     {
         $id = DB::table('users')->insertGetId(['name' => 'John Doe']);