From 5f61eebf7a7a69e7ecfa87b5fe3ab49ccf4d3d56 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 5 Nov 2025 09:34:14 -0500 Subject: [PATCH] ext/pcre/tests: support libpcre2-10.47 In the latest version of libpcre2, the offsets appearing in some "compilation failed" warnings have increased by one, as a result of https://github.com/PCRE2Project/pcre2/pull/756 This is causing spurious test failures, so in this commit we replace the hard-coded offsets by a regex that matches both values. Gentoo-bug: https://bugs.gentoo.org/965018 --- ext/pcre/tests/grep2.phpt | 2 +- ext/pcre/tests/pcre_extra.phpt | 4 ++-- ext/pcre/tests/split.phpt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt index 9721dfbd9eec1..a953b13c49d54 100644 --- a/ext/pcre/tests/grep2.phpt +++ b/ext/pcre/tests/grep2.phpt @@ -21,7 +21,7 @@ var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR); ?> --EXPECTF-- -Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %sgrep2.php on line %d +Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset %r(0|1)%r in %sgrep2.php on line %d bool(false) array(3) { [5]=> diff --git a/ext/pcre/tests/pcre_extra.phpt b/ext/pcre/tests/pcre_extra.phpt index 730c7299390cb..660e0a1488a1d 100644 --- a/ext/pcre/tests/pcre_extra.phpt +++ b/ext/pcre/tests/pcre_extra.phpt @@ -8,8 +8,8 @@ var_dump(preg_match('/\y/X', '\y')); ?> --EXPECTF-- -Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset 1 in %spcre_extra.php on line 3 +Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset %r(1|2)%r in %spcre_extra.php on line 3 bool(false) -Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset 1 in %spcre_extra.php on line 4 +Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset %r(1|2)%r in %spcre_extra.php on line 4 bool(false) diff --git a/ext/pcre/tests/split.phpt b/ext/pcre/tests/split.phpt index df4b9af92f2f9..27f1c85b433ea 100644 --- a/ext/pcre/tests/split.phpt +++ b/ext/pcre/tests/split.phpt @@ -16,7 +16,7 @@ var_dump(preg_split('/\d*/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY)); ?> --EXPECTF-- -Warning: preg_split(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %ssplit.php on line %d +Warning: preg_split(): Compilation failed: quantifier does not follow a repeatable item at offset %r(0|1)%r in %ssplit.php on line %d bool(false) array(3) { [0]=>