From 17f0ff22057a028f28b8aa17fadbc7fe4136bf66 Mon Sep 17 00:00:00 2001 From: Michael Stokoe Date: Wed, 18 Dec 2019 15:38:03 +0000 Subject: [PATCH 1/3] Updated config/logging.php (#5179) This adds a default emergency logger path to the logging config file. This change goes hand-in-hand with my changes found here: https://github.com/Stokoe0990/framework/commit/7a03776bc860bde4cdc82e69ab133a755b66dd2d --- config/logging.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/logging.php b/config/logging.php index ad0aba78..088c204e 100644 --- a/config/logging.php +++ b/config/logging.php @@ -95,6 +95,10 @@ return [ 'driver' => 'monolog', 'handler' => NullHandler::class, ], + + 'emergency' => [ + 'path' => storage_path('logs/laravel.log'), + ], ], ]; From c5f9126981fe340edf71de284b27926323d3271b Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Wed, 18 Dec 2019 09:41:11 -0600 Subject: [PATCH 2/3] default email from name to app name (#5178) --- config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index 3c65eb3f..c6a8df81 100644 --- a/config/mail.php +++ b/config/mail.php @@ -57,7 +57,7 @@ return [ 'from' => [ 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => env('MAIL_FROM_NAME', 'Example'), + 'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Example')), ], /* 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 3/3] 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 @@ return [ 'from' => [ 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Example')), + 'name' => env('MAIL_FROM_NAME', 'Example'), ], /*