Changeset 60797

Timestamp:

09/24/2025 10:41:39 AM (4 months ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk

Files:

• phpcompat.xml.dist (modified) (1 diff)
• src/wp-includes/PHPMailer/PHPMailer.php (modified) (2 diffs)

trunk/phpcompat.xml.dist

@@ -77 +77 @@
     -->
 
+    <rule ref="PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated">
+        <exclude-pattern>/PHPMailer/PHPMailer\.php$</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated">
+        <exclude-pattern>/PHPMailer/PHPMailer\.php$</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet">
+        <exclude-pattern>/PHPMailer/PHPMailer\.php$</exclude-pattern>
+    </rule>
     <rule ref="PHPCompatibility.FunctionUse.NewFunctions.sodium_crypto_sign_keypair_from_secretkey_and_publickeyFound">
         <exclude-pattern>/sodium_compat/src/Compat\.php$</exclude-pattern>

trunk/src/wp-includes/PHPMailer/PHPMailer.php

@@ -877 +877 @@
     {
         //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 {
@@ -1533 +1533 @@
                 } 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);
                 }