From d1ac35d784bf9f5e61b424901d5a014967f15b12 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 15 Oct 2025 18:49:08 +0200
Subject: [PATCH] 6.12.0

---
 README.md         |  2 +-
 VERSION           |  2 +-
 changelog.md      | 32 ++++++++++++++++++++++++++++++++
 src/PHPMailer.php |  2 +-
 src/POP3.php      |  2 +-
 src/SMTP.php      |  2 +-
 6 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 862a4e1a..646649c9 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ This software is distributed under the [LGPL 2.1](https://www.gnu.org/licenses/o
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.10.0"
+"phpmailer/phpmailer": "^6.12.0"
 ```
 
 or run
diff --git a/VERSION b/VERSION
index cf79bf90..d4e6cb42 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.10.0
+6.12.0
diff --git a/changelog.md b/changelog.md
index e19084cb..06fb7438 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,37 @@
 # PHPMailer Change Log
 
+## Version 7.0.0 (October 15th, 2025)
+
+This is exactly the same as 6.11.1 but bumps the major version number to indicate the presence of a BC break in child
+classes. Specifically, `lang()`, `setLanguage()`, and `$language` are now static, and should be called statically.
+
+## Version 6.12.0 (October 15th, 2025)
+This is exactly the same as 6.10.0, reverting all the changes in 6.11.0 and 6.11.1, which inadvertently introduced a BC break affecting child classes. 6.11.1 has been re-released as 7.0.0.
+
+> [!IMPORTANT]
+> If you have code that depends on the changes that were in 6.11.0 and 6.11.1, please upgrade to 7.0.0 instead.
+
+## Version 6.11.1 (September 30th, 2025)
+* Avoid function signature problems with the deprecation of `$useimap` in `parseAddresses`.
+
+## Version 6.11.0 (September 29th, 2025)
+
+* Add support for [RFC4954](https://www.rfc-editor.org/rfc/rfc4954#section-4) two-part authentication for large XOAUTH2
+  tokens.
+* Also support empty tokens.
+* Avoid bogus static analyser deprecation warnings in `setFrom`.
+* Make language loading entirely static, thanks to @SirLouen.
+* Emit warnings when `parseAddresses()` is used without the IMAP extension.
+* Handle `mb_decode_mimeheader` changes from PHP 8.3+.
+* Deprecate the charset param to parseAddresses.
+* Fix PHP 8.5 linting issue.
+* Don't use `-t` switch when calling qmail.
+* Checking for interrupted system calls now works in languages other than English.
+* Add support for extracting gmail transaction IDs after sending.
+* For consistency, the protected `ReplyTo` property has been changed to match the format used for other address arrays.
+* Fix line length issues when using S/MIME signing.
+* Pin action runners to exact versions to avoid unexpected upstream changes.
+
 ## Version 6.10.0 (April 24th, 2025)
 * Add support for [RFC 6530 SMTPUTF8](https://www.rfc-editor.org/rfc/rfc6530), permitting use of UTF-8 Unicode characters everywhere, thanks to @arnt and ICANN. See `SMTPUTF8.md` for details.
 * More reliable checking for multibyte support.
diff --git a/src/PHPMailer.php b/src/PHPMailer.php
index 2444bcf3..4b3f34c8 100644
--- a/src/PHPMailer.php
+++ b/src/PHPMailer.php
@@ -768,7 +768,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.10.0';
+    const VERSION = '6.12.0';
 
     /**
      * Error severity: message only, continue processing.
diff --git a/src/POP3.php b/src/POP3.php
index 1190a1e2..4d3e8db2 100644
--- a/src/POP3.php
+++ b/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.10.0';
+    const VERSION = '6.12.0';
 
     /**
      * Default POP3 port number.
diff --git a/src/SMTP.php b/src/SMTP.php
index 7226ee93..d8749c5b 100644
--- a/src/SMTP.php
+++ b/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.10.0';
+    const VERSION = '6.12.0';
 
     /**
      * SMTP line break constant.