From 4c0a1fcb8d1074cf442f327ce573c0a8daea71d4 Mon Sep 17 00:00:00 2001 From: HypeMC Date: Wed, 14 Feb 2024 08:01:26 +0100 Subject: [PATCH 1/3] [Mailer] Fix signed emails breaking the profiler --- Resources/views/Collector/mailer.html.twig | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Resources/views/Collector/mailer.html.twig b/Resources/views/Collector/mailer.html.twig index f7ea5a1f..ed44d3a5 100644 --- a/Resources/views/Collector/mailer.html.twig +++ b/Resources/views/Collector/mailer.html.twig @@ -121,14 +121,35 @@

Headers

Subject -

{{ message.getSubject() ?? '(empty)' }}

+ {% if message.subject is defined %} + {# Email instance #} +

{{ message.getSubject() ?? '(empty)' }}

+ {% elseif message.headers.has('subject') %} +

{{ message.headers.get('subject').toString()|split(': ', 2)[1]|default('(empty)') }}

+ {% else %} +

(empty)

+ {% endif %}
From - 
{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+ {% if message.from is defined %} + {# Email instance #} + 
{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+ {% elseif message.headers.has('from') %} + 
{{ message.headers.get('from').toString()|split(': ', 2)[1]|default('(empty)') }}
+ {% else %} + 
(empty)
+ {% endif %} To - 
{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+ {% if message.to is defined %} + {# Email instance #} + 
{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
+ {% elseif message.headers.has('to') %} + 
{{ message.headers.get('to').toString()|split(': ', 2)[1]|default('(empty)') }}
+ {% else %} + 
(empty)
+ {% endif %}
Headers @@ -191,6 +212,13 @@
{% endfor %} + {% else %} +
+

Content

+
+ 
{{ message.body().toString() }}
+
+
{% endif %}

Parts Hierarchy

From 04332db20fbb0a2412f3406311b2874f38e9d7ed Mon Sep 17 00:00:00 2001 From: HypeMC Date: Wed, 14 Feb 2024 21:22:24 +0100 Subject: [PATCH 2/3] [Mailer] Simplify fix --- Resources/views/Collector/mailer.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/views/Collector/mailer.html.twig b/Resources/views/Collector/mailer.html.twig index ed44d3a5..3897ea77 100644 --- a/Resources/views/Collector/mailer.html.twig +++ b/Resources/views/Collector/mailer.html.twig @@ -125,7 +125,7 @@ {# Email instance #}

{{ message.getSubject() ?? '(empty)' }}

{% elseif message.headers.has('subject') %} -

{{ message.headers.get('subject').toString()|split(': ', 2)[1]|default('(empty)') }}

+

{{ message.headers.get('subject').bodyAsString()|default('(empty)') }}

{% else %}

(empty)

{% endif %} @@ -136,7 +136,7 @@ {# Email instance #} 
{{ 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 %} @@ -146,7 +146,7 @@ {# Email instance #} 
{{ 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 %} From 2726f86cb1c11cc2e3c8ec1124e3df6e69f505c5 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 12 Feb 2024 18:08:26 +0100 Subject: [PATCH 3/3] [TwigBridge] Fix compat with Twig v3.9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 33d912c4..f4cac4ea 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "symfony/polyfill-php80": "^1.16", "symfony/routing": "^4.4|^5.0|^6.0", "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "twig/twig": "^2.13|~3.8.0" + "twig/twig": "^2.13|^3.0.4" }, "require-dev": { "symfony/browser-kit": "^4.4|^5.0|^6.0",