Merge pull request #17 from dcblogdev/add-laravel-pint

Add laravel pint

composer.json

@@ -23,7 +23,8 @@
     },
     "require-dev": {
         "pestphp/pest": "^2.0",
-        "orchestra/testbench": "^8.22"
+        "orchestra/testbench": "^8.22",
+        "laravel/pint": "^1.15"
     },
     "autoload": {
         "psr-4": {

config/sentemails.php

@@ -5,7 +5,7 @@
  */
 return [
     //set the route path to load the sent emails ui defaults to /sentemails
-    'routepath'  => 'sentemails',
+    'routepath' => 'sentemails',
 
     // set the route middlewares to apply on the sent emails ui
     'middleware' => ['web', 'auth'],

pint.json

@@ -0,0 +1,3 @@
+{
+    "preset": "laravel"
+}

src/Controllers/SentEmailsController.php

@@ -3,9 +3,9 @@
 namespace Dcblogdev\LaravelSentEmails\Controllers;
 
 use Citco\Carbon;
+use Dcblogdev\LaravelSentEmails\Models\SentEmail;
 use Dcblogdev\LaravelSentEmails\Models\SentEmailAttachment;
 use Illuminate\Contracts\View\View;
-use Dcblogdev\LaravelSentEmails\Models\SentEmail;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class SentEmailsController
@@ -20,20 +20,20 @@ public function index(): View
             $to = request('to');
             $subject = request('subject');
 
-            if ($date !='') {
+            if ($date != '') {
                 $date = Carbon::parse($date)->format('Y-m-d');
                 $emails->where('date', '=', $date);
             }
 
-            if ($from !='') {
+            if ($from != '') {
                 $emails->where('from', 'like', "%$from%");
             }
 
-            if ($to !='') {
+            if ($to != '') {
                 $emails->where('to', 'like', "%$to%");
             }
 
-            if ($subject !='') {
+            if ($subject != '') {
                 $emails->where('subject', 'like', "%$subject%");
             }
         }
@@ -63,4 +63,4 @@ public function downloadAttachment(string $id): BinaryFileResponse
 
         return response()->download(storage_path('app/'.$attachment->path), $attachment->filename);
     }
-}
+}

src/Listeners/EmailLogger.php

@@ -2,9 +2,9 @@
 
 namespace Dcblogdev\LaravelSentEmails\Listeners;
 
+use Dcblogdev\LaravelSentEmails\Models\SentEmail;
 use Dcblogdev\LaravelSentEmails\Models\SentEmailAttachment;
 use Illuminate\Mail\Events\MessageSending;
-use Dcblogdev\LaravelSentEmails\Models\SentEmail;
 use Illuminate\Support\Facades\Storage;
 
 class EmailLogger
@@ -14,19 +14,19 @@ public function handle(MessageSending $event): void
         $message = $event->message;
 
         $email = SentEmail::create([
-            'date'        => date('Y-m-d H:i:s'),
-            'from'        => $this->formatAddressField($message->getFrom()),
-            'to'          => $this->formatAddressField($message->getTo()),
-            'cc'          => $this->formatAddressField($message->getCc()),
-            'bcc'         => $this->formatAddressField($message->getBcc()),
-            'subject'     => $message->getSubject(),
-            'body'        => $message->getHtmlBody()
+            'date' => date('Y-m-d H:i:s'),
+            'from' => $this->formatAddressField($message->getFrom()),
+            'to' => $this->formatAddressField($message->getTo()),
+            'cc' => $this->formatAddressField($message->getCc()),
+            'bcc' => $this->formatAddressField($message->getBcc()),
+            'subject' => $message->getSubject(),
+            'body' => $message->getHtmlBody(),
         ]);
 
         if (config('sentemails.storeAttachments')) {
             foreach ($message->getAttachments() as $attachment) {
 
-                $path = 'sent-emails/' . now() . '-' . $attachment->getFilename();
+                $path = 'sent-emails/'.now().'-'.$attachment->getFilename();
                 Storage::disk('local')->put($path, $attachment->getBody());
 
                 SentEmailAttachment::create([
@@ -38,15 +38,15 @@ public function handle(MessageSending $event): void
         }
     }
 
-    function formatAddressField(array $field): ?string
+    public function formatAddressField(array $field): ?string
     {
         $strings = [];
 
-        foreach($field as $row) {
+        foreach ($field as $row) {
             $email = $row->getAddress();
             $name = $row->getName();
 
-            if ($name !='') {
+            if ($name != '') {
                 $email = $name.' <'.$email.'>';
             }
 

src/Models/SentEmail.php

@@ -18,7 +18,7 @@ class SentEmail extends Model
         'cc',
         'bcc',
         'subject',
-        'body'
+        'body',
     ];
 
     protected static function newFactory(): SentEmailFactory

src/Models/SentEmailAttachment.php

@@ -15,7 +15,7 @@ class SentEmailAttachment extends Model
     protected $fillable = [
         'sent_email_id',
         'filename',
-        'path'
+        'path',
     ];
 
     protected static function newFactory(): SentEmailAttachmentFactory

src/SentEmailsServiceProvider.php

@@ -2,11 +2,10 @@
 
 namespace Dcblogdev\LaravelSentEmails;
 
+use Dcblogdev\LaravelSentEmails\Listeners\EmailLogger;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
-use Dcblogdev\LaravelSentEmails\Listeners\EmailLogger;
 
 class SentEmailsServiceProvider extends ServiceProvider
 {
@@ -18,8 +17,8 @@ public function boot(): void
         );
 
         $this->loadViewsFrom(__DIR__.'/resources/views', 'sentemails');
-        $this->loadRoutesFrom(__DIR__ . '/routes/web.php');
-        $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
+        $this->loadRoutesFrom(__DIR__.'/routes/web.php');
+        $this->loadMigrationsFrom(__DIR__.'/database/migrations');
 
         if ($this->app->runningInConsole()) {
 
@@ -28,8 +27,8 @@ public function boot(): void
             ], 'config');
 
             $this->publishes([
-                __DIR__.'/database/migrations/2020_07_16_222057_create_sent_emails_table.php' => $this->app->databasePath() . "/migrations/2020_07_16_222057_create_sent_emails_table.php",
-                __DIR__.'/database/migrations/2024_05_07_222057_create_sent_emails_attachments_table.php' => $this->app->databasePath() . "/migrations/{2024_05_07_222057_create_sent_emails_attachments_table.php",
+                __DIR__.'/database/migrations/2020_07_16_222057_create_sent_emails_table.php' => $this->app->databasePath().'/migrations/2020_07_16_222057_create_sent_emails_table.php',
+                __DIR__.'/database/migrations/2024_05_07_222057_create_sent_emails_attachments_table.php' => $this->app->databasePath().'/migrations/{2024_05_07_222057_create_sent_emails_attachments_table.php',
             ], 'migrations');
 
             $this->publishes([
@@ -40,6 +39,6 @@ public function boot(): void
 
     public function register(): void
     {
-        $this->mergeConfigFrom(__DIR__. '/../config/sentemails.php', 'sentemails');
+        $this->mergeConfigFrom(__DIR__.'/../config/sentemails.php', 'sentemails');
     }
 }

src/database/factories/SentEmailAttachmentFactory.php

@@ -15,9 +15,8 @@ public function definition(): array
     {
         return [
             'sent_email_id' => SentEmail::factory(),
-            'filename' => Str::random(10) . '.txt',
-            'path' => 'sent-emails/' . Str::random(10) . '.txt'
+            'filename' => Str::random(10).'.txt',
+            'path' => 'sent-emails/'.Str::random(10).'.txt',
         ];
     }
 }
-

src/database/factories/SentEmailFactory.php

@@ -12,14 +12,13 @@ class SentEmailFactory extends Factory
     public function definition(): array
     {
         return [
-            'date'        => date('Y-m-d H:i:s'),
-            'from'        => fake()->email,
-            'to'          => fake()->email,
-            'cc'          => fake()->email,
-            'bcc'         => fake()->email,
-            'subject'     => fake()->sentence,
-            'body'        => fake()->realText
+            'date' => date('Y-m-d H:i:s'),
+            'from' => fake()->email,
+            'to' => fake()->email,
+            'cc' => fake()->email,
+            'bcc' => fake()->email,
+            'subject' => fake()->sentence,
+            'body' => fake()->realText,
         ];
     }
 }
-

src/database/migrations/2020_07_16_222057_create_sent_emails_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {

src/database/migrations/2024_05_07_222057_create_sent_emails_attachments_table.php

@@ -1,9 +1,9 @@
 <?php
 
 use Dcblogdev\LaravelSentEmails\Models\SentEmail;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {

src/routes/web.php

@@ -8,4 +8,4 @@
     Route::get(config('sentemails.routepath').'/email/{id}', [SentEmailsController::class, 'email'])->name('sentemails.email');
     Route::get(config('sentemails.routepath').'/body/{id}', [SentEmailsController::class, 'body'])->name('sentemails.body');
     Route::get(config('sentemails.routepath').'/attachment-{id}', [SentEmailsController::class, 'downloadAttachment'])->name('sentemails.downloadAttachment');
-});
+});

tests/SentEmailsTest.php

@@ -34,4 +34,4 @@
     $this->get(route('sentemails.downloadAttachment', $attachment->id))->assertDownload($filename);
 
     unlink($filename);
-});
+});

tests/TestCase.php

@@ -25,12 +25,12 @@ protected function defineEnvironment($app)
         // Setup default database to use sqlite :memory:
         $app['config']->set('database.default', 'mysql');
         $app['config']->set('database.connections.mysql', [
-            'driver'   => 'sqlite',
+            'driver' => 'sqlite',
             'database' => ':memory:',
-            'prefix'   => '',
+            'prefix' => '',
         ]);
         $app['config']->set('sentemails.middleware', [
-            'web'
+            'web',
         ]);
     }
 }