refactor: Make use of fallback value in config and adapt usage in mailable

Author: DevDavido

src/App/Mail/ExceptionOccurred.php

@@ -35,26 +35,6 @@ public function build()
         $fromSender = config('exceptions.emailExceptionFrom');
         $subject = config('exceptions.emailExceptionSubject');
 
-        if ($emailsTo[0] === null) {
-            $emailsTo = config('exceptions.emailExceptionsToDefault');
-        }
-
-        if ($ccEmails[0] === null) {
-            $ccEmails = config('exceptions.emailExceptionCCtoDefault');
-        }
-
-        if ($bccEmails[0] === null) {
-            $bccEmails = config('exceptions.emailExceptionBCCtoDefault');
-        }
-
-        if (! $fromSender) {
-            $fromSender = config('exceptions.emailExceptionFromDefault');
-        }
-
-        if (! $subject) {
-            $subject = config('exceptions.emailExceptionSubjectDefault');
-        }
-
         return $this->from($fromSender)
                     ->to($emailsTo)
                     ->cc($ccEmails)

src/config/exceptions.php

@@ -10,9 +10,7 @@
     | Enable/Disable exception email notifications
     |
     */
-
-    'emailExceptionEnabled'        => env('EMAIL_EXCEPTION_ENABLED'),
-    'emailExceptionEnabledDefault' => true,
+    'emailExceptionEnabled' => env('EMAIL_EXCEPTION_ENABLED', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -22,9 +20,7 @@
     | This is the email your exception will be from.
     |
     */
-
-    'emailExceptionFrom'        => env('EMAIL_EXCEPTION_FROM'),
-    'emailExceptionFromDefault' => 'email@email.com',
+    'emailExceptionFrom' => env('EMAIL_EXCEPTION_FROM', ''),
 
     /*
     |--------------------------------------------------------------------------
@@ -34,9 +30,7 @@
     | This is the email(s) the exceptions will be emailed to.
     |
     */
-
-    'emailExceptionsTo'        => env('EMAIL_EXCEPTION_TO'),
-    'emailExceptionsToDefault' => 'email@email.com',
+    'emailExceptionsTo' => env('EMAIL_EXCEPTION_TO', ''),
 
     /*
     |--------------------------------------------------------------------------
@@ -46,9 +40,7 @@
     | This is the email(s) the exceptions will be CC emailed to.
     |
     */
-
-    'emailExceptionCCto'        => env('EMAIL_EXCEPTION_CC'),
-    'emailExceptionCCtoDefault' => [],
+    'emailExceptionCCto' => env('EMAIL_EXCEPTION_CC', []),
 
     /*
     |--------------------------------------------------------------------------
@@ -58,9 +50,7 @@
     | This is the email(s) the exceptions will be BCC emailed to.
     |
     */
-
-    'emailExceptionBCCto'        => env('EMAIL_EXCEPTION_BCC'),
-    'emailExceptionBCCtoDefault' => [],
+    'emailExceptionBCCto' => env('EMAIL_EXCEPTION_BCC', []),
 
     /*
     |--------------------------------------------------------------------------
@@ -70,9 +60,7 @@
     | This is the subject of the exception email
     |
     */
-
-    'emailExceptionSubject'        => env('EMAIL_EXCEPTION_SUBJECT'),
-    'emailExceptionSubjectDefault' => 'Error on '.config('app.env'),
+    'emailExceptionSubject' => env('EMAIL_EXCEPTION_SUBJECT', 'Error on ' . config('app.env')),
 
     /*
     |--------------------------------------------------------------------------
@@ -82,7 +70,6 @@
     | This is the view that will be used for the email.
     |
     */
-
     'emailExceptionView' => 'emails.exception',
 
 ];