Revert "Option to use table names when morphing (laravel#38451)" (lar…

…avel#38463)

This reverts commit 5d5655b.

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;
     }
 
     /**

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.
      *

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']);