From 1a4a1b97ba4375c6808bb1f9643848d8db2628ed Mon Sep 17 00:00:00 2001
From: Weilin Du <weilindu@php.net>
Date: Thu, 27 Aug 2026 00:26:58 +0800
Subject: [PATCH] Tests: Migrate old extension checks from SKIPIF to EXTENSIONS

---
 ext/intl/tests/listformatter/listformatter_clone.phpt | 8 ++------
 ext/mysqli/tests/bug51647.phpt                        | 4 +---
 ext/mysqli/tests/bug55283.phpt                        | 4 +---
 ext/pdo_pgsql/tests/issue78621.phpt                   | 4 +++-
 ext/pdo_pgsql/tests/issue78621_closure.phpt           | 4 +++-
 ext/pdo_pgsql/tests/issue78621_method.phpt            | 4 +++-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ext/intl/tests/listformatter/listformatter_clone.phpt b/ext/intl/tests/listformatter/listformatter_clone.phpt
index e80fd4ff4981..929a4067d2e7 100644
--- a/ext/intl/tests/listformatter/listformatter_clone.phpt
+++ b/ext/intl/tests/listformatter/listformatter_clone.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Test IntlListFormatter cannot be cloned
---SKIPIF--
-<?php
-if (!extension_loaded('intl')) {
-    die('skip intl extension not available');
-}
-?>
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index 7f675c5a1ec2..afd136ddfc22 100644
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -2,6 +2,7 @@
 Bug #51647 (Certificate file without private key (pk in another file) doesn't work)
 --EXTENSIONS--
 mysqli
+openssl
 --SKIPIF--
 <?php
 require_once 'connect.inc';
@@ -9,9 +10,6 @@ require_once 'connect.inc';
 if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
     die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
 
-if (!extension_loaded("openssl"))
-    die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
-
 if (!($link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
     die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index f5473c7c4959..692968f9ee2b 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -2,6 +2,7 @@
 Bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections)
 --EXTENSIONS--
 mysqli
+openssl
 --SKIPIF--
 <?php
 require_once 'connect.inc';
@@ -9,9 +10,6 @@ require_once 'connect.inc';
 if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
     die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
 
-if (!extension_loaded("openssl"))
-    die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
-
 if (!($link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
     die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
diff --git a/ext/pdo_pgsql/tests/issue78621.phpt b/ext/pdo_pgsql/tests/issue78621.phpt
index 9e14b89cb9e5..2d026493609e 100644
--- a/ext/pdo_pgsql/tests/issue78621.phpt
+++ b/ext/pdo_pgsql/tests/issue78621.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Pdo\Pgsql::setNoticeCallback catches Postgres "raise notice".
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 require_once dirname(__FILE__) . '/config.inc';
 PDOTest::skip();
diff --git a/ext/pdo_pgsql/tests/issue78621_closure.phpt b/ext/pdo_pgsql/tests/issue78621_closure.phpt
index 45ebd1a5fa8b..5b1fc048c4b5 100644
--- a/ext/pdo_pgsql/tests/issue78621_closure.phpt
+++ b/ext/pdo_pgsql/tests/issue78621_closure.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Pdo\Pgsql::setNoticeCallback catches Postgres "raise notice".
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 require_once dirname(__FILE__) . '/config.inc';
 PDOTest::skip();
diff --git a/ext/pdo_pgsql/tests/issue78621_method.phpt b/ext/pdo_pgsql/tests/issue78621_method.phpt
index 2040583bd008..c70a64f18d09 100644
--- a/ext/pdo_pgsql/tests/issue78621_method.phpt
+++ b/ext/pdo_pgsql/tests/issue78621_method.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Pdo\Pgsql::setNoticeCallback catches Postgres "raise notice".
+--EXTENSIONS--
+pdo
+pdo_pgsql
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
 require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 require_once dirname(__FILE__) . '/config.inc';
 PDOTest::skip();