Skip to content

Commit d13abc7

Browse files
committed
Mail: Removed custom symfony/mailer fork
Moved to standard symfony mailer now that my patches have been upstreamed. This changes the config to work with the symfony option, following the same overall logic. Also updated testing to allow test runs via mulitple custom env options. Closes #5636
1 parent 2442829 commit d13abc7

File tree

8 files changed

+156
-159
lines changed

8 files changed

+156
-159
lines changed

app/Config/mail.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// Configured mail encryption method.
1212
// STARTTLS should still be attempted, but tls/ssl forces TLS usage.
1313
$mailEncryption = env('MAIL_ENCRYPTION', null);
14+
$mailPort = intval(env('MAIL_PORT', 587));
1415

1516
return [
1617

@@ -33,13 +34,13 @@
3334
'transport' => 'smtp',
3435
'scheme' => null,
3536
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
36-
'port' => env('MAIL_PORT', 587),
37+
'port' => $mailPort,
3738
'username' => env('MAIL_USERNAME'),
3839
'password' => env('MAIL_PASSWORD'),
3940
'verify_peer' => env('MAIL_VERIFY_SSL', true),
4041
'timeout' => null,
4142
'local_domain' => null,
42-
'tls_required' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl'),
43+
'require_tls' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl' || $mailPort === 465),
4344
],
4445

4546
'sendmail' => [

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
"socialiteproviders/microsoft-azure": "^5.1",
3939
"socialiteproviders/okta": "^4.2",
4040
"socialiteproviders/twitch": "^5.3",
41-
"ssddanbrown/htmldiff": "^2.0.0",
42-
"ssddanbrown/symfony-mailer": "7.2.x-dev"
41+
"ssddanbrown/htmldiff": "^2.0.0"
4342
},
4443
"require-dev": {
4544
"fakerphp/faker": "^1.21",

composer.lock

Lines changed: 109 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)