Merge pull request #1973 from semsphy/1972-modules-generate-double-separators

Fixes #1972 generate double namspace separators

Author: dcblogdev

src/Generators/ModuleGenerator.php

@@ -486,7 +486,14 @@ protected function getReplacement($stub): array
         }
         foreach ($keys as $key) {
             if (method_exists($this, $method = 'get'.ucfirst(Str::studly(strtolower($key))).'Replacement')) {
-                $replaces[$key] = $this->$method();
+                $replace = $this->$method();
+
+                if($stub === 'routes/web' || $stub === 'routes/api' ){
+                    $replace = str_replace('\\\\', '\\', $replace);
+                }
+
+                $replaces[$key] = $replace;
+
             } else {
                 $replaces[$key] = null;
             }

tests/Commands/Make/ModuleMakeCommandTest.php

@@ -95,6 +95,18 @@ public function test_it_generates_web_route_file()
         $this->assertSame(0, $code);
     }
 
+    public function test_it_generates_web_route_file_with_multi_segment_default_namespace()
+    {
+        $this->app['config']->set('modules.namespace', 'Custom\Modules');
+        $files = $this->app['modules']->config('stubs.files');
+        $code = $this->artisan('module:make', ['name' => ['Blog']]);
+
+        $path = $this->modulePath.'/'.$files['routes/web'];
+
+        $this->assertMatchesSnapshot($this->finder->get($path));
+        $this->assertSame(0, $code);
+    }
+
     public function test_it_generates_api_route_file()
     {
         $files = $this->app['modules']->config('stubs.files');
@@ -106,6 +118,20 @@ public function test_it_generates_api_route_file()
         $this->assertSame(0, $code);
     }
 
+    public function test_it_generates_api_route_file_with_multi_segment_default_namespace()
+    {
+        $this->app['config']->set('modules.namespace', 'Custom\Modules');
+        $files = $this->app['modules']->config('stubs.files');
+
+        $code = $this->artisan('module:make', ['name' => ['Blog']]);
+
+        $path = $this->modulePath.'/'.$files['routes/api'];
+
+        $this->assertMatchesSnapshot($this->finder->get($path));
+        $this->assertSame(0, $code);
+    }
+
+
     public function test_it_generates_vite_file()
     {
         $code = $this->artisan('module:make', ['name' => ['Blog']]);

tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_api_route_file_with_multi_segment_default_namespace__1.txt

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Custom\Modules\Blog\Http\Controllers\BlogController;
+
+/*
+ *--------------------------------------------------------------------------
+ * API Routes
+ *--------------------------------------------------------------------------
+ *
+ * Here is where you can register API routes for your application. These
+ * routes are loaded by the RouteServiceProvider within a group which
+ * is assigned the "api" middleware group. Enjoy building your API!
+ *
+*/
+
+Route::middleware(['auth:sanctum'])->prefix('v1')->group(function () {
+    Route::apiResource('blog', BlogController::class)->names('blog');
+});

tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_web_route_file_with_multi_segment_default_namespace__1.txt

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Custom\Modules\Blog\Http\Controllers\BlogController;
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
+|
+*/
+
+Route::group([], function () {
+    Route::resource('blog', BlogController::class)->names('blog');
+});