[9.x] Improve doctypes for Eloquent Factory guessing methods (#41245)

* Improve doctypes for Factory::guessModelNamesUsing and ::guessFactoryNameUsing * Apply StyleCI
laravel · Feb 25, 2022 · d1c3d4f · d1c3d4f
1 parent 36de8d6
commit d1c3d4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -708,7 +708,7 @@ public function modelName()
     /**
      * Specify the callback that should be invoked to guess model names based on factory names.
      *
-     * @param  callable(): class-string<\Illuminate\Database\Eloquent\Model|TModel>  $callback
+     * @param  callable(self): class-string<\Illuminate\Database\Eloquent\Model|TModel>  $callback
      * @return void
      */
     public static function guessModelNamesUsing(callable $callback)
@@ -743,7 +743,7 @@ public static function factoryForModel(string $modelName)
     /**
      * Specify the callback that should be invoked to guess factory names based on dynamic relationship names.
      *
-     * @param  callable(): class-string<\Illuminate\Database\Eloquent\Model|TModel>  $callback
+     * @param  callable(class-string<\Illuminate\Database\Eloquent\Model>): class-string<\Illuminate\Database\Eloquent\Factories\Factory>  $callback
      * @return void
      */
     public static function guessFactoryNamesUsing(callable $callback)

diff --git a/types/Database/Eloquent/Factories/Factory.php b/types/Database/Eloquent/Factories/Factory.php
@@ -183,12 +183,22 @@ public function definition()
 // assertType('class-string<User>', $factory->modelName());
 assertType('class-string<Illuminate\Database\Eloquent\Model>', $factory->modelName());
 
-$factory->guessModelNamesUsing(function () {
-    return User::class;
+Factory::guessModelNamesUsing(function (Factory $factory) {
+    return match (true) {
+        $factory instanceof UserFactory => User::class,
+        default => throw new LogicException('Unknown factory'),
+    };
 });
 
 $factory->useNamespace('string');
 
 assertType(Factory::class, $factory::factoryForModel(User::class));
 
 assertType('class-string<Illuminate\Database\Eloquent\Factories\Factory>', $factory->resolveFactoryName(User::class));
+
+Factory::guessFactoryNamesUsing(function (string $modelName) {
+    return match ($modelName) {
+        User::class => UserFactory::class,
+        default => throw new LogicException('Unknown factory'),
+    };
+});