From: Felix De Vliegher <felixdv@php.net>
Date: Fri, 29 Aug 2008 10:25:35 +0000 (+0000)
Subject: Added %unicode_string_optional% for differences in output between PHP 5 and 6
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~541
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5234099cd7fdf1dc28232711ab9a04a73de9222;p=php

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

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',