From b27e369cb25445784bc014d6fa731558beaf320d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 24 Sep 2025 10:43:41 +0000
Subject: [PATCH] Coding Standards: Move specific sniff exclusions for
 PHPMailer to the config file.

This aims to make future updates of the library easier.

Follow-up to [48045], [51635].

See #63168.
Built from https://develop.svn.wordpress.org/trunk@60797


git-svn-id: http://core.svn.wordpress.org/trunk@60133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/PHPMailer/PHPMailer.php | 4 +---
 wp-includes/version.php             | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/wp-includes/PHPMailer/PHPMailer.php b/wp-includes/PHPMailer/PHPMailer.php
index 510930685c..2444bcf351 100644
--- a/wp-includes/PHPMailer/PHPMailer.php
+++ b/wp-includes/PHPMailer/PHPMailer.php
@@ -876,7 +876,7 @@ class PHPMailer
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if ((int)ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+        if ((int)ini_get('mbstring.func_overload') & 1) {
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1532,11 +1532,9 @@ class PHPMailer
                     );
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
                     //Fall back to this old, deprecated/removed encoding
-                    // phpcs:ignore PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
                 } else {
                     //Fall back to a default we don't know about
-                    // phpcs:ignore PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet
                     $punycode = idn_to_ascii($domain, $errorcode);
                 }
                 if (false !== $punycode) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8eb8977bd1..f7bac02679 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60796';
+$wp_version = '6.9-alpha-60797';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.