updates

Author: denisdulici

composer.json

@@ -24,18 +24,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Akaunting\\Module\\": "./src"
+            "Akaunting\\Module\\": "src"
         },
         "files": [
             "src/helpers.php"
         ]
     },
-    "autoload-dev": {
-        "psr-4": {
-			"Akaunting\\Module\\Tests\\": "tests",
-			"Modules\\Recipe\\": "tests/stubs/valid/Recipe"
-        }
-    },
     "extra": {
         "laravel": {
             "providers": [

src/Commands/GeneratorCommand.php

@@ -43,7 +43,8 @@ public function handle()
         $contents = $this->getTemplateContents();
 
         try {
-            with(new FileGenerator($path, $contents))->generate();
+            $overwrite_file = $this->hasOption('force') ? $this->option('force') : false;
+            (new FileGenerator($path, $contents))->withFileOverwrite($overwrite_file)->generate();
 
             $this->info("Created : {$path}");
         } catch (FileAlreadyExistException $e) {

src/Commands/MigrateCommand.php

@@ -60,7 +60,7 @@ public function handle()
      */
     protected function migrate(Module $module)
     {
-        $path = str_replace(base_path(), '', (new Migrator($module))->getPath());
+        $path = str_replace(base_path(), '', (new Migrator($module, $this->getLaravel()))->getPath());
 
         if ($this->option('subpath')) {
             $path = $path . "/" . $this->option("subpath");

src/Commands/MigrateResetCommand.php

@@ -64,7 +64,7 @@ public function reset($module)
             $module = $this->module->findOrFail($module);
         }
 
-        $migrator = new Migrator($module);
+        $migrator = new Migrator($module, $this->getLaravel());
 
         $database = $this->option('database');
 

src/Commands/MigrateRollbackCommand.php

@@ -64,7 +64,7 @@ public function rollback($module)
             $module = $this->module->findOrFail($module);
         }
 
-        $migrator = new Migrator($module);
+        $migrator = new Migrator($module, $this->getLaravel());
 
         $database = $this->option('database');
 

src/Commands/MigrateStatusCommand.php

@@ -59,7 +59,7 @@ public function handle()
      */
     protected function migrateStatus(Module $module)
     {
-        $path = str_replace(base_path(), '', (new Migrator($module))->getPath());
+        $path = str_replace(base_path(), '', (new Migrator($module, $this->getLaravel()))->getPath());
 
         $this->call('migrate:status', [
             '--path' => $path,

src/Commands/PublishMigrationCommand.php

@@ -48,7 +48,7 @@ public function handle()
      */
     public function publish($module)
     {
-        with(new MigrationPublisher(new Migrator($module)))
+        with(new MigrationPublisher(new Migrator($module, $this->getLaravel())))
             ->setRepository($this->laravel['module'])
             ->setConsole($this)
             ->publish();

src/Commands/RouteProviderMakeCommand.php

@@ -6,6 +6,7 @@
 use Akaunting\Module\Support\Stub;
 use Akaunting\Module\Traits\ModuleCommandTrait;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class RouteProviderMakeCommand extends GeneratorCommand
 {
@@ -39,6 +40,13 @@ protected function getArguments()
         ];
     }
 
+    protected function getOptions()
+    {
+        return [
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when the file already exists.'],
+        ];
+    }
+
     /**
      * Get template contents.
      *
@@ -86,15 +94,15 @@ protected function getDestinationFilePath()
      */
     protected function getWebRoutesPath()
     {
-        return '/' . $this->laravel['config']->get('stubs.files.routes', 'Routes/web.php');
+        return '/' . $this->laravel['modules']->config('stubs.files.routes/web', 'Routes/web.php');
     }
 
     /**
      * @return mixed
      */
     protected function getApiRoutesPath()
     {
-        return '/' . $this->laravel['config']->get('stubs.files.routes', 'Routes/api.php');
+        return '/' . $this->laravel['modules']->config('stubs.files.routes/api', 'Routes/api.php');
     }
 
     public function getDefaultNamespace() : string

src/Commands/stubs/route-provider.stub

@@ -64,6 +64,6 @@ class $CLASS$ extends ServiceProvider
         Route::prefix('api')
             ->middleware('api')
             ->namespace($this->moduleNamespace)
-            ->group(__DIR__ . '/../Routes/api.php');
+            ->group(__DIR__ . '/..$API_ROUTES_PATH$');
     }
 }

src/Commands/stubs/scaffold/provider.stub

@@ -90,7 +90,7 @@ class $CLASS$ extends ServiceProvider
      */
     public function registerFactories()
     {
-        if (!app()->environment('production')) {
+        if (!app()->environment('production') && $this->app->runningInConsole()) {
             app(Factory::class)->load(__DIR__ . '/../$FACTORIES_PATH$');
         }
     }