com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/intl/test s/dateformat_clone.phpt

Commit: 105a9a9d455a29951add13f5add9e0b59520f79e Author: Anatoliy Belsky <ab@php.net> Wed, 28 Mar 2012 14:01:14 +0200 Parents: d406f2b034a3b41e94aaf7bea0535aca196853d7 103995ba22ed13e5924acdad91a8dc444d72cde1 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=105a9a9d455a29951add13f5add9e0b59520f79e Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug #61448 intl tests fail with icu >= 4.8 Bugs: https://bugs.php.net/61448 Changed paths: MM ext/intl/tests/dateformat_clone.phpt Diff: 105a9a9d455a29951add13f5add9e0b59520f79e diff --combined ext/intl/tests/dateformat_clone.phpt index 886a98f,f060444..f060444 mode 100644,100755..100644 --- a/ext/intl/tests/dateformat_clone.phpt +++ b/ext/intl/tests/dateformat_clone.phpt @@@ -1,7 -1,8 +1,8 @@@ --TEST-- - Cloning datefmt + Cloning datefmt icu <= 4.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> + <?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?> --FILE-- <?php include_once( 'ut_common.inc' );