diff options
28 files changed, 5 insertions, 79 deletions
diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index 38d7ed76e2..adddc1340f 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -2,8 +2,6 @@ Test date_add() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> ---SKIPIF-- -<?php if (!function_exists('date_add')) echo "skip: date_add() function not found!"; ?> --FILE-- <?php date_default_timezone_set('UTC'); diff --git a/ext/date/tests/date_create-1.phpt b/ext/date/tests/date_create-1.phpt index 365d54dc94..4b156de6e4 100644 --- a/ext/date/tests/date_create-1.phpt +++ b/ext/date/tests/date_create-1.phpt @@ -1,7 +1,5 @@ --TEST-- date_create() function [1] ---SKIPIF-- -<?php if (!function_exists('date_create')) echo "SKIP"; ?> --FILE-- <?php date_default_timezone_set('Europe/Oslo'); diff --git a/ext/date/tests/date_create-2.phpt b/ext/date/tests/date_create-2.phpt index 406a6b0f2c..206a0ab7f9 100644 --- a/ext/date/tests/date_create-2.phpt +++ b/ext/date/tests/date_create-2.phpt @@ -1,7 +1,5 @@ --TEST-- date_create() function [2] ---SKIPIF-- -<?php if (!function_exists('date_create')) echo "SKIP"; ?> --FILE-- <?php date_default_timezone_set("GMT"); diff --git a/ext/date/tests/date_modify-1.phpt b/ext/date/tests/date_modify-1.phpt index c35e430df7..6b3e3ae0c2 100644 --- a/ext/date/tests/date_modify-1.phpt +++ b/ext/date/tests/date_modify-1.phpt @@ -1,7 +1,5 @@ --TEST-- date_modify() function [1] ---SKIPIF-- -<?php if (!function_exists('date_create')) echo "SKIP"; ?> --FILE-- <?php date_default_timezone_set("Pacific/Kwajalein"); diff --git a/ext/date/tests/date_modify-2.phpt b/ext/date/tests/date_modify-2.phpt index cc197fcdc4..40d813539b 100644 --- a/ext/date/tests/date_modify-2.phpt +++ b/ext/date/tests/date_modify-2.phpt @@ -1,7 +1,5 @@ --TEST-- date_modify() function [2] ---SKIPIF-- -<?php if (!function_exists('date_create')) echo "SKIP"; ?> --FILE-- <?php date_default_timezone_set("GMT"); diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index 00e9626198..b6aed7881b 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -2,8 +2,6 @@ Test date_sub() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> ---SKIPIF-- -<?php if (!function_exists('date_sub')) echo "skip: date_sub() function not found!"; ?> --FILE-- <?php date_default_timezone_set('UTC'); diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt index dec63af97b..c64f0e8bdc 100644 --- a/ext/date/tests/strtotime_basic.phpt +++ b/ext/date/tests/strtotime_basic.phpt @@ -1,7 +1,5 @@ --TEST-- strtotime() function - a test to show the difference in behaviour between 'first' and '1', "second" and "2"... ---SKIPIF-- -<?php if (!function_exists('strtotime')) echo "SKIP"; ?> --FILE-- <?php date_default_timezone_set('UTC'); diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt index a1030204ee..6dcb2bf694 100644 --- a/ext/pcre/tests/locales.phpt +++ b/ext/pcre/tests/locales.phpt @@ -3,7 +3,6 @@ Localized match --SKIPIF-- <?php -if (!function_exists('setlocale')) die('skip: setlocale() not available'); if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available'); ?> diff --git a/ext/pcre/tests/skip_001.inc b/ext/pcre/tests/skip_001.inc index b989dbbb9a..35434ece5b 100644 --- a/ext/pcre/tests/skip_001.inc +++ b/ext/pcre/tests/skip_001.inc @@ -1,9 +1,5 @@ <?php -if (!function_exists('setlocale')) { - die('skip: setlocale() not available'); -} - if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) { die('skip pt locale not available'); } diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt index 1adc50a2de..847c37161b 100644 --- a/ext/soap/tests/bugs/bug39815.phpt +++ b/ext/soap/tests/bugs/bug39815.phpt @@ -3,7 +3,6 @@ Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not locale-independen --SKIPIF-- <?php require_once('skipif.inc'); -if (!function_exists('setlocale')) die('skip setlocale() not available'); if (!@setlocale(LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE locale not available'); if (!@setlocale(LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US locale not available'); ?> diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt index a347d9d3d1..1437b8a8a0 100644 --- a/ext/standard/tests/file/file_get_contents_error001.phpt +++ b/ext/standard/tests/file/file_get_contents_error001.phpt @@ -8,8 +8,6 @@ display_errors=false --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); - if (!function_exists("file_get_contents")) - die ("skip file_get_contents function is not found"); if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --FILE-- diff --git a/ext/standard/tests/file/file_get_contents_error002.phpt b/ext/standard/tests/file/file_get_contents_error002.phpt index 47c7b9cd63..8ca1162672 100644 --- a/ext/standard/tests/file/file_get_contents_error002.phpt +++ b/ext/standard/tests/file/file_get_contents_error002.phpt @@ -5,11 +5,6 @@ file_get_contents() test using negative parameter for length (last parameter) "Sylvain R." <sracine@phpquebec.org> --INI-- display_errors=false ---SKIPIF-- -<?php - if (!function_exists("file_get_contents")) - die ("skip file_get_contents function is not found"); -?> --FILE-- <?php var_dump(file_get_contents("http://checkip.dyndns.com",null,null,0,-1)); diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt index f6551fbc23..a2e2758188 100644 --- a/ext/standard/tests/image/image_type_to_extension.phpt +++ b/ext/standard/tests/image/image_type_to_extension.phpt @@ -2,7 +2,6 @@ image_type_to_extension() --SKIPIF-- <?php - if (!function_exists('image_type_to_extension')) die('skip image_type_to_extension() not available'); require_once('skipif_imagetype.inc'); ?> --FILE-- diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt index 38a90c1bb3..199d2c4b58 100644 --- a/ext/standard/tests/image/image_type_to_mime_type.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type.phpt @@ -2,7 +2,6 @@ image_type_to_mime_type() --SKIPIF-- <?php - if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); require_once('skipif_imagetype.inc'); ?> --FILE-- diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt index 9ee91961c2..8e3176ef41 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt @@ -1,9 +1,5 @@ --TEST-- image_type_to_mime_type() ---SKIPIF-- -<?php - if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); -?> --FILE-- <?php diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index fcfd1874a5..007c998e48 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -2,10 +2,6 @@ Test expm1() - Error conditions --INI-- precision=14 ---SKIPIF-- -<?php - function_exists('expm1') or die('skip expm1() is not supported in this build.'); -?> --FILE-- <?php /* Prototype : float expm1 ( float $arg ) diff --git a/ext/standard/tests/strings/bug20934.phpt b/ext/standard/tests/strings/bug20934.phpt index 0d95081d54..121d9b6ecb 100644 --- a/ext/standard/tests/strings/bug20934.phpt +++ b/ext/standard/tests/strings/bug20934.phpt @@ -1,11 +1,5 @@ --TEST-- Bug #20934 (htmlspecialchars returns latin1 from UTF-8) ---SKIPIF-- -<?php -if (!function_exists("utf8_encode") || !function_exists("utf8_decode")) { - die("SKIP Neither utf8_encode() nor utf8_decode() are available"); -} -?> --FILE-- <?php $str = utf8_encode("\xe0\xe1"); diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index f099850213..f769616f56 100644 --- a/ext/standard/tests/strings/bug73058.phpt +++ b/ext/standard/tests/strings/bug73058.phpt @@ -1,11 +1,5 @@ --TEST-- Bug #73058 crypt broken when salt is 'too' long ---SKIPIF-- -<?php -if (!function_exists('crypt'))) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php $pass = 'secret'; diff --git a/ext/standard/tests/strings/crypt.phpt b/ext/standard/tests/strings/crypt.phpt index 3dcff2eaf2..f64b61cb5f 100644 --- a/ext/standard/tests/strings/crypt.phpt +++ b/ext/standard/tests/strings/crypt.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_blowfish.phpt b/ext/standard/tests/strings/crypt_blowfish.phpt index 0bf0d1949e..de2cf637df 100644 --- a/ext/standard/tests/strings/crypt_blowfish.phpt +++ b/ext/standard/tests/strings/crypt_blowfish.phpt @@ -2,7 +2,7 @@ Official blowfish tests (http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c) --SKIPIF-- <?php -if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { +if (!defined("CRYPT_BLOWFISH")) { die("SKIP crypt()-blowfish is not available"); } ?> diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt index 4436700104..020b8afc85 100644 --- a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt +++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt @@ -2,7 +2,7 @@ Test Blowfish crypt() with invalid rounds --SKIPIF-- <?php -if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { +if (!defined("CRYPT_BLOWFISH")) { die("SKIP crypt()-blowfish is not available"); } ?> diff --git a/ext/standard/tests/strings/crypt_chars.phpt b/ext/standard/tests/strings/crypt_chars.phpt index 09cd868216..c4e65016f1 100644 --- a/ext/standard/tests/strings/crypt_chars.phpt +++ b/ext/standard/tests/strings/crypt_chars.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function - characters > 0x80 ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php var_dump(crypt("À1234abcd", "99")); diff --git a/ext/standard/tests/strings/crypt_des_error.phpt b/ext/standard/tests/strings/crypt_des_error.phpt index f480efc470..6c77ccd9e0 100644 --- a/ext/standard/tests/strings/crypt_des_error.phpt +++ b/ext/standard/tests/strings/crypt_des_error.phpt @@ -1,11 +1,5 @@ --TEST-- crypt(): *0 should return *1 ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index 37bc31bd8b..644ab88169 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -2,7 +2,7 @@ crypt() SHA-256 --SKIPIF-- <?php -if (!function_exists('crypt') || !defined("CRYPT_SHA256")) { +if (!defined("CRYPT_SHA256")) { die("SKIP crypt()-sha256 is not available"); } ?> diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index 615376e6b2..c94ebc5aea 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -2,7 +2,7 @@ crypt() SHA-512 --SKIPIF-- <?php -if (!function_exists('crypt') || !defined("CRYPT_SHA512")) { +if (!defined("CRYPT_SHA512")) { die("SKIP crypt()-sha512 is not available"); } ?> diff --git a/ext/standard/tests/strings/crypt_variation1.phpt b/ext/standard/tests/strings/crypt_variation1.phpt index 3315f035ed..3f351a6de4 100644 --- a/ext/standard/tests/strings/crypt_variation1.phpt +++ b/ext/standard/tests/strings/crypt_variation1.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function - long salt ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index 8adc2e3ade..0eec563a39 100644 --- a/ext/standard/tests/strings/moneyformat.phpt +++ b/ext/standard/tests/strings/moneyformat.phpt @@ -2,7 +2,7 @@ money_format test --SKIPIF-- <?php - if (!function_exists('money_format') || !function_exists('setlocale')) { + if (!function_exists('money_format')) { die("SKIP money_format - not supported\n"); } diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt index 3b0ed8a77f..0b76404ccb 100644 --- a/ext/standard/tests/time/001.phpt +++ b/ext/standard/tests/time/001.phpt @@ -3,7 +3,6 @@ microtime() function --SKIPIF-- <?php if (!function_exists('microtime')) die('skip microtime() not available'); - die('warn system dependent'); ?> --FILE-- <?php |