diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php index 993223d1147b..5262d4305273 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php +++ b/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php @@ -731,9 +731,7 @@ public function getMorphClass() return array_search(static::class, $morphMap, true); } - return Relation::$useTableNamesForMorphMap - ? $this->getTable() - : static::class; + return static::class; } /** diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php index c1e9a482cdc3..7fe9f3e9fa82 100755 --- a/src/Illuminate/Database/Eloquent/Relations/Relation.php +++ b/src/Illuminate/Database/Eloquent/Relations/Relation.php @@ -50,13 +50,6 @@ abstract class Relation */ protected static $constraints = true; - /** - * Indicates that table names should be used when determining morph classes. - * - * @var bool - */ - public static $useTableNamesForMorphMap = false; - /** * An array to map class names to their morph names in the database. * @@ -383,16 +376,6 @@ protected function whereInMethod(Model $model, $key) : 'whereIn'; } - /** - * Indicate that the table names should be used when determining morphed class names. - * - * @return void - */ - public static function morphUsingTableNames() - { - static::$useTableNamesForMorphMap = true; - } - /** * Set or get the morph map for polymorphic relations. * diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php index 88fb3b7de0a9..a36bba4fe3eb 100755 --- a/tests/Database/DatabaseEloquentModelTest.php +++ b/tests/Database/DatabaseEloquentModelTest.php @@ -1217,16 +1217,6 @@ public function testMorphOneCreatesProperRelation() $this->assertEquals(EloquentModelStub::class, $relation->getMorphClass()); } - public function testMorphOneCreatesProperRelationWhenUsingTableNames() - { - Relation::morphUsingTableNames(); - $model = new EloquentModelStub; - $this->addMockConnection($model); - $relation = $model->morphOne(EloquentModelSaveStub::class, 'morph'); - $this->assertEquals('stub', $relation->getMorphClass()); - Relation::$useTableNamesForMorphMap = false; - } - public function testCorrectMorphClassIsReturned() { Relation::morphMap(['alias' => 'AnotherModel']);