archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  Further test fixes for ICU >= 58
  Version checks
This commit is contained in:
Anatol Belski 2017-10-20 18:41:14 +02:00
commit b996c5599e
5 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/intl/tests/formatter_get_locale_variant2.phpt
View file

@ -3,6 +3,7 @@ numfmt_get_locale()
--SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU < 58.1'); ?>
--FILE--
<?php

1
ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
View file

@ -4,7 +4,6 @@ IntlTimeZone::getIDForWindowsID basic test
<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
--FILE--
<?php

4
ext/intl/tests/timezone_windowsID_basic.phpt
View file

@ -4,8 +4,8 @@ IntlTimeZone::getWindowsID basic test
<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '52') < 0)die('skip for ICU >= 52'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
--FILE--
<?php

1
ext/intl/tests/timezone_windowsID_basic2.phpt
View file

@ -4,7 +4,6 @@ IntlTimeZone::getWindowsID basic test
<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
--FILE--
<?php

8
ext/intl/tests/uconverter_oop_callback2.phpt
View file

@ -35,12 +35,16 @@ fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_RESET, ...)
toUCallback(REASON_RESET, ...)
toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_RESET, ...)
toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_ILLEGAL, ...)
fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_RESET, ...)
fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_UNASSIGNED, ...)
toUCallback(REASON_RESET, ...)
toUCallback(REASON_RESET, ...)
fromUCallback(REASON_RESET, ...)
@ -51,7 +55,3 @@ toUCallback(REASON_CLOSE, ...)
fromUCallback(REASON_CLOSE, ...)
toUCallback(REASON_CLOSE, ...)
fromUCallback(REASON_CLOSE, ...)
toUCallback(REASON_ILLEGAL, ...)
toUCallback(REASON_ILLEGAL, ...)
fromUCallback(REASON_UNASSIGNED, ...)
fromUCallback(REASON_UNASSIGNED, ...)