lbarnaud Mon Sep 8 09:23:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
MFH: run-tests.php: Added %u|b% placeholder, like %unicode|string%, for
array keys in var_dump() output.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.45&r2=1.226.2.37.2.35.2.46&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.45
php-src/run-tests.php:1.226.2.37.2.35.2.46
--- php-src/run-tests.php:1.226.2.37.2.35.2.45 Sat Aug 30 11:25:34 2008
+++ php-src/run-tests.php Mon Sep 8 09:23:51 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.45 2008/08/30 11:25:34 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.46 2008/09/08 09:23:51 lbarnaud Exp
$ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -609,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.45
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.46
$' . "\n";
exit(1);
default:
@@ -1736,6 +1736,11 @@
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'unicode',
$wanted_re
);
+ $wanted_re = str_replace(
+ array('%u\|b%', '%b\|u%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1
? '' : 'u',
+ $wanted_re
+ );
// Stick to basics
$wanted_re = str_replace('%e', '\\' .
DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
