cleanup

jeremykenedy · Feb 27, 2023 · 8ab9792 · 8ab9792
1 parent dfc8617
commit 8ab9792
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 71 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
     },
     "require-dev": {
         "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.0",
+        "suin/phpcs-psr4-sniff": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +45,10 @@
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "laravel": {

diff --git a/src/database/migrations/2015_07_31_1_email_log.php b/src/database/migrations/2015_07_31_1_email_log.php
@@ -4,33 +4,31 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class EmailLog extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
-        Schema::create('email_log', function (Blueprint $table) {
-            $table->increments('id');
-            $table->dateTime('date');
-            $table->string('from')->nullable();
-            $table->string('to')->nullable();
-            $table->string('cc')->nullable();
-            $table->string('bcc')->nullable();
-            $table->string('subject');
-            $table->text('body');
-            $table->text('headers')->nullable();
-            $table->text('attachments')->nullable();
-        });
+        Schema::create(
+            'email_log', function (Blueprint $table) {
+                $table->increments('id');
+                $table->dateTime('date');
+                $table->string('from')->nullable();
+                $table->string('to')->nullable();
+                $table->string('cc')->nullable();
+                $table->string('bcc')->nullable();
+                $table->string('subject');
+                $table->text('body');
+                $table->text('headers')->nullable();
+                $table->text('attachments')->nullable();
+            }
+        );
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {

diff --git a/src/database/migrations/2016_09_21_001638_add_bcc_column_email_log.php b/src/database/migrations/2016_09_21_001638_add_bcc_column_email_log.php
@@ -4,33 +4,33 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddBccColumnEmailLog extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
-        Schema::table('email_log', function ($table) {
-            if (! Schema::hasColumn('email_log', 'bcc')) {
-                $table->string('to')->nullable()->change();
-                $table->string('bcc')->after('to')->nullable();
+        Schema::table(
+            'email_log', function ($table) {
+                if (! Schema::hasColumn('email_log', 'bcc')) {
+                    $table->string('to')->nullable()->change();
+                    $table->string('bcc')->after('to')->nullable();
+                }
             }
-        });
+        );
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {
-        Schema::table('email_log', function ($table) {
-            $table->string('to')->change();
-            $table->dropColumn('bcc');
-        });
+        Schema::table(
+            'email_log', function ($table) {
+                $table->string('to')->change();
+                $table->dropColumn('bcc');
+            }
+        );
     }
 }
diff --git a/src/database/migrations/2017_11_10_001638_add_more_mail_columns_email_log.php b/src/database/migrations/2017_11_10_001638_add_more_mail_columns_email_log.php
@@ -4,35 +4,35 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddMoreMailColumnsEmailLog extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
-        Schema::table('email_log', function ($table) {
-            if (! Schema::hasColumn('email_log', 'id')) {
-                $table->increments('id')->first();
-                $table->string('from')->after('date')->nullable();
-                $table->string('cc')->after('to')->nullable();
-                $table->text('headers')->after('body')->nullable();
-                $table->text('attachments')->after('headers')->nullable();
+        Schema::table(
+            'email_log', function ($table) {
+                if (! Schema::hasColumn('email_log', 'id')) {
+                    $table->increments('id')->first();
+                    $table->string('from')->after('date')->nullable();
+                    $table->string('cc')->after('to')->nullable();
+                    $table->text('headers')->after('body')->nullable();
+                    $table->text('attachments')->after('headers')->nullable();
+                }
             }
-        });
+        );
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {
-        Schema::table('email_log', function ($table) {
-            $table->dropColumn(['id', 'from', 'cc', 'headers', 'attachments']);
-        });
+        Schema::table(
+            'email_log', function ($table) {
+                $table->dropColumn(['id', 'from', 'cc', 'headers', 'attachments']);
+            }
+        );
     }
 }
diff --git a/src/database/migrations/2018_05_11_115355_use_longtext_for_attachments.php b/src/database/migrations/2018_05_11_115355_use_longtext_for_attachments.php
@@ -4,29 +4,29 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UseLongtextForAttachments extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
-        Schema::table('email_log', function (Blueprint $table) {
-            $table->longText('attachments')->nullable()->change();
-        });
+        Schema::table(
+            'email_log', function (Blueprint $table) {
+                $table->longText('attachments')->nullable()->change();
+            }
+        );
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {
-        Schema::table('email_log', function (Blueprint $table) {
-            $table->text('attachments')->nullable()->change();
-        });
+        Schema::table(
+            'email_log', function (Blueprint $table) {
+                $table->text('attachments')->nullable()->change();
+            }
+        );
     }
 }
diff --git a/src/jeremykenedy/LaravelEmailDatabaseLog/EmailLogger.php b/src/jeremykenedy/LaravelEmailDatabaseLog/EmailLogger.php
@@ -13,14 +13,15 @@ class EmailLogger
     /**
      * Handle the actual logging.
      *
-     * @param  MessageSending  $event
+     * @param  MessageSending $event
      * @return void
      */
     public function handle(MessageSending $event): void
     {
         $message = $event->message;
 
-        DB::table('email_log')->insert([
+        DB::table('email_log')->insert(
+            [
             'date'        => Carbon::now()->format('Y-m-d H:i:s'),
             'from'        => $this->formatAddressField($message, 'From'),
             'to'          => $this->formatAddressField($message, 'To'),
@@ -30,14 +31,15 @@ public function handle(MessageSending $event): void
             'body'        => $message->getBody()->bodyToString(),
             'headers'     => $message->getHeaders()->toString(),
             'attachments' => $this->saveAttachments($message),
-        ]);
+            ]
+        );
     }
 
     /**
      * Format address strings for sender, to, cc, bcc.
      *
      * @param  Email  $message
-     * @param  string  $field
+     * @param  string $field
      * @return null|string
      */
     public function formatAddressField(Email $message, string $field): ?string
@@ -50,7 +52,7 @@ public function formatAddressField(Email $message, string $field): ?string
     /**
      * Collect all attachments and format them as strings.
      *
-     * @param  Email  $message
+     * @param  Email $message
      * @return string|null
      */
     protected function saveAttachments(Email $message): ?string

diff --git a/src/jeremykenedy/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php b/src/jeremykenedy/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php
@@ -8,8 +8,6 @@ class LaravelEmailDatabaseLogServiceProvider extends ServiceProvider
 {
     /**
      * Register any other events for your application.
-     *
-     * @return void
      */
     public function boot(): void
     {
@@ -18,17 +16,17 @@ public function boot(): void
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
     public function register(): void
     {
         $this->app->register(LaravelEmailDatabaseLogEventServiceProvider::class);
 
         if ($this->app->runningInConsole()) {
-            $this->publishes([
+            $this->publishes(
+                [
                 __DIR__.'/../../database/migrations' => database_path('migrations'),
-            ], 'laravel-email-database-log-migration');
+                ], 'laravel-email-database-log-migration'
+            );
         }
     }
 }