From 2d78dadf1589db9c9b2d48de6159adce2d74148a Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 19 Feb 2024 14:30:28 +0000
Subject: [PATCH] Drop Laravel 6 mail view

---
 resources/views/utilities/email.blade.php     | 47 +++++++++++++++++--
 .../utilities/partials/email-l6.blade.php     | 40 ----------------
 .../utilities/partials/email-l7.blade.php     | 44 -----------------
 3 files changed, 43 insertions(+), 88 deletions(-)
 delete mode 100644 resources/views/utilities/partials/email-l6.blade.php
 delete mode 100644 resources/views/utilities/partials/email-l7.blade.php

diff --git a/resources/views/utilities/email.blade.php b/resources/views/utilities/email.blade.php
index 0655b38046..8b5e02ce8a 100644
--- a/resources/views/utilities/email.blade.php
+++ b/resources/views/utilities/email.blade.php
@@ -29,10 +29,49 @@
     <p class="text-sm text-gray mb-4">{!! __('statamic::messages.email_utility_configuration_description', ['path' => config_path('mail.php')]) !!}</p>
     <div class="card p-0">
         <table class="data-table">
-            @if (config('mail.mailers'))
-                @include('statamic::utilities.partials.email-l7')
-            @else
-                @include('statamic::utilities.partials.email-l6')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
+                <td><code>{{ config('mail.default') }}</code></td>
+            </tr>
+            @if (config('mail.default') == 'smtp')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.encryption'))
+                        <code>{{ config('mail.mailers.smtp.encryption') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.username'))
+                        <code>{{ config('mail.mailers.smtp.username') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.password'))
+                        <code>{{ config('mail.mailers.smtp.password') }}</code>
+                    @endif
+                </td>
+            </tr>
+            @endif
+            @if (config('mail.default') == 'sendmail')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
+                <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
+            </tr>
             @endif
             <tr>
                 <th class="pl-4 py-2 w-1/4">{{ __('Default From Address') }}</th>
diff --git a/resources/views/utilities/partials/email-l6.blade.php b/resources/views/utilities/partials/email-l6.blade.php
deleted file mode 100644
index e03b6ef10c..0000000000
--- a/resources/views/utilities/partials/email-l6.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Driver') }}</th>
-    <td><code>{{ config('mail.driver') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.encryption'))
-            <code>{{ config('mail.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.username'))
-            <code>{{ config('mail.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.password'))
-            <code>{{ config('mail.password') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.sendmail') }}</code></td>
-</tr>
diff --git a/resources/views/utilities/partials/email-l7.blade.php b/resources/views/utilities/partials/email-l7.blade.php
deleted file mode 100644
index 7c6f611cfb..0000000000
--- a/resources/views/utilities/partials/email-l7.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
-    <td><code>{{ config('mail.default') }}</code></td>
-</tr>
-@if (config('mail.default') == 'smtp')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.encryption'))
-            <code>{{ config('mail.mailers.smtp.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.username'))
-            <code>{{ config('mail.mailers.smtp.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.password'))
-            <code>{{ config('mail.mailers.smtp.password') }}</code>
-        @endif
-    </td>
-</tr>
-@endif
-@if (config('mail.default') == 'sendmail')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
-</tr>
-@endif