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.0' into PHP-7.1

Browse source 
* PHP-7.0:
  Fix version checks in tests
This commit is contained in:
Anatol Belski 2017-10-20 15:25:01 +02:00
commit ae6d877f54
10 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/intl/tests/breakiter_getPartsIterator_basic.phpt
View file

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

2
ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
View file

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

2
ext/intl/tests/breakiter_preceding_basic.phpt
View file

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

2
ext/intl/tests/breakiter_preceding_basic2.phpt
View file

@ -4,7 +4,7 @@ IntlBreakIterator::preceding(): basic test, ICU >= 58.1
<?php <?php
if (!extension_loaded('intl')) if (!extension_loaded('intl'))
die('skip intl extension not enabled'); die('skip intl extension not enabled');
if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
--FILE-- --FILE--
<?php <?php
ini_set("intl.error_level", E_WARNING); ini_set("intl.error_level", E_WARNING);

2
ext/intl/tests/dateformat_create_cal_arg_variant4.phpt
View file

@ -4,7 +4,7 @@ IntlDateFormatter: several forms of the calendar arg
<?php <?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
--FILE-- --FILE--
<?php <?php
ini_set("intl.error_level", E_WARNING); ini_set("intl.error_level", E_WARNING);

3
ext/intl/tests/dateformat_create_cal_arg_variant5.phpt
View file

@ -3,8 +3,7 @@ IntlDateFormatter: several forms of the calendar arg
--SKIPIF-- --SKIPIF--
<?php <?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?>
--FILE-- --FILE--
<?php <?php
ini_set("intl.error_level", E_WARNING); ini_set("intl.error_level", E_WARNING);

2
ext/intl/tests/dateformat_get_set_calendar_variant4.phpt
View file

@ -4,7 +4,7 @@ IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
<?php <?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
--FILE-- --FILE--
<?php <?php
ini_set("intl.error_level", E_WARNING); ini_set("intl.error_level", E_WARNING);

3
ext/intl/tests/dateformat_get_set_calendar_variant5.phpt
View file

@ -3,8 +3,7 @@ IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
--SKIPIF-- --SKIPIF--
<?php <?php
if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?> if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?>
--FILE-- --FILE--
<?php <?php
ini_set("intl.error_level", E_WARNING); ini_set("intl.error_level", E_WARNING);

2
ext/intl/tests/uconverter_oop_callback.phpt
View file

@ -2,7 +2,7 @@
UConverter::convert() w/ Callback Reasons UConverter::convert() w/ Callback Reasons
--SKIPIF-- --SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
--FILE-- --FILE--
<?php <?php
class MyConverter extends UConverter { class MyConverter extends UConverter {

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

@ -2,7 +2,7 @@
UConverter::convert() w/ Callback Reasons UConverter::convert() w/ Callback Reasons
--SKIPIF-- --SKIPIF--
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
--FILE-- --FILE--
<?php <?php
class MyConverter extends UConverter { class MyConverter extends UConverter {