Use anonymous migrations

Author: erikn69

database/migrations/audits.stub

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateAuditsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $connection = config('audit.drivers.database.connection', config('database.default'));
         $table = config('audit.drivers.database.table', 'audits');
@@ -39,14 +37,12 @@ class CreateAuditsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $connection = config('audit.drivers.database.connection', config('database.default'));
         $table = config('audit.drivers.database.table', 'audits');
 
         Schema::connection($connection)->drop($table);
     }
-}
+};

src/AuditingServiceProvider.php

@@ -3,6 +3,8 @@
 namespace OwenIt\Auditing;
 
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 use OwenIt\Auditing\Console\AuditDriverCommand;
 use OwenIt\Auditing\Console\AuditResolverCommand;
@@ -49,20 +51,18 @@ public function register()
      */
     private function registerPublishing()
     {
-        if ($this->app->runningInConsole()) {
-            // Lumen lacks a config_path() helper, so we use base_path()
-            $this->publishes([
-                __DIR__ . '/../config/audit.php' => base_path('config/audit.php'),
-            ], 'config');
-
-            if (!class_exists('CreateAuditsTable')) {
-                $this->publishes([
-                    __DIR__ . '/../database/migrations/audits.stub' => database_path(
-                        sprintf('migrations/%s_create_audits_table.php', date('Y_m_d_His'))
-                    ),
-                ], 'migrations');
-            }
+        if (! $this->app->runningInConsole()) {
+            return;
         }
+
+        // Lumen lacks a config_path() helper, so we use base_path()
+        $this->publishes([
+            __DIR__ . '/../config/audit.php' => base_path('config/audit.php'),
+        ], 'config');
+        
+        $this->publishes([
+            __DIR__ . '/../database/migrations/audits.stub' => $this->getMigrationFileName('create_audits_table.php'),
+        ], 'migrations');
     }
 
     /**
@@ -74,4 +74,19 @@ public function provides()
             Auditor::class,
         ];
     }
+    
+    /**
+     * Returns existing migration file if found, else uses the current timestamp.
+     */
+    protected function getMigrationFileName($migrationFileName): string
+    {
+        $timestamp = date('Y_m_d_His');
+
+        $filesystem = $this->app->make(Filesystem::class);
+
+        return Collection::make([$this->app->databasePath() . DIRECTORY_SEPARATOR . 'migrations' . DIRECTORY_SEPARATOR])
+            ->flatMap(fn ($path) => $filesystem->glob($path.'*_'.$migrationFileName))
+            ->push($this->app->databasePath()."/migrations/{$timestamp}_{$migrationFileName}")
+            ->first();
+    }
 }

tests/database/migrations/0000_00_00_000000_create_audits_test_table.php

@@ -0,0 +1,3 @@
+<?php
+
+return require __DIR__.'/../../../database/migrations/audits.stub';

tests/database/migrations/0000_00_00_000001_create_audits_test_table.php renamed to tests/database/migrations/0000_00_00_000001_create_audits_test_field.php

@@ -1,23 +1,26 @@
 <?php
-include_once __DIR__.'/../../../database/migrations/audits.stub';
 
+use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateAuditsTestTable extends CreateAuditsTable
+return new class extends Migration
 {
 
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
-        parent::up();
-
         Schema::table(config('audit.drivers.database.table', 'audits'), function(Blueprint $table) {
             $table->unsignedInteger('tenant_id')->nullable();
         });
     }
-}
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};

tests/database/migrations/0000_00_00_000002_create_users_test_table.php

@@ -4,14 +4,12 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTestTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
@@ -25,11 +23,9 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('users');
     }
-}
+};

tests/database/migrations/0000_00_00_000003_create_api_models_test_table.php

@@ -4,14 +4,12 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateApiModelsTestTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('api_models', function (Blueprint $table) {
             $table->uuid('api_model_id');
@@ -24,11 +22,9 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('api_models');
     }
-}
+};

tests/database/migrations/0000_00_00_000003_create_articles_test_table.php

@@ -4,14 +4,12 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateArticlesTestTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('articles', function (Blueprint $table) {
             $table->increments('id');
@@ -27,11 +25,9 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('articles');
     }
-}
+};

tests/database/migrations/0000_00_00_000003_create_categories_test_table.php

@@ -4,14 +4,12 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateCategoriesTestTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('categories', function (Blueprint $table) {
             $table->increments('id');
@@ -29,11 +27,9 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('categories');
     }
-}
+};