10000 minor #53950 [Mailer] Simplify fix (HypeMC) · symfony/symfony@8802b0e · GitHub
[go: up one dir, main page]
Skip to content

Commit 8802b0e

Browse files
nicolas-grekasnicolas-grekas
committed
minor #53950 [Mailer] Simplify fix (HypeMC)
This PR was merged into the 5.4 branch. Discussion ---------- [Mailer] Simplify fix | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Follow-up to #53934, I didn't notice the `getBodyAsString()` method, it simplifies the code nicely. For 6.4+: HypeMC@1bb254d ```diff diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig index a0d2d63..e220e73 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig @@ -282,7 +282,7 @@ {% if event.message.subject is defined %} {{ event.message.getSubject() ?? '(No subject)' }} {% elseif event.message.headers.has('subject') %} - {{ event.message.headers.get('subject').toString()|split(': ', 2)[1]|default('(No subject)') }} + {{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }} {% else %} (No subject) {% endif %} @@ -291,7 +291,7 @@ {% if event.message.to is defined %} {{ event.message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }} {% elseif event.message.headers.has('to') %} - {{ event.message.headers.get('to').toString()|split(': ', 2)[1]|default('(empty)') }} + {{ event.message.headers.get('to').bodyAsString()|default('(empty)') }} {% else %} (empty) {% endif %} @@ -342,7 +342,7 @@ {% if message.subject is defined %} {{ message.getSubject() ?? '(No subject)' }} {% elseif message.headers.has('subject') %} - {{ message.headers.get('subject').toString()|split(': ', 2)[1]|default('(No subject)') }} + {{ message.headers.get('subject').bodyAsString()|default('(No subject)') }} {% else %} (No subject) {% endif %} @@ -353,7 +353,7 @@ {% if message.from is defined %} {{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }} {% elseif message.headers.has('from') %} - {{ message.headers.get('from').toString()|split(': ', 2)[1]|default('(empty)') }} + {{ message.headers.get('from').bodyAsString()|default('(empty)') }} {% else %} (empty) {% endif %} @@ -363,7 +363,7 @@ {% if message.to is defined %} {{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }} {% elseif message.headers.has('to') %} - {{ message.headers.get('to').toString()|split(': ', 2)[1]|default('(empty)') }} + {{ message.headers.get('to').bodyAsString()|default('(empty)') }} {% else %} (empty) {% endif %} ``` Commits ------- fc7c992 [Mailer] Simplify fix
2 parents f44d074 + fc7c992 commit 8802b0e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{# Email instance #}
126126
<h2 class="m-t-10">{{ message.getSubject() ?? '(empty)' }}</h2>
127127
{% elseif message.headers.has('subject') %}
128-
<h2 class="m-t-10">{{ message.headers.get('subject').toString()|split(': ', 2)[1]|default('(empty)') }}</h2>
128+
<h2 class="m-t-10">{{ message.headers.get('subject').bodyAsString()|default('(empty)') }}</h2>
129129
{% else %}
130130
<h2 class="m-t-10">(empty)</h2>
131131
{% endif %}
@@ -136,7 +136,7 @@
136136
{# Email instance #}
137137
<pre class="prewrap">{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
138138
{% elseif message.headers.has('from') %}
139-
<pre class="prewrap">{{ message.headers.get('from').toString()|split(': ', 2)[1]|default('(empty)') }}</pre>
139+
<pre class="prewrap">{{ message.headers.get('from').bodyAsString()|default('(empty)') }}</pre>
140140
{% else %}
141141
<pre class="prewrap">(empty)</pre>
142142
{% endif %}
@@ -146,7 +146,7 @@
146146
{# Email instance #}
147147
6BD9 <pre class="prewrap">{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
148148
{% elseif message.headers.has('to') %}
149-
<pre class="prewrap">{{ message.headers.get('to').toString()|split(': ', 2)[1]|default('(empty)') }}</pre>
149+
<pre class="prewrap">{{ message.headers.get('to').bodyAsString()|default('(empty)') }}</pre>
150150
{% else %}
151151
<pre class="prewrap">(empty)</pre>
152152
{% endif %}

0 commit comments

Comments
 (0)
0