Revert table name as morph type (#35533)

laravel · Dec 8, 2020 · 2446a91 · 2446a91
1 parent 83a2fd8
commit 2446a91
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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;