diff options
| author | Xinchen Hui <laruence@php.net> | 2013-05-09 15:57:44 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-05-09 15:57:44 +0800 |
| commit | b3f6cc20e009e04695b6ce761222283c5af4dcdb (patch) | |
| tree | ac7389dae68d6721e2844c6aa4ad78080b38fa9c | |
| parent | 98302ee3cc880bca26e26c7377c311002bd2b43e (diff) | |
| parent | 699dc04c5597a6dbd5d4fac43096d01ea37e6069 (diff) | |
| download | php-git-b3f6cc20e009e04695b6ce761222283c5af4dcdb.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/filter/tests/bug49510.phpt | 4 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_str_functions_opt-parameter.phpt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/filter/tests/bug49510.phpt b/ext/filter/tests/bug49510.phpt index 3f365cc431..340c1ccd6b 100644 --- a/ext/filter/tests/bug49510.phpt +++ b/ext/filter/tests/bug49510.phpt @@ -1,5 +1,7 @@ --TEST-- -#49510 boolean validation fails with FILTER_NULL_ON_FAILURE +Bug #49510 boolean validation fails with FILTER_NULL_ON_FAILURE +--SKIPIF-- +<?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- <?php var_dump(filter_var(false, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); diff --git a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt index 5fb642f9b2..6219e585eb 100644 --- a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt +++ b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt @@ -1,5 +1,7 @@ --TEST-- Optional long parameter might be null +--SKIPIF-- +<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- <?php echo mb_strpos('abb', 'b', null, 'UTF-8') . "\n"; |