From c2ca9cd73f90769430c5eb9c182d573ac04a34a0 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 6 May 2022 15:03:24 +0200
Subject: [PATCH] Don't unnecessarily skip mb related tests

Apparently, these tests have been overlooked when we switched to using
the `--EXTENSIONS--` section.  That caused to skip these tests on
AppVeyor.

Closes GH-8504.
---
 ext/exif/tests/exif004.phpt                                   | 1 +
 ext/standard/tests/file/windows_mb_path/bug54028.phpt         | 4 +++-
 .../file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt    | 4 +++-
 .../file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt    | 4 +++-
 .../file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt    | 4 +++-
 ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt | 4 +++-
 ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt | 4 +++-
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 4f1fe947b81..b5ffc3ec8fa 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -1,6 +1,7 @@
 --TEST--
 Check for exif_read_data, Unicode WinXP tags
 --EXTENSIONS--
+mbstring
 exif
 --SKIPIF--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug54028.phpt b/ext/standard/tests/file/windows_mb_path/bug54028.phpt
index 6f3e6dab514..61913a1a721 100644
--- a/ext/standard/tests/file/windows_mb_path/bug54028.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug54028.phpt
@@ -1,12 +1,14 @@
 --TEST--
 Bug #54028 Directory::read() cannot handle non-unicode chars properly
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
index 51d2b6d8c18..8b800ed3bde 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test fopen() for reading CP1251 with zend.multibyte
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 zend.script_encoding=cp1251
@@ -9,7 +11,7 @@ include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --CONFLICTS--
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
index 855fd4617b3..31db615f4d2 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test mkdir/rmdir CP1251 with zend.multibyte
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 zend.script_encoding=cp1251
@@ -9,7 +11,7 @@ include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --CONFLICTS--
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
index eb52b788356..d6075da559c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test fopen() for write CP1251 with zend.multibyte
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 zend.script_encoding=cp1251
@@ -9,7 +11,7 @@ include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --CONFLICTS--
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
index 3705582484c..6a5b60f08bb 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
@@ -1,12 +1,14 @@
 --TEST--
 Basic long path test
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
index 05982133c16..09ccebc0c07 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
@@ -1,12 +1,14 @@
 --TEST--
 Basic long path test with file I/O, multibyte path and realpath() check
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("mbstring");
+skip_if_no_required_exts();
 
 ?>
 --FILE--