Fixed SKIPIF when --disable-mbregex is used

ext/mbstring/tests/bug43301.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and 'e' option is used)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
+?>
 --FILE--
 <?php
 

ext/mbstring/tests/bug69151.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #69151 (mb_ereg should reject ill-formed byte sequence)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 $str = "\x80";

ext/mbstring/tests/bug72164.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #72164 (Null Pointer Dereference - mb_ereg_replace)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
+?>
 --FILE--
 <?php
 $var0 = "e";

ext/mbstring/tests/bug72399.phpt

@@ -1,5 +1,10 @@
 --TEST--
 Bug #72399 (Use-After-Free in MBString (search_re))
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available');
+?>
 --FILE--
 <?php
 $var5 = mbereg_search_init("","2");

ext/mbstring/tests/bug72402.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #72402: _php_mb_regex_ereg_replace_exec - double free
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_replace_callback')) die('skip mb_ereg_replace_callback() not available');
+?>
 --FILE--
 <?php
 function throwit() {

ext/mbstring/tests/bug72691.phpt

@@ -2,7 +2,8 @@
 Bug #72691 (mb_ereg_search raises a warning if a match zero-width)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

ext/mbstring/tests/bug72693.phpt

@@ -2,7 +2,8 @@
 Bug #72693 (mb_ereg_search increments search position when a match zero-width)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

ext/mbstring/tests/bug72694.phpt

@@ -2,7 +2,8 @@
 Bug #72694 (mb_ereg_search_setpos does not accept a string's last position)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

ext/mbstring/tests/bug72710.phpt

@@ -2,7 +2,8 @@
 Bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
 ?>
 --FILE--
 <?php

ext/mbstring/tests/bug73532.phpt

@@ -1,5 +1,10 @@
 --TEST--
 Bug #73532 (Null pointer dereference in mb_eregi)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_eregi')) die('skip mb_eregi() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_eregi("a", "\xf5"));

ext/mbstring/tests/bug73646.phpt

@@ -1,5 +1,10 @@
 --TEST--
 Bug #73646 (mb_ereg_search_init null pointer dereference)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
+?>
 --FILE--
 <?php
 

ext/mbstring/tests/bug77370.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #77370 (Buffer overflow on mb regex functions - fetch_token)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_split("   \xfd",""));

ext/mbstring/tests/bug77371.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_ereg("()0\xfc00000\xfc00000\xfc00000\xfc",""));

ext/mbstring/tests/bug77381.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #77381 (heap buffer overflow in multibyte match_at)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
 --FILE--
 <?php
 var_dump(mb_ereg("000||0\xfa","0"));

ext/mbstring/tests/bug77418.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Bug #77418 (Heap overflow in utf32be_mbc_to_code)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
+?>
 --FILE--
 <?php
 mb_regex_encoding("UTF-32");

ext/mbstring/tests/empty_pattern.phpt

@@ -1,7 +1,10 @@
 --TEST--
 Check for empty pattern
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
+?>
 --FILE--
 <?php
 

ext/mbstring/tests/mb_ereg_search_pos.phpt

@@ -2,7 +2,8 @@
 mb_ereg_search_pos() # a test for the basic function of mb_ereg_search_pos
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php

ext/mbstring/tests/mb_ereg_search_setpos.phpt

@@ -2,7 +2,8 @@
 mb_ereg_search_setpos() function
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available');
 ?>
 --FILE--
 <?php