Merge pull request #14239 from craftcms/feature/cms-1069-yii2-symfony…

…mailer-v3 Upgrade yiisoft/yii2-symfonymailer
craftcms · Jan 30, 2024 · 82e0a31 · 82e0a31
2 parents bfff9cf + 946a13b
commit 82e0a31
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 84 deletions.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -436,6 +436,9 @@
 - Deprecated the `_elements/element.twig` control panel template. `elementChip()` or `elementCard()` should be used instead.
 - Deprecated the `cp.elements.element` control panel template hook.
 - Removed the `_includes/revisionmenu.twig` control panel template.
+- Removed `\craft\mail\transportadapters\Gmail::$timeout`.
+- Removed `\craft\mail\transportadapters\Smtp::$encryptionMethod`.
+- Removed `\craft\mail\transportadapters\Smtp::$timeout`.
 - Removed `craft\base\ApplicationTrait::getMatrix()`.
 - Removed `craft\base\Element::$contentId`.
 - Removed `craft\base\Element::ATTR_STATUS_MODIFIED`. `craft\enums\AttributeStatus::Modified` should be used instead.
@@ -569,6 +572,7 @@
 - Craft now requires `pragmarx/recovery`.
 - Craft now requires `web-auth/webauthn-lib`.
 - Updated `illuminate/collections` to v10.
+- Updated `yiisoft/yii2-symfonymailer` to v4.
 - Craft no longer requires `composer/composer`.
 - New database tables now default to the `utf8mb4` charset, and the `utf8mb4_0900_ai_ci` or `utf8mb4_unicode_ci` collation, on MySQL. Existing installs should run `db/convert-charset` after upgrading, to ensure all tables have consistent charsets and collations. ([#11823](https://github.com/craftcms/cms/discussions/11823))
 - The `defaultTemplateExtensions` config setting now lists `twig` before `html` by default. ([#11809](https://github.com/craftcms/cms/discussions/11809))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 - Added the `languageMenu` and `languageMenuField` form macros.
 - Added `craft\models\Site::getLanguage()`.
 - Added `craft\models\Site::setLanguage()`.
+- Removed `\craft\mail\transportadapters\Gmail::$timeout`.
+- Removed `\craft\mail\transportadapters\Smtp::$encryptionMethod`.
+- Removed `\craft\mail\transportadapters\Smtp::$timeout`.
+- Updated `yiisoft/yii2-symfonymailer` to v4.
 
 ## 5.0.0-alpha.9 - 2024-01-29
 

diff --git a/composer.json b/composer.json
@@ -64,7 +64,7 @@
     "yiisoft/yii2": "~2.0.48.1",
     "yiisoft/yii2-debug": "~2.1.22.0",
     "yiisoft/yii2-queue": "~2.3.2",
-    "yiisoft/yii2-symfonymailer": "^2.0.0"
+    "yiisoft/yii2-symfonymailer": "^4.0.0"
   },
   "require-dev": {
     "codeception/codeception": "^5.0.11",

diff --git a/composer.lock b/composer.lock
diff --git a/src/helpers/MailerHelper.php b/src/helpers/MailerHelper.php
@@ -134,12 +134,12 @@ public static function normalizeEmails(mixed $emails): array
      */
     public static function settingsReport(Mailer $mailer, ?TransportAdapterInterface $transportAdapter = null): string
     {
-        $transport = $mailer->getTransport();
+        $transportType = $transportAdapter ? get_class($transportAdapter) : App::mailSettings()->transportType;
         $settings = [
             Craft::t('app', 'From') => self::_emailList($mailer->from),
             Craft::t('app', 'Reply To') => self::_emailList($mailer->replyTo),
             Craft::t('app', 'Template') => $mailer->template,
-            Craft::t('app', 'Transport Type') => get_class($transport),
+            Craft::t('app', 'Transport Type') => $transportType,
         ];
 
         $transportSettings = [];