updates

akaunting · Jul 10, 2020 · 7df640d · 7df640d
1 parent e8381fb
commit 7df640d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/src/Commands/ControllerMakeCommand.php b/src/Commands/ControllerMakeCommand.php
@@ -106,7 +106,7 @@ protected function getControllerName()
     /**
      * @return array|string
      */
-    private function getControllerNameWithoutNamespace()
+    protected function getControllerNameWithoutNamespace()
     {
         return class_basename($this->getControllerName());
     }
@@ -120,7 +120,7 @@ public function getDefaultNamespace() : string
      * Get the stub file name based on the options
      * @return string
      */
-    private function getStubName()
+    protected function getStubName()
     {
         if ($this->option('plain') === true) {
             $stub = '/controller-plain.stub';

diff --git a/src/Commands/stubs/composer.stub b/src/Commands/stubs/composer.stub
@@ -11,15 +11,5 @@
         "psr-4": {
             "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\": ""
         }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\Main"
-            ],
-            "aliases": {
-
-            }
-        }
     }
 }
diff --git a/src/Commands/stubs/package.stub b/src/Commands/stubs/package.stub
@@ -10,8 +10,8 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "cross-env": "^5.1.4",
-        "laravel-mix": "^4.0.7",
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
         "laravel-mix-merge-manifest": "^0.1.2"
     }
 }
diff --git a/src/Commands/stubs/resource.stub b/src/Commands/stubs/resource.stub
@@ -2,9 +2,9 @@
 
 namespace $NAMESPACE$;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class $CLASS$ extends Resource
+class $CLASS$ extends JsonResource
 {
     /**
      * Transform the resource into an array.

diff --git a/src/Providers/Laravel.php b/src/Providers/Laravel.php
@@ -31,14 +31,16 @@ public function register()
      * Setup stub path.
      */
     public function setupStubPath()
-    {
-        Stub::setBasePath(__DIR__ . '/Commands/stubs');
+    {       
+        $path = $this->app['config']->get('module.stubs.path') ?? __DIR__ . '/Commands/stubs';
+
+        Stub::setBasePath($path);
 
         $this->app->booted(function ($app) {
-            $moduleRepository = $app[RepositoryInterface::class];
+            $repository = $app[RepositoryInterface::class];
 
-            if ($moduleRepository->config('stubs.enabled') === true) {
-                Stub::setBasePath($moduleRepository->config('stubs.path'));
+            if ($repository->config('stubs.enabled') === true) {
+                Stub::setBasePath($repository->config('stubs.path'));
             }
         });
     }