fix: improve performance and robustness of Relation::getMorphAlias() (#…

…51845)
laravel · Jun 19, 2024 · 02a0b5f · 02a0b5f
1 parent 9b9e862
commit 02a0b5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -505,11 +505,11 @@ public static function getMorphedModel($alias)
      * Get the alias associated with a custom polymorphic class.
      *
      * @param  string  $className
-     * @return int|string|null
+     * @return int|string
      */
     public static function getMorphAlias(string $className)
     {
-        return array_flip(static::$morphMap)[$className] ?? null;
+        return array_search($className, static::$morphMap, strict: true) ?: $className;
     }
 
     /**

diff --git a/tests/Database/DatabaseEloquentRelationTest.php b/tests/Database/DatabaseEloquentRelationTest.php
@@ -239,8 +239,8 @@ public function testGetMorphAlias()
     {
         Relation::morphMap(['user' => 'App\User']);
 
-        $this->assertEquals('user', Relation::getMorphAlias('App\User'));
-        $this->assertNull(Relation::getMorphAlias('Does\Not\Exist'));
+        $this->assertSame('user', Relation::getMorphAlias('App\User'));
+        $this->assertSame('Does\Not\Exist', Relation::getMorphAlias('Does\Not\Exist'));
     }
 
     public function testWithoutRelations()