diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php index 40a7d890c80c..9ee9e3d124e3 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php +++ b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php @@ -731,10 +731,6 @@ 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 index c698217abf9a..3fcb75e67ab5 100755 --- a/src/Illuminate/Database/Eloquent/Relations/Relation.php +++ b/src/Illuminate/Database/Eloquent/Relations/Relation.php @@ -55,13 +55,6 @@ abstract class Relation */ public static $morphMap = []; - /** - * Indicates if the morph relation type should default to table name. - * - * @var bool - */ - public static $tableNameAsMorphType = false; - /** * The count of self joins. * @@ -366,16 +359,6 @@ 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 index 4551d42cfb51..42f3b6563927 100755 --- a/tests/Database/DatabaseEloquentModelTest.php +++ b/tests/Database/DatabaseEloquentModelTest.php @@ -1211,23 +1211,6 @@ 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;