From b2734a9c313ac637e9b8cffa80f9fa9d3da96a09 Mon Sep 17 00:00:00 2001
From: Anton Komarev <1849174+antonkomarev@users.noreply.github.com>
Date: Wed, 18 Dec 2019 20:17:32 +0300
Subject: [PATCH] Add MAIL_FROM_ADDRESS & MAIL_FROM_NAME to .env file (#5180)

---
 .env.example    | 2 ++
 config/mail.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index a09f5cb4..39e35b24 100644
--- a/.env.example
+++ b/.env.example
@@ -29,6 +29,8 @@ MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
diff --git a/config/mail.php b/config/mail.php
index c6a8df81..3c65eb3f 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -57,7 +57,7 @@
 
     'from' => [
         'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-        'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Example')),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
     /*