feat: add ModelMakeCommand with builder option and update service provider

Author: MrPunyapal

composer.json

@@ -36,8 +36,7 @@
     },
     "autoload": {
         "psr-4": {
-            "MrPunyapal\\LaravelExtendedCommands\\": "src/",
-            "MrPunyapal\\LaravelExtendedCommands\\Database\\Factories\\": "database/factories/"
+            "MrPunyapal\\LaravelExtendedCommands\\": "src/"
         }
     },
     "autoload-dev": {

src/Commands/ModelMakeCommand.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace MrPunyapal\LaravelExtendedCommands\Commands;
+
+use Illuminate\Foundation\Console\ModelMakeCommand as BaseCommand;
+use Illuminate\Support\Str;
+use Symfony\Component\Console\Input\InputOption;
+
+class ModelMakeCommand extends BaseCommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if ($this->option('builder')) {
+            $this->createBuilder();
+        }
+    }
+
+    /**
+     * Create a builder file for the model.
+     *
+     * @return void
+     */
+    protected function createBuilder()
+    {
+        $builder = Str::studly($this->argument('name'));
+
+        $this->call('make:builder', [
+            'name' => "{$builder}Builder",
+            '--model' => '\\'.$this->qualifyClass($this->getNameInput()),
+        ]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getOptions()
+    {
+        return array_merge(parent::getOptions(), [
+            ['builder', 'b', InputOption::VALUE_NONE, 'Create a new builder for the model'],
+        ]);
+    }
+}

src/LaravelExtendedCommandsServiceProvider.php

@@ -3,6 +3,7 @@
 namespace MrPunyapal\LaravelExtendedCommands;
 
 use MrPunyapal\LaravelExtendedCommands\Commands\BuilderMakeCommand;
+use MrPunyapal\LaravelExtendedCommands\Commands\ModelMakeCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -18,6 +19,13 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-extended-commands')
             ->hasConfigFile()
-            ->hasCommand(BuilderMakeCommand::class);
+            ->hasCommands([
+                BuilderMakeCommand::class,
+                ModelMakeCommand::class,
+            ]);
+
+        $this->app->extend('command.model.make', function ($app) {
+            return new ModelMakeCommand($app['files']);
+        });
     }
 }

tests/Unit/Commands/ModelMakeCommandTest.php

@@ -0,0 +1,42 @@
+<?php
+
+use Orchestra\Testbench\Concerns\InteractsWithPublishedFiles;
+
+uses(InteractsWithPublishedFiles::class);
+
+beforeEach(function () {
+    $this->files = [
+        'app/Models/Foo.php',
+        'app/Models/Builders/FooBuilder.php',
+    ];
+});
+
+it('can generate model file', function () {
+    $this->artisan('make:model', ['name' => 'Foo'])
+        ->assertExitCode(0);
+
+    $this->assertFileContains([
+        'namespace App\Models;',
+        'class Foo extends Model',
+    ], 'app/Models/Foo.php');
+
+    $this->assertFilenameNotExists('app/Models/Builders/FooBuilder.php');
+});
+
+it('can generate model with builder', function (): void {
+    $this->artisan('make:model', ['name' => 'Foo', '--builder' => true])
+        ->assertExitCode(0);
+
+    $this->assertFileContains([
+        'namespace App\Models;',
+        'class Foo extends Model',
+    ], 'app/Models/Foo.php');
+
+    $this->assertFileContains([
+        'namespace App\Models\Builders;',
+        'use Illuminate\Database\Eloquent\Builder;',
+        'class FooBuilder extends Builder',
+        '@template TModel of \\App\\Models\\Foo',
+        '@extends Builder<\\App\\Models\\Foo>',
+    ], 'app/Models/Builders/FooBuilder.php');
+});