Improve make trait and interface commands code

Author: vishal-gadhiya

src/Illuminate/Foundation/Console/InterfaceMakeCommand.php

@@ -35,7 +35,7 @@ class InterfaceMakeCommand extends GeneratorCommand
      *
      * @return string
      */
-    protected function getStub()
+    protected function getStub(): string
     {
         return __DIR__.'/stubs/interface.stub';
     }
@@ -46,17 +46,17 @@ protected function getStub()
      * @param  string  $rootNamespace
      * @return string
      */
-    protected function getDefaultNamespace($rootNamespace)
+    protected function getDefaultNamespace($rootNamespace): string
     {
-        return $rootNamespace;
+        return $rootNamespace.'\\Interfaces';
     }
 
     /**
      * Get the console command arguments.
      *
      * @return array
      */
-    protected function getOptions()
+    protected function getOptions(): array
     {
         return [
             ['force', 'f', InputOption::VALUE_NONE, 'Create the interface even if the interface already exists'],

src/Illuminate/Foundation/Console/TraitMakeCommand.php

@@ -35,7 +35,7 @@ class TraitMakeCommand extends GeneratorCommand
      *
      * @return string
      */
-    protected function getStub()
+    protected function getStub(): string
     {
         return $this->resolveStubPath('/stubs/trait.stub');
     }
@@ -46,7 +46,7 @@ protected function getStub()
      * @param  string  $stub
      * @return string
      */
-    protected function resolveStubPath($stub)
+    protected function resolveStubPath($stub): string
     {
         return file_exists($customPath = $this->laravel->basePath(trim($stub, '/')))
             ? $customPath
@@ -59,17 +59,17 @@ protected function resolveStubPath($stub)
      * @param  string  $rootNamespace
      * @return string
      */
-    protected function getDefaultNamespace($rootNamespace)
+    protected function getDefaultNamespace($rootNamespace): string
     {
-        return $rootNamespace;
+        return $rootNamespace.'\\Traits';
     }
 
     /**
      * Get the console command arguments.
      *
      * @return array
      */
-    protected function getOptions()
+    protected function getOptions(): array
     {
         return [
             ['force', 'f', InputOption::VALUE_NONE, 'Create the trait even if the trait already exists'],