From b202d6534da91475f2bed8acd16d2868c0f9771d Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Wed, 14 Feb 2024 08:01:26 +0100
Subject: [PATCH] [Mailer] Fix signed emails breaking the profiler

---
 .../views/Collector/mailer.html.twig          | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

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 f7ea5a1f42ace..ed44d3a567bd4 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -121,14 +121,35 @@
                                                 <h3 class="tab-title">Headers</h3>
                                                 <div class="tab-content">
                                                     <span class="label">Subject</span>
-                                                    <h2 class="m-t-10">{{ message.getSubject() ?? '(empty)' }}</h2>
+                                                    {% if message.subject is defined %}
+                                                        {# Email instance #}
+                                                        <h2 class="m-t-10">{{ message.getSubject() ?? '(empty)' }}</h2>
+                                                    {% elseif message.headers.has('subject') %}
+                                                        <h2 class="m-t-10">{{ message.headers.get('subject').toString()|split(': ', 2)[1]|default('(empty)') }}</h2>
+                                                    {% else %}
+                                                        <h2 class="m-t-10">(empty)</h2>
+                                                    {% endif %}
                                                     <div class="row">
                                                         <div class="col col-4">
                                                             <span class="label">From</span>
-                                                            <pre class="prewrap">{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
+                                                            {% if message.from is defined %}
+                                                                {# Email instance #}
+                                                                <pre class="prewrap">{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
+                                                            {% elseif message.headers.has('from') %}
+                                                                <pre class="prewrap">{{ message.headers.get('from').toString()|split(': ', 2)[1]|default('(empty)') }}</pre>
+                                                            {% else %}
+                                                                <pre class="prewrap">(empty)</pre>
+                                                            {% endif %}
 
                                                             <span class="label">To</span>
-                                                            <pre class="prewrap">{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
+                                                            {% if message.to is defined %}
+                                                                {# Email instance #}
+                                                                <pre class="prewrap">{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}</pre>
+                                                            {% elseif message.headers.has('to') %}
+                                                                <pre class="prewrap">{{ message.headers.get('to').toString()|split(': ', 2)[1]|default('(empty)') }}</pre>
+                                                            {% else %}
+                                                                <pre class="prewrap">(empty)</pre>
+                                                            {% endif %}
                                                         </div>
                                                         <div class="col">
                                                             <span class="label">Headers</span>
@@ -191,6 +212,13 @@
                                                         </div>
                                                     </div>
                                                 {% endfor %}
+                                            {% else %}
+                                                <div class="tab">
+                                                    <h3 class="tab-title">Content</h3>
+                                                    <div class="tab-content">
+                                                        <pre class="prewrap" style="max-height: 600px">{{ message.body().toString() }}</pre>
+                                                    </div>
+                                                </div>
                                             {% endif %}
                                             <div class="tab">
                                                 <h3 class="tab-title">Parts Hierarchy</h3>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/53934.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/53934.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/53934.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/53934.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>