Change namespace from "McMatters\DbCommands" to "McMatters\LaravelDbCommands".

Add new commands migrate:drop-single.
Add package autodiscovering feature.
Use "ConfirmableTrait" in DropTables class.
Import php functions and constants for better performance.

Author: MCMatters

README.md

@@ -8,11 +8,11 @@ Package with laravel database commands.
 composer require mcmatters/laravel-db-commands
 ```
 
-Include the service provider within your `config/app.php` file.
+If you don't use package discovering feature, then just include the service provider within your `config/app.php` file.
 
 ```php
 'providers' => [
-    McMatters\DbCommands\ServiceProvider::class,
+    McMatters\LaravelDbCommands\ServiceProvider::class,
 ]
 ```
 
@@ -22,3 +22,4 @@ Available commands:
 
 * `php artisan db:drop-tables` — drops all tables.
 * `php artisan migrate:single {"file" or "class"}` — migrate single migration by file or class name.
+* `php artisan migrate:drop-single {"file" or "class"}` — drop single migration by file or class name.

composer.json

@@ -15,7 +15,14 @@
     },
     "autoload": {
         "psr-4": {
-            "McMatters\\DbCommands\\": "src/"
+            "McMatters\\LaravelDbCommands\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "McMatters\\LaravelDbCommands\\ServiceProvider"
+            ]
         }
     }
 }

src/Console/Commands/DropTables.php

@@ -2,20 +2,23 @@
 
 declare(strict_types = 1);
 
-namespace McMatters\DbCommands\Console\Commands;
+namespace McMatters\LaravelDbCommands\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Config;
+use Illuminate\Console\ConfirmableTrait;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use function reset;
 
 /**
  * Class DropTables
  *
- * @package McMatters\DbCommands\Console\Commands
+ * @package McMatters\LaravelDbCommands\Console\Commands
  */
 class DropTables extends Command
 {
+    use ConfirmableTrait;
+
     /**
      * @var string
      */
@@ -27,17 +30,22 @@ class DropTables extends Command
     protected $description = 'Drops all tables in the default configuration.';
 
     /**
-     * Run command.
+     * Support for =< 5.4 versions.
      *
      * @return void
      */
+    public function fire()
+    {
+        $this->handle();
+    }
+
+    /**
+     * @return void
+     */
     public function handle()
     {
-        if (!$this->isForced() && $this->isProduction()) {
-            $this->error(
-                'This action can\'t be performed in non-local environment.
-                    Please use --force option if you really want to proceed.'
-            );
+        if (!$this->confirmToProceed()) {
+            return;
         }
 
         Schema::disableForeignKeyConstraints();
@@ -48,22 +56,4 @@ public function handle()
 
         Schema::enableForeignKeyConstraints();
     }
-
-    /**
-     * Check force mode.
-     *
-     * @return bool
-     */
-    protected function isForced(): bool
-    {
-        return null !== $this->option('force');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isProduction(): bool
-    {
-        return in_array(Config::get('app.env'), ['production', 'live'], true);
-    }
 }

src/Console/Commands/MigrateDropSingle.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace McMatters\LaravelDbCommands\Console\Commands;
+
+use Illuminate\Console\ConfirmableTrait;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Database\Console\Migrations\BaseCommand;
+use McMatters\LaravelDbCommands\Console\Commands\Traits\MigrateTrait;
+use McMatters\LaravelDbCommands\Extensions\Database\Migrator;
+use RuntimeException;
+use const false;
+use function count, strpos;
+
+/**
+ * Class MigrateDropSingle
+ *
+ * @package McMatters\LaravelDbCommands\Console\Commands
+ */
+class MigrateDropSingle extends BaseCommand
+{
+    use ConfirmableTrait, MigrateTrait;
+
+    /**
+     * @var string
+     */
+    protected $signature = 'migrate:drop-single
+        {--file= : The file of migration to be executed.}
+        {--class= : The class name of migration.}
+        {--database= : The database connection to use.}
+        {--force : Force the operation to run when in production.}
+        {--pretend : Dump the SQL queries that would be run.}';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Drop the single database migration';
+
+    /**
+     * @var Migrator
+     */
+    protected $migrator;
+
+    /**
+     * MigrateDropSingle constructor.
+     *
+     * @param Migrator $migrator
+     */
+    public function __construct(Migrator $migrator)
+    {
+        parent::__construct();
+
+        $this->migrator = $migrator;
+    }
+
+    /**
+     * Support for =< 5.4 versions.
+     *
+     * @return void
+     * @throws FileNotFoundException
+     * @throws RuntimeException
+     */
+    public function fire()
+    {
+        $this->handle();
+    }
+
+    /**
+     * @return void
+     * @throws FileNotFoundException
+     * @throws RuntimeException
+     */
+    public function handle()
+    {
+        if (!$this->confirmToProceed()) {
+            return;
+        }
+
+        $this->checkRequirements();
+
+        $this->migrator->rollback(
+            $this->getMigrationFile(),
+            [
+                'step'    => count($this->migrator->getRepository()->getRan()),
+                'pretend' => $this->option('pretend'),
+            ]
+        );
+
+        foreach ($this->migrator->getNotes() as $note) {
+            if (strpos($note, 'Migration not found') === false) {
+                $this->output->writeln($note);
+            }
+        }
+    }
+}

src/Console/Commands/MigrateSingle.php

@@ -2,22 +2,23 @@
 
 declare(strict_types = 1);
 
-namespace McMatters\DbCommands\Console\Commands;
+namespace McMatters\LaravelDbCommands\Console\Commands;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Database\Console\Migrations\MigrateCommand;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use McMatters\DbCommands\Extenders\Database\Migrator;
+use McMatters\LaravelDbCommands\Console\Commands\Traits\MigrateTrait;
+use McMatters\LaravelDbCommands\Extensions\Database\Migrator;
 use RuntimeException;
 
 /**
  * Class MigrateSingle
  *
- * @package McMatters\DbCommands\Console\Commands
+ * @package McMatters\LaravelDbCommands\Console\Commands
  */
 class MigrateSingle extends MigrateCommand
 {
+    use MigrateTrait;
+
     /**
      * @var string
      */
@@ -31,7 +32,7 @@ class MigrateSingle extends MigrateCommand
     /**
      * @var string
      */
-    protected $description = 'Run the database migration';
+    protected $description = 'Run the single database migration';
 
     /**
      * MigrateSingle constructor.
@@ -47,8 +48,8 @@ public function __construct(Migrator $migrator)
      * Support for =< 5.4 versions.
      *
      * @return void
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     * @throws \RuntimeException
+     * @throws FileNotFoundException
+     * @throws RuntimeException
      */
     public function fire()
     {
@@ -77,52 +78,4 @@ public function handle()
             $this->output->writeln($note);
         }
     }
-
-    /**
-     * @return string
-     * @throws FileNotFoundException
-     */
-    protected function getMigrationFile(): string
-    {
-        if ($this->hasOption('class')) {
-            $file = $this->getFileByClass();
-        } else {
-            $file = $this->getMigrationPath().'/'.$this->argument('file');
-        }
-
-        if (!$file || !file_exists($file)) {
-            throw new FileNotFoundException('File with migration not found.');
-        }
-
-        return $file;
-    }
-
-    /**
-     * @return string|null
-     */
-    protected function getFileByClass()
-    {
-        $class = $this->option('class');
-
-        if (!$class) {
-            return null;
-        }
-
-        $class = Str::snake($class);
-
-        $files = glob("{$this->getMigrationPath()}/[0-9_]*{$class}.php");
-
-        return Arr::first($files);
-    }
-
-    /**
-     * @return void
-     * @throws RuntimeException
-     */
-    protected function checkRequirements()
-    {
-        if (!$this->hasOption('file') && !$this->hasOption('class')) {
-            throw new RuntimeException('You must pass at least one argument "file" or "class"');
-        }
-    }
 }

src/Console/Commands/Traits/MigrateTrait.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace McMatters\LaravelDbCommands\Console\Commands\Traits;
+
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use RuntimeException;
+use const null;
+use function glob, file_exists;
+
+/**
+ * Trait MigrateTrait
+ *
+ * @package McMatters\LaravelDbCommands\Console\Commands\Traits
+ */
+trait MigrateTrait
+{
+    /**
+     * @return string
+     * @throws FileNotFoundException
+     */
+    protected function getMigrationFile(): string
+    {
+        if ($this->hasOption('class')) {
+            $file = $this->getFileByClass();
+        } else {
+            $file = $this->getMigrationPath().'/'.$this->argument('file');
+        }
+
+        if (!$file || !file_exists($file)) {
+            throw new FileNotFoundException('File with migration not found.');
+        }
+
+        return $file;
+    }
+
+    /**
+     * @return string|null
+     */
+    protected function getFileByClass()
+    {
+        $class = $this->option('class');
+
+        if (!$class) {
+            return null;
+        }
+
+        $class = Str::snake($class);
+
+        $files = glob("{$this->getMigrationPath()}/[0-9_]*{$class}.php");
+
+        return Arr::first($files);
+    }
+
+    /**
+     * @return void
+     * @throws RuntimeException
+     */
+    protected function checkRequirements()
+    {
+        if (!$this->hasOption('file') && !$this->hasOption('class')) {
+            throw new RuntimeException('You must pass at least one argument "file" or "class"');
+        }
+    }
+}