Port mbstring to use EXTENSIONS

nikic · nikic · commit 4083600bd575 · 2021-06-11T14:00:43.000+02:00
diff --git a/ext/mbstring/tests/bug62934.phpt b/ext/mbstring/tests/bug62934.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62934: mb_convert_kana() does not convert iteration marks
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 echo mb_convert_kana('あゝすゞめアヽスヾメ', 'C', 'UTF-8') . "\n";
diff --git a/ext/mbstring/tests/bug65544.phpt b/ext/mbstring/tests/bug65544.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65544: mb title case conversion-first word in quotation isn't capitalized
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 var_dump(mb_convert_case("\"or else it doesn't, you know. the name of the song is called 'haddocks' eyes.'\"", MB_CASE_TITLE));
diff --git a/ext/mbstring/tests/bug69267.phpt b/ext/mbstring/tests/bug69267.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69267: mb_strtolower fails on titlecase characters
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/bug71298.phpt b/ext/mbstring/tests/bug71298.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71298: MB_CASE_TITLE misbehaves with curled apostrophe/quote (HTML &rsquo;)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 echo mb_convert_case("People's issues versus people’s issues", MB_CASE_TITLE);
diff --git a/ext/mbstring/tests/bug72399.phpt b/ext/mbstring/tests/bug72399.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72399 (Use-After-Free in MBString (search_re))
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
-require 'skipif.inc';
 if (!function_exists('mb_ereg')) die('skip mbregex support not available');
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73532 (Null pointer dereference in mb_eregi)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
-require 'skipif.inc';
 if (!function_exists('mb_ereg')) die('skip mbregex support not available');
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug73646.phpt b/ext/mbstring/tests/bug73646.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73646 (mb_ereg_search_init null pointer dereference)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
-require 'skipif.inc';
 if (!function_exists('mb_ereg')) die('skip mbregex support not available');
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug76532.phpt b/ext/mbstring/tests/bug76532.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #76532 (Integer overflow and excessive memory usage in mb_strimwidth)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 $string_to_trim = '得很幸福。有一天，一个长得很丑的老人带着一只木马来到王';
diff --git a/ext/mbstring/tests/bug77165.phpt b/ext/mbstring/tests/bug77165.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77165: mb_check_encoding crashes when argument given an empty array
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 var_dump(mb_check_encoding(array()));
diff --git a/ext/mbstring/tests/bug77454.phpt b/ext/mbstring/tests/bug77454.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77454: mb_scrub() silently truncates after a null byte
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 $str = "before\0after";
diff --git a/ext/mbstring/tests/casefolding.phpt b/ext/mbstring/tests/casefolding.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Case-insensitive string comparisons use case folding
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/casemapping.phpt b/ext/mbstring/tests/casemapping.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode case mapping
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/internal_encoding.phpt b/ext/mbstring/tests/internal_encoding.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check that "internal_encoding" ini is picked up by mbstring
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 internal_encoding=iso-8859-1
 --FILE--
diff --git a/ext/mbstring/tests/mb_convert_case_various_mode.phpt b/ext/mbstring/tests/mb_convert_case_various_mode.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Calling mb_convert_case() with an invalid casing mode
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_convert_encoding_leak.phpt b/ext/mbstring/tests/mb_convert_encoding_leak.phpt
@@ -1,7 +1,7 @@
 --TEST--
 mb_convert_encoding() shouldn't leak keys
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/skipif.inc b/ext/mbstring/tests/skipif.inc
diff --git a/ext/mbstring/tests/zend_multibyte-01.phpt b/ext/mbstring/tests/zend_multibyte-01.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (1)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=Shift_JIS
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (2)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
diff --git a/ext/mbstring/tests/zend_multibyte-03.phpt b/ext/mbstring/tests/zend_multibyte-03.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (3)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-04.phpt b/ext/mbstring/tests/zend_multibyte-04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (4)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=CP932
diff --git a/ext/mbstring/tests/zend_multibyte-05.phpt b/ext/mbstring/tests/zend_multibyte-05.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (5)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (6)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (7)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (8)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (9)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=cp1251
diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (10)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (11)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-12.phpt b/ext/mbstring/tests/zend_multibyte-12.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (12)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-13.phpt b/ext/mbstring/tests/zend_multibyte-13.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (13)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-14.phpt b/ext/mbstring/tests/zend_multibyte-14.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (14)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-15.phpt b/ext/mbstring/tests/zend_multibyte-15.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (15)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-16.phpt b/ext/mbstring/tests/zend_multibyte-16.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zend multibyte (16)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--
