com php-src: fix to work on different ICU versions: ext/intl/tests/timezone_toDateTimeZone_basic.phpt

From: Date: Sun, 06 Apr 2014 02:30:55 +0000
Subject: com php-src: fix to work on different ICU versions: ext/intl/tests/timezone_toDateTimeZone_basic.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76712@lists.php.net to get a copy of this message
Commit: 8b0d133b1396de4ddcfd86076a0a63ebc25c5396 Author: Stanislav Malyshev <stas@php.net> Sat, 5 Apr 2014 19:30:13 -0700 Parents: a3d6f28312f5a40fe8e8452f7a2db5cb7c53cce5 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b0d133b1396de4ddcfd86076a0a63ebc25c5396 Log: fix to work on different ICU versions Changed paths: M ext/intl/tests/timezone_toDateTimeZone_basic.phpt Diff: diff --git a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt index d22aa68..76981a4 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt @@ -26,7 +26,7 @@ do_test(IntlTimeZone::createTimeZone('GMT+0405'), true); --EXPECTF-- string(3) "CET" int(3600000) -string(13) "Europe/Berlin" +string(%d) "%rEurope\/Berlin|CET%r" int(3600) string(16) "Europe/Amsterdam" int(3600000)

« previous php.cvs (#76712) next »