Tweak factory generator

laravel · Oct 23, 2020 · 54d5ddc · 54d5ddc
1 parent dc08cba
commit 54d5ddc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Console/Factories/FactoryMakeCommand.php b/src/Illuminate/Database/Console/Factories/FactoryMakeCommand.php
@@ -66,6 +66,9 @@ protected function buildClass($name)
 
         $model = class_basename($namespaceModel);
 
+        $namespaceFactory = Str::ucfirst(str_replace('Factory', '', $name));
+        $factory = class_basename($namespaceFactory);
+
         if (Str::startsWith($namespaceModel, 'App\\Models')) {
             $namespace = Str::beforeLast('Database\\Factories\\'.Str::after($namespaceModel, 'App\\Models\\'), '\\');
         } else {
@@ -80,6 +83,8 @@ protected function buildClass($name)
             'DummyModel' => $model,
             '{{ model }}' => $model,
             '{{model}}' => $model,
+            '{{ factory }}' => $factory,
+            '{{factory}}' => $factory,
         ];
 
         return str_replace(

diff --git a/src/Illuminate/Database/Console/Factories/stubs/factory.stub b/src/Illuminate/Database/Console/Factories/stubs/factory.stub
@@ -5,7 +5,7 @@ namespace {{ factoryNamespace }};
 use Illuminate\Database\Eloquent\Factories\Factory;
 use {{ namespacedModel }};
 
-class {{ model }}Factory extends Factory
+class {{ factory }}Factory extends Factory
 {
     /**
      * The name of the factory's corresponding model.