Added %unicode_string_optional% for differences in output between PHP 5 and 6

diff --git a/run-tests.php b/run-tests.php
index c5de43005910de03f4c53032ff61c7bef39ef247..92e2180929b5a943ba930443593ca4aa935fcede 100755 (executable)
--- 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',