Skip to content

Commit 0c30c95

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: feature #17513 [Security] Use expression for `#[IsGranted()]` subject (HypeMC) minor #18114 update default value for framework.ide (GromNaN) minor #18018 [Messenger] add `WorkerRateLimitedEvent` (MrYamous) minor #18081 Update events.rst (hbgamra) minor #18091 [Doctrine] replace ManagerRegistry in doctrine associations doc (MrYamous) minor #18029 [HtmlSanitizer] Fix API usage on PHP config files (alexandre-daubois) Move Notifier bridges doc to the code repo README files Add note about custom port configuration being ignored by specific mailer transport DSN [Notifier] Add link to readme bridges
2 parents 612b244 + 20f41f8 commit 0c30c95

File tree

9 files changed

+207
-522
lines changed

9 files changed

+207
-522
lines changed

_build/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"php": ">=8.1",
1818
"symfony/console": "^6.2",
1919
"symfony/process": "^6.2",
20-
"symfony-tools/docs-builder": "^0.18"
20+
"symfony-tools/docs-builder": "^0.20"
2121
}
2222
}

_build/composer.lock

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

mailer.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,17 @@ MailerSend mailersend+smtp://KEY@default n/a
228228
229229
Note that the protocol is *always* HTTPs and cannot be changed.
230230

231+
.. note::
232+
233+
The specific transports, e.g. ``mailgun+smtp`` are designed to work without any manual configuration.
234+
Changing the port by appending it to your DSN is not supported for any of these ``<provider>+smtp` transports.
235+
If you need to change the port, use the ``smtp`` transport instead, like so:
236+
237+
.. code-block:: env
238+
239+
# .env
240+
MAILER_DSN=smtp://KEY:DOMAIN@smtp.eu.mailgun.org.com:25
241+
231242
High Availability
232243
~~~~~~~~~~~~~~~~~
233244

notifier.rst

Lines changed: 123 additions & 67 deletions
Large diffs are not rendered by default.

notifier/discord.rst

Lines changed: 0 additions & 62 deletions
This file was deleted.

notifier/slack.rst

Lines changed: 0 additions & 194 deletions
This file was deleted.

0 commit comments

Comments
 (0)