Skip to content

Commit 5795665

Browse files
mtravermtraver
authored
Merge pull request #1 from mtraver/intl-tests
Apply commits from php/php-src that update tests for newer ICU versions
2 parents d88f14a + a280766 commit 5795665

File tree

76 files changed

+1218
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1218
-140
lines changed

‎ext/bcmath/tests/bug60377.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
--TEST--
22
bcscale related problem on 64bits platforms
33
--SKIPIF--
4-
<?php if(!extension_loaded("bcmath")) print "skip"; ?>
4+
<?php if(!extension_loaded("bcmath")) die("skip");
5+
if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
56
--FILE--
67
<?php
78
$var48 = bcscale(634314234334311);

‎ext/curl/tests/curl_version_variation1.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
--TEST--
22
Test curl_version() function : usage variations - test values for $ascii argument
33
--SKIPIF--
4-
<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
4+
<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded");
5+
if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
56
--FILE--
67
<?php
78

‎ext/exif/tests/exif_tagname_variation1.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test exif_tagname() function : usage variations - different types for index argument
33
--SKIPIF--
4-
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
4+
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';
5+
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
6+
?>
57
--FILE--
68
<?php
79

‎ext/gd/tests/imagecolorallocate_variation2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if(!extension_loaded('gd')) {
88
if(!function_exists('imagecreatetruecolor')) {
99
die('skip imagecreatetruecolor function is not available');
1010
}
11+
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
1112
?>
1213
--FILE--
1314
<?php

‎ext/gd/tests/imagecolorallocate_variation4.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if(!extension_loaded('gd')) {
88
if(!function_exists('imagecreatetruecolor')) {
99
die('skip imagecreatetruecolor function is not available');
1010
}
11+
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
1112
?>
1213
--FILE--
1314
<?php
@@ -210,4 +211,4 @@ int(657920)
210211

211212
Warning: imagecolorallocate() expects parameter 4 to be long, resource given in %s on line %d
212213
NULL
213-
===DONE===
214+
===DONE===

‎ext/intl/tests/breakiter_getLocale_basic.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
--TEST--
22
IntlBreakIterator::getLocale(): basic test
33
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('intl'))
6-
die('skip intl extension not enabled');
4+
<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) die('skip for ICU < 53.1'); ?>
76
--FILE--
87
<?php
98
ini_set("intl.error_level", E_WARNING);
@@ -18,4 +17,4 @@ var_dump($bi->getLocale(1));
1817
--EXPECT--
1918
string(4) "root"
2019
string(4) "root"
21-
==DONE==
20+
==DONE==

‎ext/intl/tests/breakiter_getLocale_basic2.phpt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--TEST--
2+
IntlBreakIterator::getLocale(): basic test
3+
--SKIPIF--
4+
<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
5+
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
6+
--FILE--
7+
<?php
8+
ini_set("intl.error_level", E_WARNING);
9+
ini_set("intl.default_locale", "pt_PT");
10+
11+
$bi = IntlBreakIterator::createSentenceInstance('pt');
12+
13+
var_dump($bi->getLocale(0));
14+
var_dump($bi->getLocale(1));
15+
?>
16+
==DONE==
17+
--EXPECT--
18+
string(4) "root"
19+
string(2) "pt"
20+
==DONE==

‎ext/intl/tests/bug53512.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) die('skip');
5+
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
6+
?>
57
--FILE--
68
<?php
79

‎ext/intl/tests/bug61487.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
grapheme() str[i]pos limits
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) die('skip');
5+
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
6+
?>
57
--FILE--
68
<?php
79
var_dump(grapheme_stripos(1,1,2147483648));

‎ext/intl/tests/bug62070_2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Bug #62070: Collator::getSortKey() returns garbage
33
--SKIPIF--
44
<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
55
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
6+
<?php if (version_compare(INTL_ICU_VERSION, '62.1') >= 0) die('skip for ICU < 62.1'); ?>
67
--FILE--
78
<?php
89
$s1 = 'Hello';

0 commit comments

Comments
 (0)