From 218a93b898b4ecd182d1ab1c1f9d8d35bb2f1799 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Wed, 31 Jan 2024 11:18:21 +0100
Subject: [PATCH] Use EXTENSIONS instead of SKIPIF sections in *.phpt

This also fixes skipped tests due to different naming "zend-test"
instead of "zend_test" and "PDO" instead of "pdo":

- ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt
- ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt
- ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt
- ext/zend_test/tests/observer_sqlite_create_function.phpt

EXTENSIONS section is used for the Windows build to load the non-static
extensions.

Closes GH-13276
---
 ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt       | 4 ++--
 ext/com_dotnet/tests/gh8778.phpt                           | 3 ++-
 ext/dom/tests/bug79971_2.phpt                              | 6 ++----
 .../tests/libxml_global_state_entity_loader_bypass.phpt    | 7 ++++---
 ext/filter/tests/bug77221.phpt                             | 6 ++----
 ext/filter/tests/bug81122.phpt                             | 6 ++----
 ext/intl/tests/gh10647.phpt                                | 6 ++----
 ext/intl/tests/gh8364.phpt                                 | 6 ++----
 ext/intl/tests/locale/bug72809.phpt                        | 6 ++----
 ext/mbstring/tests/gh8086.phpt                             | 6 ++----
 ext/openssl/tests/bug50293.phpt                            | 6 ++----
 ext/openssl/tests/gh9339.phpt                              | 6 ++----
 ext/pdo/tests/gh8626.phpt                                  | 3 ++-
 ext/pdo_pgsql/tests/gh7723.phpt                            | 4 +++-
 ext/pdo_pgsql/tests/gh9411.phpt                            | 4 +++-
 ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt                    | 4 ++--
 ext/phar/tests/bug81211.phpt                               | 3 ++-
 .../tests/libxml_global_state_entity_loader_bypass.phpt    | 7 ++++---
 .../tests/libxml_global_state_entity_loader_bypass.phpt    | 7 ++++---
 ext/zend_test/tests/observer_sqlite_create_function.phpt   | 2 +-
 ext/zip/tests/bug77978.phpt                                | 6 ++----
 ext/zip/tests/bug80833.phpt                                | 3 ++-
 ext/zip/tests/bug81420.phpt                                | 6 ++----
 ext/zip/tests/bug81490.phpt                                | 6 ++----
 ext/zip/tests/bug_gh8781.phpt                              | 6 ++----
 25 files changed, 57 insertions(+), 72 deletions(-)

diff --git a/ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt b/ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt
index 82cb3573529..a9fd3a21186 100644
--- a/ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt
+++ b/ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Calling bzerr* functions on non-bz2 streams
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $f = fopen(__FILE__, 'r');
diff --git a/ext/com_dotnet/tests/gh8778.phpt b/ext/com_dotnet/tests/gh8778.phpt
index 968804b7c5c..7198f2add4b 100644
--- a/ext/com_dotnet/tests/gh8778.phpt
+++ b/ext/com_dotnet/tests/gh8778.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug GH-8778 (Integer arithmethic with large number variants fails)
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")) die("skip com_dotnet extension not available");
 if (PHP_INT_SIZE < 8) die("skip for 64bit only");
 ?>
 --FILE--
diff --git a/ext/dom/tests/bug79971_2.phpt b/ext/dom/tests/bug79971_2.phpt
index c4e6b1e4e09..f5bee66302b 100644
--- a/ext/dom/tests/bug79971_2.phpt
+++ b/ext/dom/tests/bug79971_2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79971 (special character is breaking the path in xml function)
---SKIPIF--
-<?php
-if (!extension_loaded('dom')) die('skip dom extension not available');
-?>
+--EXTENSIONS--
+dom
 --FILE--
 <?php
 $imp = new DOMImplementation;
diff --git a/ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt b/ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt
index 7fc2a249ac7..a37afd1f3a4 100644
--- a/ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt
+++ b/ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt
@@ -1,10 +1,11 @@
 --TEST--
 GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
+--EXTENSIONS--
+dom
+libxml
+zend_test
 --SKIPIF--
 <?php
