[11.x] Add HasFactory trait to make:model generation command using --all options

src/Illuminate/Foundation/Console/ModelMakeCommand.php

@@ -251,7 +251,7 @@ protected function buildFactoryReplacements()
     {
         $replacements = [];
 
-        if ($this->option('factory')) {
+        if ($this->option('factory') || $this->option('all')) {
             $modelPath = str($this->argument('name'))->studly()->replace('/', '\\')->toString();
 
             $factoryNamespace = '\\Database\\Factories\\'.$modelPath.'Factory';

tests/Integration/Generators/ModelMakeCommandTest.php

@@ -11,6 +11,7 @@ class ModelMakeCommandTest extends TestCase
         'app/Http/Controllers/BarController.php',
         'database/factories/FooFactory.php',
         'database/factories/Foo/BarFactory.php',
+        'database/migrations/*_create_foos_table.php',
         'database/seeders/FooSeeder.php',
         'tests/Feature/Models/FooTest.php',
     ];
@@ -144,6 +145,32 @@ public function testItCanGenerateModelFileWithFactoryOptionForDeepFolder()
         $this->assertFilenameNotExists('database/seeders/Foo/BarSeeder.php');
     }
 
+    public function testItGeneratesModelWithHasFactoryTraitWhenUsingAllOption()
+    {
+        $this->artisan('make:model', ['name' => 'Foo', '--all' => true])
+            ->expectsQuestion('A App\Models\Foo model does not exist. Do you want to generate it?', false)
+            ->assertExitCode(0);
+
+        $this->assertFileContains([
+            'namespace App\Models;',
+            'use Illuminate\Database\Eloquent\Factories\HasFactory;',
+            'use Illuminate\Database\Eloquent\Model;',
+            'class Foo extends Model',
+            '/** @use HasFactory<\Database\Factories\FooFactory> */',
+            'use HasFactory;',
+        ], 'app/Models/Foo.php');
+
+        $this->assertFileNotContains([
+            '{{ factoryImport }}',
+            '{{ factory }}',
+        ], 'app/Models/Foo.php');
+
+        $this->assertFilenameExists('app/Http/Controllers/FooController.php');
+        $this->assertFilenameExists('database/factories/FooFactory.php');
+        $this->assertFilenameExists('database/seeders/FooSeeder.php');
+        $this->assertMigrationFileExists('create_foos_table.php');
+    }
+
     public function testItCanGenerateModelFileWithMigrationOption()
     {
         $this->artisan('make:model', ['name' => 'Foo', '--migration' => true])