Early return in Factory::modelName() (#53912)

to avoid possibliy defining a function that will not be used
laravel · Dec 16, 2024 · 603b0cf · 603b0cf
1 parent a306193
commit 603b0cf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -813,6 +813,10 @@ public function newModel(array $attributes = [])
      */
     public function modelName()
     {
+        if ($this->model !== null) {
+            return $this->model;
+        }
+
         $resolver = static::$modelNameResolver ?? function (self $factory) {
             $namespacedFactoryBasename = Str::replaceLast(
                 'Factory', '', Str::replaceFirst(static::$namespace, '', get_class($factory))
@@ -827,7 +831,7 @@ public function modelName()
                         : $appNamespace.$factoryBasename;
         };
 
-        return $this->model ?? $resolver($this);
+        return $resolver($this);
     }
 
     /**