fix: make model command with deep folder path - has incorrect import HasFactory class path (#53142)

Author: JeRabix

src/Illuminate/Foundation/Console/ModelMakeCommand.php

@@ -252,7 +252,9 @@ protected function buildFactoryReplacements()
  $replacements = [];
 
  if ($this->option('factory')) {
- $factoryNamespace = '\\Database\\Factories\\'.Str::studly($this->argument('name')).'Factory';
+ $modelPath = str($this->argument('name'))->studly()->replace('/', '\\')->toString();
+
+ $factoryNamespace = '\\Database\\Factories\\'.$modelPath.'Factory';
 
  $factoryCode = <<<EOT
  /** @use HasFactory<$factoryNamespace> */

tests/Integration/Generators/ModelMakeCommandTest.php

@@ -10,6 +10,7 @@ class ModelMakeCommandTest extends TestCase
  'app/Http/Controllers/FooController.php',
  'app/Http/Controllers/BarController.php',
  'database/factories/FooFactory.php',
+ 'database/factories/Foo/BarFactory.php',
  'database/seeders/FooSeeder.php',
  'tests/Feature/Models/FooTest.php',
  ];
@@ -119,6 +120,30 @@ public function testItCanGenerateModelFileWithFactoryOption()
  $this->assertFilenameNotExists('database/seeders/FooSeeder.php');
  }
 
+ public function testItCanGenerateModelFileWithFactoryOptionForDeepFolder()
+ {
+ $this->artisan('make:model', ['name' => 'Foo/Bar', '--factory' => true])
+ ->assertExitCode(0);
+
+ $this->assertFileContains([
+ 'namespace App\Models\Foo;',
+ 'use Illuminate\Database\Eloquent\Factories\HasFactory;',
+ 'use Illuminate\Database\Eloquent\Model;',
+ 'class Bar extends Model',
+ '/** @use HasFactory<\Database\Factories\Foo\BarFactory> */',
+ 'use HasFactory;',
+ ], 'app/Models/Foo/Bar.php');
+
+ $this->assertFileNotContains([
+ '{{ factoryImport }}',
+ '{{ factory }}',
+ ], 'app/Models/Foo/Bar.php');
+
+ $this->assertFilenameNotExists('app/Http/Controllers/Foo/BarController.php');
+ $this->assertFilenameExists('database/factories/Foo/BarFactory.php');
+ $this->assertFilenameNotExists('database/seeders/Foo/BarSeeder.php');
+ }
+
  public function testItCanGenerateModelFileWithMigrationOption()
  {
  $this->artisan('make:model', ['name' => 'Foo', '--migration' => true])