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

Merge branch 'PHP-7.0'

Browse source 
* PHP-7.0:
  remove duplicated skipif conditions
This commit is contained in:
Anatol Belski 2016-01-02 13:59:13 +01:00
commit fe99f02437
4 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ IntlDateFormatter::formatObject(): IntlCalendar tests
--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, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
<?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, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
--FILE-- --FILE--

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

@ -3,7 +3,6 @@ IntlDateFormatter::formatObject(): DateTime tests
--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, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
<?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, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
--FILE-- --FILE--

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

@ -3,7 +3,6 @@ IntlDateFormatter: get/setTimeZone()
--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, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
<?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, '55.1') >= 0) die('skip for ICU < 55.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '55.1') >= 0) die('skip for ICU < 55.1'); ?>
--FILE-- --FILE--

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

@ -4,7 +4,6 @@ numfmt_format() icu >= 54.1 && icu < 56.1
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '56.1') >= 0) die('skip for ICU < 56.1'); ?> <?php if (version_compare(INTL_ICU_VERSION, '56.1') >= 0) die('skip for ICU < 56.1'); ?>
<?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, '56.1') >= 0) die('skip for ICU < 56.1'); ?>
--FILE-- --FILE--
<?php <?php