[10.x] Set morph type for MorphToMany pivot model

src/Illuminate/Database/Eloquent/Relations/MorphToMany.php

@@ -151,6 +151,8 @@ public function newPivot(array $attributes = [], $exists = false)
     {
         $using = $this->using;
 
+        $attributes = array_merge([$this->morphType => $this->morphClass], $attributes);
+
         $pivot = $using ? $using::fromRawAttributes($this->parent, $attributes, $this->table, $exists)
                         : MorphPivot::fromAttributes($this->parent, $attributes, $this->table, $exists);
 

tests/Integration/Database/EloquentPivotEventsTest.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Tests\Integration\Database;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphPivot;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -31,6 +32,18 @@ protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
             $table->timestamps();
         });
 
+        Schema::create('equipments', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->timestamps();
+        });
+
+        Schema::create('equipmentables', function (Blueprint $table) {
+            $table->increments('id');
+            $table->morphs('equipmentable');
+            $table->foreignId('equipment_id');
+        });
+
         Schema::create('project_users', function (Blueprint $table) {
             $table->integer('user_id');
             $table->integer('project_id');
@@ -120,13 +133,47 @@ public function testCustomPivotUpdateEventHasDirtyCorrect()
 
         $this->assertSame(['role' => 'Lead Developer'], $_SERVER['pivot_dirty_attributes']);
     }
+
+    public function testCustomMorphPivotClassDetachAttributes()
+    {
+        $project = PivotEventsTestProject::forceCreate([
+            'name' => 'Test Project',
+        ]);
+
+        PivotEventsTestModelEquipment::deleting(function ($model) use ($project) {
+            $this->assertInstanceOf(PivotEventsTestProject::class, $model->equipmentable);
+            $this->assertEquals($project->id, $model->equipmentable->id);
+        });
+
+        $equipment = PivotEventsTestEquipment::forceCreate([
+            'name' => 'important-equipment',
+        ]);
+
+        $project->equipments()->save($equipment);
+        $equipment->projects()->sync([]);
+    }
 }
 
 class PivotEventsTestUser extends Model
 {
     public $table = 'users';
 }
 
+class PivotEventsTestEquipment extends Model
+{
+    public $table = 'equipments';
+
+    public function getForeignKey()
+    {
+        return 'equipment_id';
+    }
+
+    public function projects()
+    {
+        return $this->morphedByMany(PivotEventsTestProject::class, 'equipmentable')->using(PivotEventsTestModelEquipment::class);
+    }
+}
+
 class PivotEventsTestProject extends Model
 {
     public $table = 'projects';
@@ -144,6 +191,26 @@ public function contributors()
             ->using(PivotEventsTestCollaborator::class)
             ->wherePivot('role', 'contributor');
     }
+
+    public function equipments()
+    {
+        return $this->morphToMany(PivotEventsTestEquipment::class, 'equipmentable')->using(PivotEventsTestModelEquipment::class);
+    }
+}
+
+class PivotEventsTestModelEquipment extends MorphPivot
+{
+    public $table = 'equipmentables';
+
+    public function equipment()
+    {
+        return $this->belongsTo(PivotEventsTestEquipment::class);
+    }
+
+    public function equipmentable()
+    {
+        return $this->morphTo();
+    }
 }
 
 class PivotEventsTestCollaborator extends Pivot