Refactor + publish migration only once

Author: Pascal Baljet

src/Http/VerifiesPendingEmails.php

@@ -20,7 +20,9 @@ public function verify(string $token)
             throw new InvalidVerificationLinkException(
                 __('The verification link is not valid anymore.')
             );
-        })->activate();
+        })->tap(function (PendingUserEmail $pendingUserEmail) {
+            $pendingUserEmail->activate();
+        })->user;
 
         if (config('verify-new-email.login_after_verification')) {
             Auth::guard()->login($user);

src/MustVerifyNewEmail.php

@@ -24,14 +24,25 @@ public function newEmail(string $email):?PendingUserEmail
             return null;
         }
 
-        return tap(PendingUserEmail::create([
+        return $this->createPendingUserEmailModel($email)->tap(function (PendingUserEmail $model) {
+            $this->sendPendingEmailVerificationMail($model);
+        });
+    }
+
+    /**
+     * Createsa new PendingUserModel model for the given email.
+     *
+     * @param string $email
+     * @return \ProtoneMedia\LaravelVerifyNewEmail\PendingUserEmail
+     */
+    public function createPendingUserEmailModel(string $email): PendingUserEmail
+    {
+        return PendingUserEmail::create([
             'user_type' => get_class($this),
             'user_id'   => $this->getKey(),
             'email'     => $email,
             'token'     => Password::broker()->getRepository()->createNewToken(),
-        ]), function ($pendingUserEmail) {
-            $this->sendPendingEmailVerificationMail($pendingUserEmail);
-        });
+        ]);
     }
 
     /**

src/PendingUserEmail.php

@@ -5,9 +5,12 @@
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Traits\Tappable;
 
 class PendingUserEmail extends Model
 {
+    use Tappable;
+
     /**
      * This model won't be updated.
      */
@@ -50,15 +53,15 @@ public function scopeForUser($query, Model $user)
      */
     public function activate()
     {
-        return tap($this->user, function ($user) {
-            $user->email = $this->email;
-            $user->save();
-            $user->markEmailAsVerified();
+        $user = $this->user;
+
+        $user->email = $this->email;
+        $user->save();
+        $user->markEmailAsVerified();
 
-            static::whereEmail($this->email)->get()->each->delete();
+        static::whereEmail($this->email)->get()->each->delete();
 
-            event(new Verified($user));
-        });
+        event(new Verified($user));
     }
 
     /**

src/ServiceProvider.php

@@ -2,29 +2,28 @@
 
 namespace ProtoneMedia\LaravelVerifyNewEmail;
 
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
     /**
      * Bootstrap the application services.
      */
-    public function boot()
+    public function boot(Filesystem $filesystem)
     {
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'verify-new-email');
-        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
-
-        if (!class_exists('CreatePendingUserEmailsTable')) {
-            $this->publishes([
-                __DIR__ . '/../database/migrations/create_pending_user_emails_table.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_pending_user_emails_table.php'),
-            ], 'migrations');
-        }
 
         if (!config('verify-new-email.route')) {
             $this->loadRoutesFrom(__DIR__ . '/routes.php');
         }
 
         if ($this->app->runningInConsole()) {
+            $this->publishes([
+                __DIR__ . '/../database/migrations/create_pending_user_emails_table.php.stub' => $this->getMigrationFileName($filesystem),
+            ], 'migrations');
+
             $this->publishes([
                 __DIR__ . '/../config/config.php' => config_path('verify-new-email.php'),
             ], 'config');
@@ -37,12 +36,29 @@ public function boot()
         }
     }
 
+    /**
+     * Returns existing migration file if found, else uses the current timestamp.
+     *
+     * @param Filesystem $filesystem
+     * @return string
+     */
+    protected function getMigrationFileName(Filesystem $filesystem): string
+    {
+        $timestamp = date('Y_m_d_His');
+
+        return Collection::make($this->app->databasePath('migrations') . DIRECTORY_SEPARATOR)
+            ->flatMap(function ($path) use ($filesystem) {
+                return $filesystem->glob("{$path}*_create_pending_user_emails_table.php");
+            })
+            ->push($this->app->databasePath("migrations/{$timestamp}_create_pending_user_emails_table.php"))
+            ->first();
+    }
+
     /**
      * Register the application services.
      */
     public function register()
     {
-        // Automatically apply the package configuration
         $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'verify-new-email');
     }
 }