From f5234099cd7fdf1dc28232711ab9a04a73de9222 Mon Sep 17 00:00:00 2001 From: Felix De Vliegher Date: Fri, 29 Aug 2008 10:25:35 +0000 Subject: [PATCH] Added %unicode_string_optional% for differences in output between PHP 5 and 6 --- run-tests.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run-tests.php b/run-tests.php index c5de430059..92e2180929 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1725,6 +1725,11 @@ COMMAND $cmd if (isset($section_text['EXPECTF'])) { $wanted_re = preg_quote($wanted_re, '/'); + $wanted_re = str_replace( + array('%unicode_string_optional%'), + version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'Unicode string', + $wanted_re + ); $wanted_re = str_replace( array('%unicode\|string%', '%string\|unicode%'), version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'unicode', -- 2.40.0