Merge branch '9.8.x' into 9.x

orchestral · Dec 18, 2024 · fde5cbf · fde5cbf
2 parents 297aa85 + 776e06e
commit fde5cbf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG-9.x.md b/CHANGELOG-9.x.md
@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 9.8.1
+
+Released: 2024-12-18
+
+### Changes
+
+* Update skeleton to match v11.5.0.
+
 ## 9.8.0
 
 Released: 2024-12-15

diff --git a/laravel/.env.example b/laravel/.env.example
@@ -49,11 +49,11 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=log
+MAIL_SCHEME=null
 MAIL_HOST=127.0.0.1
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="[email protected]"
 MAIL_FROM_NAME="${APP_NAME}"
 

diff --git a/laravel/config/mail.php b/laravel/config/mail.php
@@ -39,10 +39,10 @@
 
         'smtp' => [
             'transport' => 'smtp',
+            'scheme' => env('MAIL_SCHEME'),
             'url' => env('MAIL_URL'),
             'host' => env('MAIL_HOST', '127.0.0.1'),
             'port' => env('MAIL_PORT', 2525),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,