From 16b40a1806e2c6524a0a3ee07e252cb0406be443 Mon Sep 17 00:00:00 2001
From: Matteo Beccati <mbeccati@php.net>
Date: Fri, 29 Mar 2019 14:09:39 +0100
Subject: [PATCH] Fixed SKIPIF when --disable-mbregex is used

---
 ext/mbstring/tests/bug77367.phpt | 4 ++--
 ext/mbstring/tests/bug77370.phpt | 5 ++++-
 ext/mbstring/tests/bug77371.phpt | 5 ++++-
 ext/mbstring/tests/bug77381.phpt | 5 ++++-
 ext/mbstring/tests/bug77418.phpt | 5 ++++-
 ext/mbstring/tests/bug77428.phpt | 5 +++++
 ext/mbstring/tests/bug77514.phpt | 5 +++++
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ext/mbstring/tests/bug77367.phpt b/ext/mbstring/tests/bug77367.phpt
index 3b3e9d5c7c..4925852375 100644
--- a/ext/mbstring/tests/bug77367.phpt
+++ b/ext/mbstring/tests/bug77367.phpt
@@ -2,8 +2,8 @@
 Bug #77367 (Negative size parameter in mb_split)
 --SKIPIF--
 <?php
-if (!extension_loaded('mbstring')) die('mbstring extension not available');
-if (!function_exists('mb_split')) die('mb_split() not available');
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_split')) die('skip mb_split() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/bug77370.phpt b/ext/mbstring/tests/bug77370.phpt
index d16fcd724d..365463f90f 100644
--- a/ext/mbstring/tests/bug77370.phpt
+++ b/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",""));
diff --git a/ext/mbstring/tests/bug77371.phpt b/ext/mbstring/tests/bug77371.phpt
index 25f5ac9aca..9427a3cd4e 100644
--- a/ext/mbstring/tests/bug77371.phpt
+++ b/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",""));
diff --git a/ext/mbstring/tests/bug77381.phpt b/ext/mbstring/tests/bug77381.phpt
index 9768cd34de..5176cc55a8 100644
--- a/ext/mbstring/tests/bug77381.phpt
+++ b/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"));
diff --git a/ext/mbstring/tests/bug77418.phpt b/ext/mbstring/tests/bug77418.phpt
index 32577bc98c..4e3130bdd1 100644
--- a/ext/mbstring/tests/bug77418.phpt
+++ b/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");
diff --git a/ext/mbstring/tests/bug77428.phpt b/ext/mbstring/tests/bug77428.phpt
index f153412acb..d387f34b77 100644
--- a/ext/mbstring/tests/bug77428.phpt
+++ b/ext/mbstring/tests/bug77428.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #77428: mb_ereg_replace() doesn't replace a substitution variable 
+--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
 
diff --git a/ext/mbstring/tests/bug77514.phpt b/ext/mbstring/tests/bug77514.phpt
index efcbea24d7..565a8fd773 100644
--- a/ext/mbstring/tests/bug77514.phpt
+++ b/ext/mbstring/tests/bug77514.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Bug #77514: mb_ereg_replace() with trailing backslash adds null byte
+--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
 
-- 
2.40.0