From 6d10290267026ab926cdab72bb19b6103abf8efd Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 15 Jun 2020 14:54:23 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@48045 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/PHPMailer/PHPMailer.php | 5 ++++- src/wp-includes/Text/Diff/Engine/shell.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/PHPMailer/PHPMailer.php b/src/wp-includes/PHPMailer/PHPMailer.php index ed14d7c7a2..27af1a937b 100644 --- a/src/wp-includes/PHPMailer/PHPMailer.php +++ b/src/wp-includes/PHPMailer/PHPMailer.php @@ -853,7 +853,7 @@ class PHPMailer private function mailPassthru($to, $subject, $body, $header, $params) { //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 { $subject = $this->encodeHeader($this->secureHeader($subject)); @@ -1401,10 +1401,13 @@ class PHPMailer //Ignore IDE complaints about this line - method signature changed in PHP 5.4 $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); } if (false !== $punycode) { diff --git a/src/wp-includes/Text/Diff/Engine/shell.php b/src/wp-includes/Text/Diff/Engine/shell.php index 91c1843b83..a2ccc70db8 100644 --- a/src/wp-includes/Text/Diff/Engine/shell.php +++ b/src/wp-includes/Text/Diff/Engine/shell.php @@ -83,7 +83,7 @@ class Text_Diff_Engine_shell { 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( $this->_getLines($from_lines, $from_line_no, $match[1] - 1),