Skip to content

Tests: Migrate old extension checks from SKIPIF to EXTENSIONS #23473

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

Open
LamentXU123 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tests: Migrate old extension checks from SKIPIF to EXTENSIONS #23473

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
8 changes: 2 additions & 6 deletions ext/intl/tests/listformatter/listformatter_clone.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 1 addition & 3 deletions ext/mysqli/tests/bug51647.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
Bug #51647 (Certificate file without private key (pk in another file) doesn't work)
--EXTENSIONS--
mysqli
openssl
--SKIPIF--
<?php
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()));

Expand Down
4 changes: 1 addition & 3 deletions ext/mysqli/tests/bug55283.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
Bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections)
--EXTENSIONS--
mysqli
openssl
--SKIPIF--
<?php
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()));

Expand Down
4 changes: 3 additions & 1 deletion ext/pdo_pgsql/tests/issue78621.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
4 changes: 3 additions & 1 deletion ext/pdo_pgsql/tests/issue78621_closure.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
4 changes: 3 additions & 1 deletion ext/pdo_pgsql/tests/issue78621_method.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Loading