Replaces requests namespace correctly (#28)

* Adds test to `--requests` option * Adds test to `--requests` option with custom preset * Replaces requests namespace correctly
orchestral · Oct 26, 2023 · 5038b63 · 5038b63
1 parent 8f28029
commit 5038b63
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 0 deletions.
diff --git a/src/Console/ControllerMakeCommand.php b/src/Console/ControllerMakeCommand.php
@@ -96,6 +96,12 @@ protected function buildModelReplacements(array $replace)
 
         $replace = $this->buildFormRequestReplacements($replace, $modelClass);
 
+        if ($this->option('requests')) {
+            $namespace = $this->rootNamespace();
+            $replace['{{ namespacedRequests }}'] = str_replace('App\\', $namespace, $replace['{{ namespacedRequests }}']);
+            $replace['{{namespacedRequests}}'] = str_replace('App\\', $namespace, $replace['{{namespacedRequests}}']);
+        }
+
         return array_merge($replace, [
             'DummyFullModelClass' => $modelClass,
             '{{ namespacedModel }}' => $modelClass,

diff --git a/tests/Feature/Console/ControllerMakeCommandTest.php b/tests/Feature/Console/ControllerMakeCommandTest.php
@@ -10,6 +10,8 @@ class ControllerMakeCommandTest extends TestCase
 {
     protected $files = [
         'app/Http/Controllers/FooController.php',
+        'app/Http/Requests/StoreFooRequest.php',
+        'app/Http/Requests/UpdateFooRequest.php',
         'tests/Feature/Http/Controllers/FooControllerTest.php',
     ];
 
@@ -227,4 +229,60 @@ public function it_can_generate_controller_file_with_tests()
         $this->assertFilenameExists('app/Http/Controllers/FooController.php');
         $this->assertFilenameExists('tests/Feature/Http/Controllers/FooControllerTest.php');
     }
+
+    /** @test */
+    public function it_can_generate_controller_with_model_and_requests()
+    {
+        $this->artisan('make:controller', ['name' => 'FooController', '--model' => 'Foo', '--requests' => true, '--preset' => 'canvas'])
+            ->expectsQuestion('A App\Models\Foo model does not exist. Do you want to generate it?', false)
+            ->assertSuccessful();
+
+        $this->assertFileContains([
+            'namespace App\Http\Controllers;',
+            'use App\Models\Foo;',
+            'use App\Http\Requests\StoreFooRequest;',
+            'use App\Http\Requests\UpdateFooRequest;',
+            'public function index()',
+            'public function create()',
+            'public function store(StoreFooRequest $request)',
+            'public function show(Foo $foo)',
+            'public function edit(Foo $foo)',
+            'public function update(UpdateFooRequest $request, Foo $foo)',
+            'public function destroy(Foo $foo)',
+        ], 'app/Http/Controllers/FooController.php');
+
+        $this->assertFilenameExists('app/Http/Controllers/FooController.php');
+        $this->assertFilenameExists('app/Http/Requests/StoreFooRequest.php');
+        $this->assertFilenameExists('app/Http/Requests/UpdateFooRequest.php');
+    }
+
+    /** @test */
+    public function it_can_generate_controller_with_model_and_requests_with_custom_preset()
+    {
+        $this->instance('orchestra.canvas', new Laravel(
+            ['namespace' => 'Acme', 'model' => ['namespace' => 'Acme\Models']], $this->app->basePath()
+        ));
+
+        $this->artisan('make:controller', ['name' => 'FooController', '--model' => 'Foo', '--requests' => true, '--preset' => 'canvas'])
+            ->expectsQuestion('A Acme\Models\Foo model does not exist. Do you want to generate it?', false)
+            ->assertSuccessful();
+
+        $this->assertFileContains([
+            'namespace Acme\Http\Controllers;',
+            'use Acme\Models\Foo;',
+            'use Acme\Http\Requests\StoreFooRequest;',
+            'use Acme\Http\Requests\UpdateFooRequest;',
+            'public function index()',
+            'public function create()',
+            'public function store(StoreFooRequest $request)',
+            'public function show(Foo $foo)',
+            'public function edit(Foo $foo)',
+            'public function update(UpdateFooRequest $request, Foo $foo)',
+            'public function destroy(Foo $foo)',
+        ], 'app/Http/Controllers/FooController.php');
+
+        $this->assertFilenameExists('app/Http/Controllers/FooController.php');
+        $this->assertFilenameExists('app/Http/Requests/StoreFooRequest.php');
+        $this->assertFilenameExists('app/Http/Requests/UpdateFooRequest.php');
+    }
 }