Skip to content

Commit d19e036

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Update section setting headers globally Documenting the __root__ section
2 parents 30036c3 + d7bf00a commit d19e036

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

mailer.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,12 @@ and headers.
542542
$mailer->header('X-Custom-Header')->value('foobar');
543543
};
544544
545+
.. caution::
546+
547+
Some third-party providers don't support the usage of keywords like ``from``
548+
in the ``headers``. Check out your provider's documentation before setting
549+
any global header.
550+
545551
Handling Sending Failures
546552
-------------------------
547553

@@ -1414,3 +1420,4 @@ you can use the built in assertions::
14141420
.. _`PEM encoded`: https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail
14151421
.. _`default_socket_timeout`: https://www.php.net/manual/en/filesystem.configuration.php#ini.default-socket-timeout
14161422
.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt
1423+
.. _`Mailjet API V3`: https://dev.mailjet.com/email/guides/send-api-v31/#add-email-headers

performance.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,14 @@ Sections are a way to split the profile timeline into groups. Example::
334334
$this->stopwatch->start('processing-file');
335335
$this->stopwatch->stopSection('parsing');
336336

337+
All events that don't belong to any named section are added to the special section
338+
called ``__root__``. This way you can get all stopwatch events, even if you don't
339+
know their names, as follows::
340+
341+
foreach($this->stopwatch->getSectionEvents('__root__') as $event) {
342+
echo (string) $event;
343+
}
344+
337345
Learn more
338346
----------
339347

0 commit comments

Comments
 (0)