changed structure

Author: denisdulici

src/Commands/ControllerMakeCommand.php

@@ -100,10 +100,6 @@ protected function getControllerName()
     {
         $controller = Str::studly($this->argument('controller'));
 
-        if (Str::contains(strtolower($controller), 'controller') === false) {
-            $controller .= 'Controller';
-        }
-
         return $controller;
     }
 

src/Commands/JobMakeCommand.php

@@ -69,9 +69,12 @@ protected function getTemplateContents()
         $module = $this->getModule();
 
         return (new Stub($this->getStubName(), [
-            'ALIAS' => $module->getAlias(),
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getClass(),
+            'ALIAS'             => $module->getAlias(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
         ]))->render();
     }
 

src/Commands/ProviderMakeCommand.php

@@ -2,11 +2,11 @@
 
 namespace Akaunting\Module\Commands;
 
-use Illuminate\Support\Str;
 use Akaunting\Module\Module;
 use Akaunting\Module\Support\Config\GenerateConfigReader;
 use Akaunting\Module\Support\Stub;
 use Akaunting\Module\Traits\ModuleCommandTrait;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -90,6 +90,13 @@ protected function getTemplateContents()
             'FACTORIES_PATH'    => GenerateConfigReader::read('factory')->getPath(),
         ]))->render();
     }
+    /**
+     * @return string
+     */
+    private function getFileName()
+    {
+        return Str::studly($this->argument('name'));
+    }
 
     /**
      * @return mixed
@@ -103,11 +110,4 @@ protected function getDestinationFilePath()
         return $path . $generatorPath->getPath() . '/' . $this->getFileName() . '.php';
     }
 
-    /**
-     * @return string
-     */
-    private function getFileName()
-    {
-        return Str::studly($this->argument('name'));
-    }
 }

src/Commands/RouteProviderMakeCommand.php

@@ -57,13 +57,15 @@ protected function getTemplateContents()
         $module = $this->getModule();
 
         return (new Stub('/route-provider.stub', [
-            'ALIAS' => $module->getAlias(),
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getFileName(),
-            'MODULE_NAMESPACE' => $this->laravel['module']->config('namespace'),
-            'MODULE' => $this->getModuleName(),
-            'WEB_ROUTES_PATH' => $this->getWebRoutesPath(),
-            'API_ROUTES_PATH' => $this->getApiRoutesPath(),
+            'ALIAS'             => $module->getAlias(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['module']->config('namespace'),
+            'WEB_ROUTES_PATH'   => $this->getWebRoutesPath(),
+            'API_ROUTES_PATH'   => $this->getApiRoutesPath(),
         ]))->render();
     }
 
@@ -72,7 +74,7 @@ protected function getTemplateContents()
      */
     private function getFileName()
     {
-        return 'RouteServiceProvider';
+        return 'Route';
     }
 
     /**

src/Commands/stubs/json.stub

@@ -5,7 +5,8 @@
     "active": 1,
     "order": 0,
     "providers": [
-        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\$STUDLY_NAME$ServiceProvider"
+        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\Main",
+        "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\Route"
     ],
     "aliases": {},
     "files": [],

src/Commands/stubs/route-provider.stub

@@ -2,10 +2,10 @@
 
 namespace $NAMESPACE$;
 
-use Illuminate\Support\Facades\Route;
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route as Facade;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as Provider;
 
-class $CLASS$ extends ServiceProvider
+class $NAME$ extends Provider
 {
     /**
      * The module namespace to assume when generating URLs to actions.
@@ -47,9 +47,9 @@ class $CLASS$ extends ServiceProvider
      */
     protected function mapWebRoutes()
     {
-        Route::middleware('web')
+        Facade::middleware('web')
             ->namespace($this->moduleNamespace)
-            ->group(__DIR__ . '/../Routes/web.php');
+            ->group(__DIR__ . '/..$WEB_ROUTES_PATH$');
     }
 
     /**
@@ -61,7 +61,7 @@ class $CLASS$ extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::prefix('api')
+        Facade::prefix('api')
             ->middleware('api')
             ->namespace($this->moduleNamespace)
             ->group(__DIR__ . '/..$API_ROUTES_PATH$');

src/Commands/stubs/scaffold/provider.stub

@@ -2,10 +2,10 @@
 
 namespace $NAMESPACE$;
 
-use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\ServiceProvider as Provider;
 use Illuminate\Database\Eloquent\Factory;
 
-class $CLASS$ extends ServiceProvider
+class $NAME$ extends Provider
 {
     /**
      * Boot the application events.

src/Generators/ModuleGenerator.php

@@ -329,7 +329,7 @@ public function generateResources()
         ]);
 
         $this->console->call('module:make-provider', [
-            'name' => $this->getName() . 'ServiceProvider',
+            'name' => 'Main',
             'alias' => $this->alias,
             '--master' => true,
         ]);
@@ -339,7 +339,7 @@ public function generateResources()
         ]);
 
         $this->console->call('module:make-controller', [
-            'controller' => $this->getName() . 'Controller',
+            'controller' => 'Main',
             'alias' => $this->alias,
         ]);
     }
@@ -425,7 +425,7 @@ private function cleanModuleJsonFile()
         $namespace = $this->getModuleNamespaceReplacement();
         $studlyName = $this->getStudlyNameReplacement();
 
-        $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . 'ServiceProvider"';
+        $provider = '"' . $namespace . '\\\\' . $studlyName . '\\\\Providers\\\\' . $studlyName . '"';
 
         $content = str_replace($provider, '', $content);