From 5ca4b9049a6c945aef08c7c14d2806768df89d08 Mon Sep 17 00:00:00 2001
From: Ray Anthony Madrona <ray.anthony.madrona@gmail.com>
Date: Wed, 17 Nov 2021 14:04:56 +0800
Subject: [PATCH] Append model namespace in the generated factory class.

---
 src/Generators/FactoryGenerator.php            | 1 +
 stubs/factory.stub                             | 2 +-
 tests/fixtures/factories/nested-components.php | 2 +-
 tests/fixtures/factories/nested-models.php     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Generators/FactoryGenerator.php b/src/Generators/FactoryGenerator.php
index 9e379515..55840960 100644
--- a/src/Generators/FactoryGenerator.php
+++ b/src/Generators/FactoryGenerator.php
@@ -83,6 +83,7 @@ protected function populateStub(string $stub, Model $model)
             $stub = str_replace('definition()', 'definition(): array', $stub);
         }
 
+        $stub = str_replace('{{ namespace }}', 'Database\Factories' . ($model->namespace() ? '\\' . $model->namespace() : ''), $stub);
         $stub = str_replace('use {{ namespacedModel }};', $this->buildImports($model), $stub);
 
         return $stub;
diff --git a/stubs/factory.stub b/stubs/factory.stub
index bc895ed2..e3e1073a 100644
--- a/stubs/factory.stub
+++ b/stubs/factory.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace {{ namespace }};
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
diff --git a/tests/fixtures/factories/nested-components.php b/tests/fixtures/factories/nested-components.php
index bdecdabf..4c832d4b 100644
--- a/tests/fixtures/factories/nested-components.php
+++ b/tests/fixtures/factories/nested-components.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Admin;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
diff --git a/tests/fixtures/factories/nested-models.php b/tests/fixtures/factories/nested-models.php
index 453545cb..50cba527 100644
--- a/tests/fixtures/factories/nested-models.php
+++ b/tests/fixtures/factories/nested-models.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Screening;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;