From 14cec1e9a35f03bbfb7826a212ffbac29fe0fc1e Mon Sep 17 00:00:00 2001
From: taylorotwell <463230+taylorotwell@users.noreply.github.com>
Date: Tue, 8 Apr 2025 18:47:30 +0000
Subject: [PATCH 1/2] Update CHANGELOG

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afb514cdd92..20adc1d4a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/laravel/compare/v12.0.4...12.x)
+## [Unreleased](https://github.com/laravel/laravel/compare/v12.0.5...12.x)
+
+## [v12.0.5](https://github.com/laravel/laravel/compare/v12.0.4...v12.0.5) - 2025-04-02
+
+* [12.x] Update `config/mail.php` to match the latest core configuration by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/laravel/pull/6594
 
 ## [v12.0.4](https://github.com/laravel/laravel/compare/v12.0.3...v12.0.4) - 2025-03-31
 

From 7a7015534e6cdde94a8d9e224b98a20735b11491 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Tue, 8 Apr 2025 13:50:02 -0500
Subject: [PATCH 2/2] use in memory database by default

---
 phpunit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 506b9a38ec7..61c031c478e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,8 +22,8 @@
         <env name="APP_MAINTENANCE_DRIVER" value="file"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_STORE" value="array"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>