From 16bdb9b52255539950967e2e2c966909f4885a01 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Tue, 21 Feb 2023 14:29:02 +0000 Subject: [PATCH 1/2] [skip ci] Update NEWS with bugfixes backported from 8.1 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index aec420109c2..2e86f6acded 100644 --- a/NEWS +++ b/NEWS @@ -71,6 +71,7 @@ PHP NEWS . Fix incorrect check in cs_8559_5 in map_from_unicode(). (nielsdos) . Fix bug GH-9697 for reset/end/next/prev() attempting to move pointer of properties table for certain internal classes such as FFI classes + . Fix incorrect error check in browsecap for pcre2_match(). (nielsdos) - Streams: . Fixed bug GH-10370 (File corruption in _php_stream_copy_to_stream_ex when @@ -81,6 +82,7 @@ PHP NEWS - Tidy: . Fix memory leaks when attempting to open a non-existing file or a file over 4GB. (Girgias) + . Add missing error check on tidyLoadConfig. (nielsdos) 14 Feb 2023, PHP 8.2.3 From 74c880edd12628c581720ae64a822a7b12e5388f Mon Sep 17 00:00:00 2001 From: nielsdos <7771979+nielsdos@users.noreply.github.com> Date: Mon, 20 Feb 2023 17:05:40 +0100 Subject: [PATCH 2/2] Fix Tidy tests failing due to different spelling On my system, with Tidy 5.7.45, I get the following error diff for two tests: 002+ line 1 column 7 - Error: is not recognised! 002- line 1 column 7 - Error: is not recognized! As we can see, the spelling of recognised is different. Use an EXPECTF and %c to mitigate this issue. Signed-off-by: George Peter Banyard --- ext/tidy/tests/006.phpt | 4 ++-- ext/tidy/tests/008.phpt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt index 6197f6d3625..a01121deee4 100644 --- a/ext/tidy/tests/006.phpt +++ b/ext/tidy/tests/006.phpt @@ -8,9 +8,9 @@ tidy echo tidy_get_error_buffer($a); ?> ---EXPECT-- +--EXPECTF-- line 1 column 1 - Warning: missing declaration -line 1 column 7 - Error: is not recognized! +line 1 column 7 - Error: is not recogni%ced! line 1 column 7 - Warning: discarding unexpected line 1 column 17 - Warning: discarding unexpected line 1 column 7 - Warning: inserting missing 'title' element diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt index b6cf26a521a..bb3b779b67b 100644 --- a/ext/tidy/tests/008.phpt +++ b/ext/tidy/tests/008.phpt @@ -7,9 +7,9 @@ tidy $a = tidy_parse_string(""); echo $a->errorBuffer; ?> ---EXPECT-- +--EXPECTF-- line 1 column 1 - Warning: missing declaration -line 1 column 7 - Error: is not recognized! +line 1 column 7 - Error: is not recogni%ced! line 1 column 7 - Warning: discarding unexpected line 1 column 17 - Warning: discarding unexpected line 1 column 7 - Warning: inserting missing 'title' element