summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-01-30 11:21:26 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-01-30 11:21:26 +0100
commita73f98eda9b62d8d5024cd55c7d9c2b0b9380414 (patch)
tree920a82853f2765ff089334ccf98b6b0634527540
parent98deece6f75c173e4847c5fd16b4c0b2ba0b47ac (diff)
parent6ccd67577696b9c8bf3d88b521320720771dfc09 (diff)
downloadphp-git-a73f98eda9b62d8d5024cd55c7d9c2b0b9380414.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Add SKIPIF to test requiring mbregex
-rw-r--r--ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
index 7fe6d31128..1a78b27272 100644
--- a/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
@@ -1,5 +1,7 @@
--TEST--
mb_ereg_search() with invalid pattern should discard old matches
+--SKIPIF--
+<?php if (!function_exists("mb_ereg")) print "skip requires mbregex"; ?>
--FILE--
<?php