Merge pull request #70 from RonasIT/refactoring-mail-classes

refactor: update mails format

app/Mail/BaseMail.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+abstract class BaseMail extends Mailable implements ShouldQueue
+{
+    use Queueable;
+    use SerializesModels;
+
+    public int $tries = 5;
+
+    public function __construct(public $viewData)
+    {
+        $this->queue = 'mails';
+    }
+
+    abstract public function envelope(): Envelope;
+
+    abstract public function content(): Content;
+}

app/Mail/ForgotPasswordMail.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+
+class ForgotPasswordMail extends BaseMail
+{
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: __('Forgot password?'),
+        );
+    }
+
+    public function content(): Content
+    {
+        return new Content(
+            view: 'emails.forgot_password',
+            with: $this->viewData,
+        );
+    }
+}

app/Services/UserService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use App\Mails\ForgotPasswordMail;
+use App\Mail\ForgotPasswordMail;
 use App\Models\Role;
 use App\Repositories\UserRepository;
 use Carbon\Carbon;

composer.json

@@ -9,6 +9,7 @@
   "type": "project",
   "require": {
     "php": "^8.1",
+    "ext-openssl": "*",
     "doctrine/dbal": "^3.8",
     "laravel/framework": "^10.48",
     "laravel/legacy-factories": "^1.4",
@@ -19,14 +20,13 @@
     "nunomaduro/collision": "^6.4",
     "php-open-source-saver/jwt-auth": "^2.2",
     "psr/simple-cache": "^3.0",
-    "ronasit/laravel-helpers": "^2.5",
+    "ronasit/laravel-helpers": "dev-master",
     "ronasit/laravel-swagger": "^2.2",
     "spatie/laravel-google-cloud-storage": "^2.3",
     "spatie/laravel-ignition": "^2.4",
     "symfony/http-client": "6.4.5",
     "symfony/mailgun-mailer": "6.4.4",
-    "symfony/postmark-mailer": "6.4.4",
-    "ext-openssl": "*"
+    "symfony/postmark-mailer": "6.4.4"
   },
   "require-dev": {
     "ext-json": "*",
@@ -36,7 +36,6 @@
     "friendsofphp/php-cs-fixer": "^3.8",
     "mockery/mockery": "^1.6",
     "php-coveralls/php-coveralls": "^2.7",
-    "php-mock/php-mock-phpunit": "^2.10",
     "phpunit/phpunit": "^9.6.17",
     "ronasit/laravel-entity-generator": ">=2.0.4-beta",
     "tightenco/tlint": "^9.3"