Merge pull request #54 from TheDragonCode/2.x

Fixed path detection in Rollback, Refresh and Status commands

Author: Andrey Helldar

src/Concerns/Database.php

@@ -9,4 +9,13 @@ protected function getMigrationPath(): string
     {
         return $this->laravel->databasePath('actions');
     }
+
+    protected function getMigrationPaths(): array
+    {
+        if ($paths = $this->optionPath()) {
+            return $paths;
+        }
+
+        return [$this->getMigrationPath()];
+    }
 }

src/Concerns/Optionable.php

@@ -19,6 +19,10 @@ protected function optionStep(?int $default = null): ?int
 
     protected function optionPath(): ?array
     {
+        if (! $this->hasOption('path')) {
+            return null;
+        }
+
         if ($path = $this->option('path')) {
             return collect($path)->map(function ($path) {
                 if ($this->usingRealPath()) {

src/Console/Migrate.php

@@ -62,18 +62,10 @@ public function handle()
     protected function prepareDatabase(): void
     {
         if (! $this->migrator->repositoryExists()) {
-            $this->call(Names::INSTALL, array_filter([
-                '--database' => $this->optionDatabase(),
-            ]));
+            $this->call(Names::INSTALL,
+                array_filter([
+                    '--database' => $this->optionDatabase(),
+                ]));
         }
     }
-
-    protected function getMigrationPaths(): array
-    {
-        if ($paths = $this->optionPath()) {
-            return $paths;
-        }
-
-        return [$this->getMigrationPath()];
-    }
 }

src/Console/Status.php

@@ -4,13 +4,15 @@
 
 use DragonCode\LaravelActions\Concerns\Database;
 use DragonCode\LaravelActions\Concerns\Infoable;
+use DragonCode\LaravelActions\Concerns\Optionable;
 use DragonCode\LaravelActions\Constants\Names;
 use Illuminate\Database\Console\Migrations\StatusCommand as BaseCommand;
 
 class Status extends BaseCommand
 {
     use Database;
     use Infoable;
+    use Optionable;
 
     /**
      * The console command name.