Skip to content

test: Use --EXTENSIONS-- instead of extension_loaded() skip checks in tests #25033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorgsowa merged 1 commit into from
Oct 30, 2026
+14 −43
Merged

test: Use --EXTENSIONS-- instead of extension_loaded() skip checks in tests #25033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-cached-sha2-empty.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - cached sha2 result with empty packet)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the caching_sha2_password plugin is not available");
?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-cached-sha2-fast-auth.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - cached sha2 result for a successful fast auth)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the caching_sha2_password plugin is not available");
?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-cached-sha2-len.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - cached sha2 result shorter than expected)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the caching_sha2_password plugin is not available");
?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-cached-sha2-switch-unterminated.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - cached sha2 result with an unterminated plugin name)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the caching_sha2_password plugin is not available");
?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-sha256-pk-empty.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - sha256 public key response with empty packet)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the sha256_password plugin is not available");

@TimWolla TimWolla Oct 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the skip message provides additional detail. Should we support comment lines in the EXTENSIONS section?

@kamil-tekiela kamil-tekiela Oct 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that detail is not important. We already have --TEST-- section which mentions which plugin it uses.

?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
6 changes: 1 addition & 5 deletions ext/mysqli/tests/ghsa-r6x9-5r99-36j7-sha256-pk-len.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
GHSA-r6x9-5r99-36j7 (Various packet overreads in mysqlnd_writeprotocol.c - sha256 public key response shorter than expected)
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
if (!extension_loaded("openssl"))
die("skip mysqlnd is built without SSL support, so the sha256_password plugin is not available");
?>
openssl
--FILE--
<?php
require_once 'fake_server.inc';
Expand Down
3 changes: 2 additions & 1 deletion sapi/cli/tests/php_cli_server_expect_100_continue_iua.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
--TEST--
Failure to send "100 Continue" is reported with ignore_user_abort=1
--EXTENSIONS--
sockets
--SKIPIF--
<?php
include "skipif.inc";
if (!extension_loaded("sockets")) die("skip sockets extension required");
if (PHP_OS_FAMILY === "Windows") die("skip SO_LINGER reset behaviour differs on Windows");
?>
--FILE--
Expand Down
4 changes: 3 additions & 1 deletion tests/basic/oom_rfc1867_mb_encoding.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
--TEST--
rfc1867: mbstring input conversion of a body part doesn't reach the hard limit
--EXTENSIONS--
mbstring
--SKIPIF--
<?php require __DIR__ . "/oom_rfc1867_mb_skipif.inc"; ?>
<?php require __DIR__ . "/oom_rfc1867_skipif.inc"; ?>
--FILE--
<?php
require __DIR__ . '/oom_rfc1867.inc';
Expand Down
5 changes: 0 additions & 5 deletions tests/basic/oom_rfc1867_mb_skipif.inc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/basic/oom_rfc1867_session_skipif.inc
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion tests/basic/oom_rfc1867_upload_progress.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
--TEST--
rfc1867: the session upload progress handler doesn't reach the hard limit
--EXTENSIONS--
session
--SKIPIF--
<?php
require __DIR__ . "/oom_rfc1867_session_skipif.inc";
require __DIR__ . "/oom_rfc1867_skipif.inc";
if (getenv('SKIP_ASAN')) die("skip slow under ASan");
?>
--FILE--
Expand Down
Loading