Get updates

config/laravel-modules.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+
+	"modulesPath" => base_path('modules'),
+
+	/*
+	*  If this option is true, Artisan commands for Nova will be enabled and modules will support Nova files.
+	*/
+	"supportLaravelNova" => false,
+
+];

helper.php

@@ -30,7 +30,7 @@ function modules(string $location = null) {
      */
     function module_path($slug = null, $file = '', $location = null , $inSrc = false , $typeSeeder = false) {
         $location = $location ?: "modules";
-        $modulesPath = base_path('modules');
+        $modulesPath = config('laravel-modules.modulesPath');
 
         $filePath = $file ? '/' . ltrim($file, '/') : '';
 
@@ -71,7 +71,7 @@ function module_path($slug = null, $file = '', $location = null , $inSrc = false
      * @throws \Idel\Modular\Exceptions\ModuleNotFoundException
      */
     function module_class($slug, $class, $location = null) {
-        $location = $location ?: base_path('modules');
+        $location = $location ?: config('laravel-modules.modulesPath');
         $module = modules($location)->where('slug', $slug);
 
         if (is_null($module)) {

src/Console/GeneratorCommand.php

@@ -16,10 +16,10 @@ abstract class GeneratorCommand extends LaravelGeneratorCommand
     protected function qualifyClass($name)
     {
         try {
-            $location = $this->option('location') ?: base_path('modules');
+            $location = $this->option('location') ?: config('laravel-modules.modulesPath');
         }
         catch (\Exception $e) {
-            $location = base_path('modules');
+            $location = config('laravel-modules.modulesPath');
         }
         $name = str_replace('/', '\\', $name);
         return $this->getDefaultNamespace($this->rootNamespace()).'\\'.$name;
@@ -34,10 +34,10 @@ protected function qualifyClass($name)
     protected function getPath($name)
     {
         try {
-            $location = $this->option('location') ?: base_path('modules');
+            $location = $this->option('location') ?: config('laravel-modules.modulesPath');
         }
         catch (\Exception $e) {
-            $location = base_path('modules');
+            $location = config('laravel-modules.modulesPath');
         }
         $slug = $this->argument('slug');
         $module = Module::location($location)->where('slug', $slug);

src/Console/Generators/MakeConfigCommand.php

@@ -46,7 +46,7 @@ public function handle()
     {
         $name = $this->argument('name');
         $module = $this->argument('slug');
-        $directionModule = base_path('modules') .'/' . $module;
+        $directionModule = config('laravel-modules.modulesPath') .'/' . $module;
 
         if (!$this->files->isDirectory("{$directionModule}/config")) {
             $this->files->makeDirectory("{$directionModule}/config",0755, true);

src/Console/Generators/MakeLanguageCommand.php

@@ -46,7 +46,7 @@ public function handle()
     {
         $name = $this->argument('name');
         $module = $this->argument('slug');
-        $directionModule = base_path('modules') .'/' . $module;
+        $directionModule = config('laravel-modules.modulesPath') .'/' . $module;
 
         if (!$this->files->isDirectory("{$directionModule}/languages")) {
             $this->files->makeDirectory("{$directionModule}/languages",0755, true);

src/Console/Generators/MakeListenerCommand.php

@@ -51,7 +51,7 @@ public function handle()
         $event = $this->option('event');
         $eventShortName = Str::studly($event);
         $studlyName = Str::studly($name);
-        $directionModule = base_path('modules') .'/' . $module . '/src';
+        $directionModule = config('laravel-modules.modulesPath') .'/' . $module . '/src';
         $studlyModule = Str::studly($module);
         $namespace = "App\\{$studlyModule}\\Listeners";
         $eventNamespace = "App\\{$studlyModule}\\Events\\{$eventShortName}";

src/Console/Generators/MakeMailCommand.php

@@ -48,7 +48,7 @@ public function handle()
         $name = $this->argument('name');
         $module = $this->argument('slug');
         $studlyName = Str::studly($name);
-        $directionModule = base_path('modules') .'/' . $module . '/src';
+        $directionModule = config('laravel-modules.modulesPath') .'/' . $module . '/src';
         $studlyModule = Str::studly($module);
         $namespace = "App\\{$studlyModule}\\Mails";
         $template = str_replace([

src/Console/Generators/MakeModuleCommand.php

@@ -60,7 +60,7 @@ public function handle()
         $name = $this->container['name'];
         $this->container['description'] = "This is the description for the {$name} module.";
 
-        $this->container['location']    = base_path('modules');
+        $this->container['location']    = config('laravel-modules.modulesPath');
         $this->container['provider']    = "{$name}ServiceProvider";
 
 

src/Repositories/Repository.php

@@ -81,7 +81,7 @@ public function getManifest(string $slug)
      */
     public function getPath(): string
     {
-        return $this->path ?: base_path('modules');
+        return $this->path ?: config('laravel-modules.modulesPath');
     }
 
     /**

src/RepositoryManager.php

@@ -24,9 +24,9 @@ class RepositoryManager
     protected $classLoader;
 
     /**
-     * @var Path
+     * @var Modules Path
      */
-    protected $path;
+    protected $modulePath;
 
     /**
      * Repository Manager instance.
@@ -36,7 +36,7 @@ class RepositoryManager
     public function __construct(Application $app)
     {
         $this->app         = $app;
-        $this->path        = base_path('modules');
+        $this->modulePath  = config('laravel-modules.modulesPath');
         $this->classLoader = new ClassLoader;
     }
 
@@ -47,9 +47,7 @@ public function __construct(Application $app)
      */
     public function register()
     {
-        $moduleLocations = base_path('modules');
-
-        $repository = $this->repository($moduleLocations);
+        $repository = $this->repository($this->modulePath);
         $modules    = $repository->enabled()->sortBy(['order']);
 
         $modules->each(function ($module){
@@ -67,8 +65,7 @@ public function register()
     private function registerServiceProvider($module)
     {
         $moduleName = $module['name'];
-        $provider = $moduleName . "ServiceProvider";
-        $providerLoader = "App\\{$moduleName}\\Providers\\{$provider}";
+        $providerLoader = "App\\{$moduleName}\\Providers\\{$moduleName}ServiceProvider";
         if (class_exists($providerLoader)) {
             $this->app->register($providerLoader);
         }
@@ -82,10 +79,9 @@ private function registerServiceProvider($module)
      */
     public function addPsr4($module)
     {
-        $modulrDir  = $this->path;
         $moduleName = $module['name'];
         $moduleSlug = $module['slug'];
-        $this->classLoader->addPsr4('App\\' . $moduleName . '\\', $modulrDir . '/' .$moduleSlug . "/src");
+        $this->classLoader->addPsr4("App\\{$moduleName}\\", "{$this->modulePath}/{$moduleSlug}/src");
         $this->classLoader->register();
     }
 
@@ -103,8 +99,8 @@ public function repositories()
      */
     protected function repository()
     {
-        return  $this->repositories[$this->path]
-            ?? $this->repositories[$this->path] = new LocalRepository($this->path);
+        return  $this->repositories[$this->modulePath]
+            ?? $this->repositories[$this->modulePath] = new LocalRepository($this->modulePath);
     }
 
     /**

src/ServiceProvider.php

@@ -16,6 +16,7 @@ class ServiceProvider extends LaravelServiceProvider
      */
     public function boot()
     {
+        $this->publishes();
         $this->app['modules']->register();
     }
 
@@ -32,6 +33,18 @@ public function register()
         });
     }
 
+    /**
+     * Publishes files.
+     */
+    public function publishes()
+    {
+        $configPath = __DIR__ . '/../config/laravel-modules.php'
+
+        $this->publishes([
+            $configPath => config_path('laravel-modules.php'),
+        ], 'config');
+    }
+
     /**
      * Get the services provided by the package.
      *