Merge branch 'table_name_morph_type' into 8.x

laravel · Nov 18, 2020 · 910d5ed · 910d5ed
2 parents 169fd2b + 518e9ae
commit 910d5ed
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
@@ -731,6 +731,10 @@ public function getMorphClass()
             return array_search(static::class, $morphMap, true);
         }
 
+        if (Relation::$tableNameAsMorphType) {
+            return $this->getTable();
+        }
+
         return static::class;
     }
 

diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -55,6 +55,13 @@ abstract class Relation
      */
     public static $morphMap = [];
 
+    /**
+     * Indicates if the morph relation type should default to table name.
+     *
+     * @var bool
+     */
+    public static $tableNameAsMorphType = false;
+
     /**
      * Create a new relation instance.
      *
@@ -341,6 +348,16 @@ public static function morphMap(array $map = null, $merge = true)
         return static::$morphMap;
     }
 
+    /**
+     * Specifies that the morph types should be table names.
+     *
+     * @return void
+     */
+    public static function tableNameAsMorphType()
+    {
+        self::$tableNameAsMorphType = true;
+    }
+
     /**
      * Builds a table-keyed array from model class names.
      *

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -1200,6 +1200,23 @@ public function testCorrectMorphClassIsReturned()
         }
     }
 
+    public function testCorrectMorphClassIsReturnedOnChangingDefault()
+    {
+        Relation::tableNameAsMorphType();
+        Relation::morphMap(['alias' => EloquentModelCamelStub::class]);
+        Relation::morphMap(['alias2' => 'AnotherModel']);
+        $model = new EloquentModelStub;
+        $model2 = new EloquentModelCamelStub;
+
+        try {
+            $this->assertEquals('stub', $model->getMorphClass());
+            $this->assertEquals('alias', $model2->getMorphClass());
+        } finally {
+            Relation::morphMap([], false);
+            Relation::$tableNameAsMorphType = false;
+        }
+    }
+
     public function testHasManyCreatesProperRelation()
     {
         $model = new EloquentModelStub;