Merge pull request #197 from cyklokoalicia/phpmailer_update

Update phpmailer
cyklokoalicia · May 25, 2024 · 81cea2e · 81cea2e
2 parents d26fb15 + 29162fc
commit 81cea2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
   },
   "require": {
     "php": "^7.4",
-    "phpmailer/phpmailer": "^5.2.9",
+    "phpmailer/phpmailer": "^6.5.0",
     "tecnickcom/tcpdf": "^6.2.6",
     "ext-json": "*",
     "ext-mysqli": "*",

diff --git a/src/Mail/PHPMailerMailSender.php b/src/Mail/PHPMailerMailSender.php
@@ -2,6 +2,8 @@
 
 namespace BikeShare\Mail;
 
+use PHPMailer\PHPMailer\PHPMailer;
+
 class PHPMailerMailSender implements MailSenderInterface
 {
     /**
@@ -17,21 +19,21 @@ class PHPMailerMailSender implements MailSenderInterface
      */
     private $emailConfig;
     /**
-     * @var \PHPMailer
+     * @var PHPMailer
      */
     private $mailer;
 
     /**
      * @param string $fromEmail
      * @param string $fromName
      * @param array $emailConfig
-     * @param \PHPMailer $mailer
+     * @param PHPMailer $mailer
      */
     public function __construct(
         $fromEmail,
         $fromName,
         array $emailConfig,
-        \PHPMailer $mailer
+        PHPMailer $mailer
     ) {
         #todo add validation of incoming params and throw exception if not valid
         $this->fromEmail = $fromEmail;

diff --git a/tests/Mail/PHPMailerSenderTest.php b/tests/Mail/PHPMailerSenderTest.php
@@ -3,13 +3,14 @@
 namespace Test\BikeShare\Mail;
 
 use BikeShare\Mail\PHPMailerMailSender;
+use PHPMailer\PHPMailer\PHPMailer;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class PHPMailerSenderTest extends TestCase
 {
     /**
-     * @var \PHPMailer|MockObject
+     * @var PHPMailer|MockObject
      */
     private $mailer;
     /**
@@ -25,7 +26,7 @@ protected function setUp(): void
             'pass' => 'pass',
         ];
 
-        $this->mailer = $this->createMock(\PHPMailer::class);
+        $this->mailer = $this->createMock(PHPMailer::class);
         $this->mailSender = new PHPMailerMailSender(
             'fromEmail',
             'fromName',