feat: start using modern phpmailer classes

Author: carlalexander

composer.json

@@ -27,7 +27,7 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "php-mock/php-mock-phpunit": "^2.6",
         "php-stubs/wp-cli-stubs": "^2.8",
-        "phpmailer/phpmailer": "^5.2",
+        "phpmailer/phpmailer": "^7.0",
         "phpunit/phpunit": "^8.0 || ^9.0",
         "symfony/polyfill-php80": "^1.28",
         "szepeviktor/phpstan-wordpress": "^1.0"

pluggable.php

@@ -11,6 +11,7 @@
  * file that was distributed with this source code.
  */
 
+use PHPMailer\PHPMailer\Exception;
 use Ymir\Plugin\Email\Email;
 use Ymir\Plugin\Email\EmailClientInterface;
 use Ymir\Plugin\Plugin;
@@ -68,7 +69,7 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = []): boo
         } catch (\Exception $exception) {
             $errorData = compact('to', 'subject', 'message', 'headers', 'attachments');
 
-            if ($exception instanceof phpmailerException) {
+            if ($exception instanceof Exception) {
                 $errorData['phpmailer_exception_code'] = $exception->getCode();
             }
 

src/Configuration/WordPressConfiguration.php

@@ -13,6 +13,8 @@
 
 namespace Ymir\Plugin\Configuration;
 
+use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\PHPMailer;
 use Ymir\Plugin\DependencyInjection\Container;
 use Ymir\Plugin\DependencyInjection\ContainerConfigurationInterface;
 
@@ -103,17 +105,17 @@ public function modify(Container $container)
             return $container['is_multisite'] && function_exists('is_subdomain_install') && is_subdomain_install();
         });
         $container['phpmailer'] = function () {
-            if (!class_exists(\PHPMailer\PHPMailer\PHPMailer::class) && file_exists(ABSPATH.WPINC.'/PHPMailer/PHPMailer.php')) {
+            if (!class_exists(PHPMailer::class) && file_exists(ABSPATH.WPINC.'/PHPMailer/PHPMailer.php')) {
                 require_once ABSPATH.WPINC.'/PHPMailer/PHPMailer.php';
                 require_once ABSPATH.WPINC.'/PHPMailer/Exception.php';
 
-                class_alias(\PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer');
-                class_alias(\PHPMailer\PHPMailer\Exception::class, 'phpmailerException');
+                class_alias(PHPMailer::class, 'PHPMailer');
+                class_alias(Exception::class, 'phpmailerException');
             } elseif (!class_exists(\PHPMailer::class)) {
                 require_once ABSPATH.WPINC.'/class-phpmailer.php';
             }
 
-            return new \PHPMailer(true);
+            return new PHPMailer(true);
         };
         $container['plupload_error_messages'] = $container->service(function () {
             return [

src/Email/Email.php

@@ -13,6 +13,7 @@
 
 namespace Ymir\Plugin\Email;
 
+use PHPMailer\PHPMailer\PHPMailer;
 use Ymir\Plugin\Attachment\AttachmentFileManager;
 use Ymir\Plugin\EventManagement\EventManager;
 use Ymir\Plugin\Support\Collection;
@@ -57,14 +58,14 @@ class Email
     /**
      * WordPress PHPMailer object.
      *
-     * @var \PHPMailer
+     * @var PHPMailer
      */
     private $mailer;
 
     /**
      * Constructor.
      */
-    public function __construct(EventManager $eventManager, string $defaultFromAddress, AttachmentFileManager $fileManager, \PHPMailer $mailer, string $defaultCharset = 'UTF-8', string $defaultContentType = 'text/plain')
+    public function __construct(EventManager $eventManager, string $defaultFromAddress, AttachmentFileManager $fileManager, PHPMailer $mailer, string $defaultCharset = 'UTF-8', string $defaultContentType = 'text/plain')
     {
         $this->defaultCharset = $defaultCharset;
         $this->defaultContentType = $defaultContentType;

tests/Mock/PHPMailerMockTrait.php

@@ -13,6 +13,7 @@
 
 namespace Ymir\Plugin\Tests\Mock;
 
+use PHPMailer\PHPMailer\PHPMailer;
 use PHPUnit\Framework\MockObject\MockObject;
 
 trait PHPMailerMockTrait
@@ -22,7 +23,7 @@ trait PHPMailerMockTrait
      */
     private function getPHPMailerMock(): MockObject
     {
-        return $this->getMockBuilder(\PHPMailer::class)
+        return $this->getMockBuilder(PHPMailer::class)
                     ->disableOriginalConstructor()
                     ->getMock();
     }