Fixes Factory Using Wrong Model Name

src/Illuminate/Database/Eloquent/Factories/Factory.php

@@ -114,11 +114,11 @@ abstract class Factory
     public static $namespace = 'Database\\Factories\\';
 
     /**
-     * The default model name resolver.
+     * The default model name resolvers.
      *
-     * @var callable(self): class-string<TModel>
+     * @var array<class-string, callable(self): class-string<TModel>>
      */
-    protected static $modelNameResolver;
+    protected static $modelNameResolvers = [];
 
     /**
      * The factory name resolver.
@@ -810,7 +810,7 @@ public function modelName()
             return $this->model;
         }
 
-        $resolver = static::$modelNameResolver ?? function (self $factory) {
+        $resolver = static::$modelNameResolvers[static::class] ?? function (self $factory) {
             $namespacedFactoryBasename = Str::replaceLast(
                 'Factory', '', Str::replaceFirst(static::$namespace, '', get_class($factory))
             );
@@ -835,7 +835,7 @@ public function modelName()
      */
     public static function guessModelNamesUsing(callable $callback)
     {
-        static::$modelNameResolver = $callback;
+        static::$modelNameResolvers[static::class] = $callback;
     }
 
     /**

tests/Database/DatabaseEloquentFactoryTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Database\Capsule\Manager as DB;
+use Illuminate\Database\Eloquent\Attributes\UseFactory;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\CrossJoinSequence;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -829,6 +830,22 @@ public function test_can_disable_relationships()
         $this->assertNull($post->user_id);
     }
 
+    public function test_factory_model_names_correct()
+    {
+        $this->assertEquals(FactoryTestUseFactoryAttribute::factory()->modelName(), FactoryTestUseFactoryAttribute::class);
+        $this->assertEquals(FactoryTestGuessModel::factory()->modelName(), FactoryTestGuessModel::class);
+    }
+
+    public function test_factory_global_model_resolver()
+    {
+        \Illuminate\Database\Eloquent\Factories\Factory::guessModelNamesUsing(function ($model) {
+            return $model . 'Factory';
+        });
+
+        $this->assertEquals(FactoryTestUseFactoryAttribute::factory()->modelName(), FactoryTestUseFactoryAttribute::class);
+        $this->assertEquals(FactoryTestGuessModel::factory()->modelName(), FactoryTestGuessModel::class);
+    }
+
     /**
      * Get a database connection instance.
      *
@@ -982,3 +999,41 @@ public function users()
         return $this->belongsToMany(FactoryTestUser::class, 'role_user', 'role_id', 'user_id')->withPivot('admin');
     }
 }
+
+class FactoryTestGuessModelFactory extends Factory
+{
+    protected static function appNamespace()
+    {
+        return __NAMESPACE__ . '\\';
+    }
+
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->name(),
+        ];
+    }
+}
+
+class FactoryTestGuessModel extends Eloquent
+{
+    use HasFactory;
+
+    protected static $factory = FactoryTestGuessModelFactory::class;
+}
+
+class FactoryTestUseFactoryAttributeFactory extends Factory
+{
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->name(),
+        ];
+    }
+}
+
+#[UseFactory(FactoryTestUseFactoryAttributeFactory::class)]
+class FactoryTestUseFactoryAttribute extends Eloquent
+{
+    use HasFactory;
+}