-if (!extension_loaded('libxml')) die('skip libxml extension not available');
-if (!extension_loaded('dom')) die('skip dom extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
 if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
 ?>
 --FILE--
diff --git a/ext/filter/tests/bug77221.phpt b/ext/filter/tests/bug77221.phpt
index 307a83898ac..f94a14dee2d 100644
--- a/ext/filter/tests/bug77221.phpt
+++ b/ext/filter/tests/bug77221.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77221 (Request IP address filter flag to exclude non-global IP addresses)
---SKIPIF--
-<?php
-if (!extension_loaded('filter')) die("skip filter extension not available");
-?>
+--EXTENSIONS--
+filter
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/bug81122.phpt b/ext/filter/tests/bug81122.phpt
index d89d4114a54..eba9d7d3c22 100644
--- a/ext/filter/tests/bug81122.phpt
+++ b/ext/filter/tests/bug81122.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #81122 (SSRF bypass in FILTER_VALIDATE_URL)
---SKIPIF--
-<?php
-if (!extension_loaded('filter')) die("skip filter extension not available");
-?>
+--EXTENSIONS--
+filter
 --FILE--
 <?php
 $urls = [
diff --git a/ext/intl/tests/gh10647.phpt b/ext/intl/tests/gh10647.phpt
index 61c6b87e0dd..34bac8c8f76 100644
--- a/ext/intl/tests/gh10647.phpt
+++ b/ext/intl/tests/gh10647.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug GH-10647 (Spoofchecker::isSuspicious $errorCode always null)
---SKIPIF--
-<?php
-if (!extension_loaded("intl")) die("skip intl extension not available");
-?>
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 $error = 123;
diff --git a/ext/intl/tests/gh8364.phpt b/ext/intl/tests/gh8364.phpt
index 74a0b5629ec..4bd5270877b 100644
--- a/ext/intl/tests/gh8364.phpt
+++ b/ext/intl/tests/gh8364.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug GH-8364 (msgfmt_format $values may not support references)
---SKIPIF--
-<?php
-if (!extension_loaded("intl")) die("skip intl extension not available");
-?>
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 $formatter = new MessageFormatter('en', 'translate {0}');
diff --git a/ext/intl/tests/locale/bug72809.phpt b/ext/intl/tests/locale/bug72809.phpt
index 98dc7d39694..df8e317af28 100644
--- a/ext/intl/tests/locale/bug72809.phpt
+++ b/ext/intl/tests/locale/bug72809.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72809 (Locale::lookup() wrong result with canonicalize option)
---SKIPIF--
-<?php
-if (!extension_loaded('intl')) die("skip intl extension not avaible");
-?>
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 var_dump(
diff --git a/ext/mbstring/tests/gh8086.phpt b/ext/mbstring/tests/gh8086.phpt
index 2eeed67e5b4..4882f46ca86 100644
--- a/ext/mbstring/tests/gh8086.phpt
+++ b/ext/mbstring/tests/gh8086.phpt
@@ -1,9 +1,7 @@
 --TEST--
 GH-8086 (mb_send_mail() function not working correctly in PHP 8.x)
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) die("skip mbstring extension not available");
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 sendmail_path={MAIL:{PWD}/gh8086.eml}
 mail.mixed_lf_and_crlf=on
diff --git a/ext/openssl/tests/bug50293.phpt b/ext/openssl/tests/bug50293.phpt
index 8eae2914bd1..0fc2bc371a7 100644
--- a/ext/openssl/tests/bug50293.phpt
+++ b/ext/openssl/tests/bug50293.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #50293 (Several openssl functions ignore the VCWD)
---SKIPIF--
-<?php
-if (!extension_loaded("openssl")) die("skip openssl not loaded");
-?>
+--EXTENSIONS--
+openssl
 --FILE--
 <?php
 $cert = "file://" . __DIR__ . "/cert.crt";
diff --git a/ext/openssl/tests/gh9339.phpt b/ext/openssl/tests/gh9339.phpt
index 9e4adbccce7..790a25a3630 100644
--- a/ext/openssl/tests/gh9339.phpt
+++ b/ext/openssl/tests/gh9339.phpt
@@ -1,9 +1,7 @@
 --TEST--
 GH-9339: oid_file path check warning contains uninitialized path
---SKIPIF--
-<?php
-if (!extension_loaded("openssl")) die("skip openssl not loaded");
-?>
+--EXTENSIONS--
+openssl
 --FILE--
 <?php
 $configCode = <<<CONFIG
diff --git a/ext/pdo/tests/gh8626.phpt b/ext/pdo/tests/gh8626.phpt
index 0a6f81b6a9c..913d94630a6 100644
--- a/ext/pdo/tests/gh8626.phpt
+++ b/ext/pdo/tests/gh8626.phpt
@@ -1,8 +1,9 @@
 --TEST--
 GH-8626: PDOStatement->execute() failed, then execute successfully, errorInfo() information is incorrect
+--EXTENSIONS--
+pdo
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo_pgsql/tests/gh7723.phpt b/ext/pdo_pgsql/tests/gh7723.phpt
index bbbf5fd5bc2..5ba265fc68d 100644
--- a/ext/pdo_pgsql/tests/gh7723.phpt
+++ b/ext/pdo_pgsql/tests/gh7723.phpt
@@ -1,8 +1,10 @@
 --TEST--
 GitHub #7723 (Fix error message allocation of PDO PgSQL)
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
 require __DIR__ . '/config.inc';
 PDOTest::skip();
diff --git a/ext/pdo_pgsql/tests/gh9411.phpt b/ext/pdo_pgsql/tests/gh9411.phpt
index c8a11e89df6..391adb7611a 100644
--- a/ext/pdo_pgsql/tests/gh9411.phpt
+++ b/ext/pdo_pgsql/tests/gh9411.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Bug GH-9411 (PgSQL large object resource is incorrectly closed)
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require __DIR__ . '/config.inc';
 require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt b/ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt
index 4e12f05fb62..e92a632843f 100644
--- a/ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt
+++ b/ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GHSA-jqcx-ccgc-xwhv (Buffer overflow and overread in phar_dir_read())
---SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+--EXTENSIONS--
+phar
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/bug81211.phpt b/ext/phar/tests/bug81211.phpt
index 96b1401b403..fe7b1326aa6 100644
--- a/ext/phar/tests/bug81211.phpt
+++ b/ext/phar/tests/bug81211.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #81211 (Symlinks are followed when creating PHAR archive)
+--EXTENSIONS--
+phar
 --SKIPIF--
 <?php
-if (!extension_loaded('phar')) die('skip phar extension is not available');
 if (PHP_OS_FAMILY === 'Windows') {
     if (false === include __DIR__ . '/../../standard/tests/file/windows_links/common.inc') {
         die('skip windows_links/common.inc is not available');
diff --git a/ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt b/ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt
index 54f9d4941eb..ae5a29913eb 100644
--- a/ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt
+++ b/ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt
@@ -1,10 +1,11 @@
 --TEST--
 GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
+--EXTENSIONS--
+libxml
+simplexml
+zend_test
 --SKIPIF--
 <?php
-if (!extension_loaded('libxml')) die('skip libxml extension not available');
-if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
 if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
 ?>
 --FILE--
diff --git a/ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt b/ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt
index cb0297b6b1b..a0223367c70 100644
--- a/ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt
+++ b/ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt
@@ -1,10 +1,11 @@
 --TEST--
 GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
+--EXTENSIONS--
+libxml
+xmlreader
+zend_test
 --SKIPIF--
 <?php
-if (!extension_loaded('libxml')) die('skip libxml extension not available');
-if (!extension_loaded('xmlreader')) die('skip xmlreader extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
 if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
 ?>
 --FILE--
diff --git a/ext/zend_test/tests/observer_sqlite_create_function.phpt b/ext/zend_test/tests/observer_sqlite_create_function.phpt
index 85d269c9ead..26330043ef2 100644
--- a/ext/zend_test/tests/observer_sqlite_create_function.phpt
+++ b/ext/zend_test/tests/observer_sqlite_create_function.phpt
@@ -2,7 +2,7 @@
 Observer: PDO::sqliteCreateFunction() can be observed
 --EXTENSIONS--
 zend_test
-PDO
+pdo
 pdo_sqlite
 --INI--
 zend_test.observer.enabled=1
diff --git a/ext/zip/tests/bug77978.phpt b/ext/zip/tests/bug77978.phpt
index 2f3c22f4213..bcf3538f65d 100644
--- a/ext/zip/tests/bug77978.phpt
+++ b/ext/zip/tests/bug77978.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77978 (Dirname ending in colon unzips to wrong dir)
---SKIPIF--
-<?php
-if (!extension_loaded("zip")) die("skip zip extension not available");
-?>
+--EXTENSIONS--
+zip
 --FILE--
 <?php
 $file = __DIR__ . "/bug77978.zip";
diff --git a/ext/zip/tests/bug80833.phpt b/ext/zip/tests/bug80833.phpt
index 56cabf816bb..8200203ca00 100644
--- a/ext/zip/tests/bug80833.phpt
+++ b/ext/zip/tests/bug80833.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80833 (ZipArchive::getStream doesn't use setPassword)
+--EXTENSIONS--
+zip
 --SKIPIF--
 <?php
-if (!extension_loaded('zip')) die("skip zip extension not available");
 if (!method_exists('ZipArchive', 'setEncryptionName')) die('skip encryption not supported');
 ?>
 --FILE--
diff --git a/ext/zip/tests/bug81420.phpt b/ext/zip/tests/bug81420.phpt
index 9eec0ee7e99..ad89e7c0ac7 100644
--- a/ext/zip/tests/bug81420.phpt
+++ b/ext/zip/tests/bug81420.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #81420 (ZipArchive::extractTo extracts outside of destination)
---SKIPIF--
-<?php
-if (!extension_loaded("zip")) die("skip zip extension not available");
-?>
+--EXTENSIONS--
+zip
 --FILE--
 <?php
 $zip = new ZipArchive();
diff --git a/ext/zip/tests/bug81490.phpt b/ext/zip/tests/bug81490.phpt
index 7c9a33a427c..afd9f8ad1b7 100644
--- a/ext/zip/tests/bug81490.phpt
+++ b/ext/zip/tests/bug81490.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #81490 (ZipArchive::extractTo() may leak memory)
---SKIPIF--
-<?php
-if (!extension_loaded("zip")) die("skip zip extension not available");
-?>
+--EXTENSIONS--
+zip
 --FILE--
 <?php
 $zip = new ZipArchive();
diff --git a/ext/zip/tests/bug_gh8781.phpt b/ext/zip/tests/bug_gh8781.phpt
index 25eadb70575..31fac9bc613 100644
--- a/ext/zip/tests/bug_gh8781.phpt
+++ b/ext/zip/tests/bug_gh8781.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug GH-8781 (ZipArchive deletes zip file with no contents)
---SKIPIF--
-<?php
-if (!extension_loaded('zip')) die('skip zip extension not available');
-?>
+--EXTENSIONS--
+zip
 --FILE--
 <?php
 touch($file = __DIR__ . '/bug_gh8781.zip');