Changeset 48045

Timestamp:

06/15/2020 02:54:23 PM (5 years ago)

Author:

desrosj

Message:

General: Continuing to work towards a passing PHP Compatibility scan.

• Add phpcs:ignore statements to compatibility checks in PHPMailer.
• Remove quotes around the assertion in an assert() call. This will trigger a deprecated notice under certain conditions on PHP 7.2.

Props jrf, desrosj.
See #49922, #48033.

Location:

trunk/src/wp-includes

Files:

• PHPMailer/PHPMailer.php (modified) (2 diffs)
• Text/Diff/Engine/shell.php (modified) (1 diff)

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

@@ -854 +854 @@
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
+        if (ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
             $subject = $this->secureHeader($subject);
         } else {
@@ -1402 +1402 @@
                 $errorcode = 0;
                 if (defined('INTL_IDNA_VARIANT_UTS46')) {
+                    // phpcs:ignore PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet
                     $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
+                    // phpcs:ignore PHPCompatibility.Constants.RemovedConstants.intl_idna_variant_2003Deprecated
                     $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_2003);
                 } else {
+                    // phpcs:ignore PHPCompatibility.ParameterValues.NewIDNVariantDefault.NotSet
                     $punycode = idn_to_ascii($domain, $errorcode);
                 }

trunk/src/wp-includes/Text/Diff/Engine/shell.php

@@ -84 +84 @@
             if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
                 // copied lines
-                assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+                assert($match[1] - $from_line_no == $match[4] - $to_line_no);
                 array_push($edits,
                     new Text_Diff_Op_copy(