More changes to allow the same tests to be used with PHP5 and PHP6

This commit is contained in:
Zoe Slattery 2008-12-06 11:59:36 +00:00
parent e21c6d9540
commit b9eb13ad8a

View File

@ -1734,6 +1734,11 @@ COMMAND $cmd
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
$wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'binary string',
$wanted_re
);
$wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'Unicode string',