[11.x] Add namespace for make:trait and make:interface command (#…

…51083) * Update InterfaceMakeCommand.php * Update TraitMakeCommand.php * Update TraitMakeCommand.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Apr 16, 2024 · 248e117 · 248e117
1 parent a0ffb2b
commit 248e117
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/Illuminate/Foundation/Console/InterfaceMakeCommand.php b/src/Illuminate/Foundation/Console/InterfaceMakeCommand.php
@@ -40,6 +40,21 @@ protected function getStub()
         return __DIR__.'/stubs/interface.stub';
     }
 
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return match (true) {
+            is_dir(app_path('Contracts')) => $rootNamespace.'\\Contracts',
+            is_dir(app_path('Interfaces')) => $rootNamespace.'\\Interfaces',
+            default => $rootNamespace,
+        };
+    }
+
     /**
      * Get the console command arguments.
      *

diff --git a/src/Illuminate/Foundation/Console/TraitMakeCommand.php b/src/Illuminate/Foundation/Console/TraitMakeCommand.php
@@ -53,6 +53,21 @@ protected function resolveStubPath($stub)
             : __DIR__.$stub;
     }
 
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return match (true) {
+            is_dir(app_path('Concerns')) => $rootNamespace.'\\Concerns',
+            is_dir(app_path('Traits')) => $rootNamespace.'\\Traits',
+            default => $rootNamespace,
+        };
+    }
+
     /**
      * Get the console command arguments.
      *