Skip to content

Commit 8d5fc8d

Browse files
petkpetk
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Use EXTENSIONS instead of SKIPIF sections in *.phpt
2 parents 5094a63 + 218a93b commit 8d5fc8d

25 files changed

+57
-72
lines changed

Diff for: ‎ext/bz2/tests/bzerr_functions_on_invalid_stream.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--TEST--
22
Calling bzerr* functions on non-bz2 streams
3-
--SKIPIF--
4-
<?php if (!extension_loaded("bz2")) print "skip"; ?>
3+
--EXTENSIONS--
4+
bz2
55
--FILE--
66
<?php
77
$f = fopen(__FILE__, 'r');

Diff for: ‎ext/com_dotnet/tests/gh8778.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
22
Bug GH-8778 (Integer arithmethic with large number variants fails)
3+
--EXTENSIONS--
4+
com_dotnet
35
--SKIPIF--
46
<?php
5-
if (!extension_loaded("com_dotnet")) die("skip com_dotnet extension not available");
67
if (PHP_INT_SIZE < 8) die("skip for 64bit only");
78
?>
89
--FILE--

Diff for: ‎ext/dom/tests/bug79971_2.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #79971 (special character is breaking the path in xml function)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('dom')) die('skip dom extension not available');
6-
?>
3+
--EXTENSIONS--
4+
dom
75
--FILE--
86
<?php
97
$imp = new DOMImplementation;

Diff for: ‎ext/dom/tests/libxml_global_state_entity_loader_bypass.phpt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--TEST--
22
GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
3+
--EXTENSIONS--
4+
dom
5+
libxml
6+
zend_test
37
--SKIPIF--
48
<?php
5-
if (!extension_loaded('libxml')) die('skip libxml extension not available');
6-
if (!extension_loaded('dom')) die('skip dom extension not available');
7-
if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
89
if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
910
?>
1011
--FILE--

Diff for: ‎ext/filter/tests/bug77221.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #77221 (Request IP address filter flag to exclude non-global IP addresses)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('filter')) die("skip filter extension not available");
6-
?>
3+
--EXTENSIONS--
4+
filter
75
--FILE--
86
<?php
97

Diff for: ‎ext/filter/tests/bug81122.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #81122 (SSRF bypass in FILTER_VALIDATE_URL)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('filter')) die("skip filter extension not available");
6-
?>
3+
--EXTENSIONS--
4+
filter
75
--FILE--
86
<?php
97
$urls = [

Diff for: ‎ext/intl/tests/gh10647.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug GH-10647 (Spoofchecker::isSuspicious $errorCode always null)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("intl")) die("skip intl extension not available");
6-
?>
3+
--EXTENSIONS--
4+
intl
75
--FILE--
86
<?php
97
$error = 123;

Diff for: ‎ext/intl/tests/gh8364.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug GH-8364 (msgfmt_format $values may not support references)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("intl")) die("skip intl extension not available");
6-
?>
3+
--EXTENSIONS--
4+
intl
75
--FILE--
86
<?php
97
$formatter = new MessageFormatter('en', 'translate {0}');

Diff for: ‎ext/intl/tests/locale/bug72809.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #72809 (Locale::lookup() wrong result with canonicalize option)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('intl')) die("skip intl extension not avaible");
6-
?>
3+
--EXTENSIONS--
4+
intl
75
--FILE--
86
<?php
97
var_dump(

Diff for: ‎ext/mbstring/tests/gh8086.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
GH-8086 (mb_send_mail() function not working correctly in PHP 8.x)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("mbstring")) die("skip mbstring extension not available");
6-
?>
3+
--EXTENSIONS--
4+
mbstring
75
--INI--
86
sendmail_path={MAIL:{PWD}/gh8086.eml}
97
mail.mixed_lf_and_crlf=on

Diff for: ‎ext/openssl/tests/bug50293.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #50293 (Several openssl functions ignore the VCWD)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("openssl")) die("skip openssl not loaded");
6-
?>
3+
--EXTENSIONS--
4+
openssl
75
--FILE--
86
<?php
97
$cert = "file://" . __DIR__ . "/cert.crt";

Diff for: ‎ext/openssl/tests/gh9339.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
GH-9339: oid_file path check warning contains uninitialized path
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("openssl")) die("skip openssl not loaded");
6-
?>
3+
--EXTENSIONS--
4+
openssl
75
--FILE--
86
<?php
97
$configCode = <<<CONFIG

Diff for: ‎ext/pdo/tests/gh8626.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
22
GH-8626: PDOStatement->execute() failed, then execute successfully, errorInfo() information is incorrect
3+
--EXTENSIONS--
4+
pdo
35
--SKIPIF--
46
<?php
5-
if (!extension_loaded('pdo')) die('skip');
67
$dir = getenv('REDIR_TEST_DIR');
78
if (false == $dir) die('skip no driver');
89
require_once $dir . 'pdo_test.inc';

Diff for: ‎ext/pdo_pgsql/tests/gh7723.phpt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
GitHub #7723 (Fix error message allocation of PDO PgSQL)
3+
--EXTENSIONS--
4+
pdo
5+
pdo_pgsql
36
--SKIPIF--
47
<?php
5-
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
68
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
79
require __DIR__ . '/config.inc';
810
PDOTest::skip();

Diff for: ‎ext/pdo_pgsql/tests/gh9411.phpt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
Bug GH-9411 (PgSQL large object resource is incorrectly closed)
3+
--EXTENSIONS--
4+
pdo
5+
pdo_pgsql
36
--SKIPIF--
47
<?php
5-
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
68
require __DIR__ . '/config.inc';
79
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
810
PDOTest::skip();

Diff for: ‎ext/phar/tests/GHSA-jqcx-ccgc-xwhv.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--TEST--
22
GHSA-jqcx-ccgc-xwhv (Buffer overflow and overread in phar_dir_read())
3-
--SKIPIF--
4-
<?php if (!extension_loaded("phar")) die("skip"); ?>
3+
--EXTENSIONS--
4+
phar
55
--INI--
66
phar.readonly=0
77
--FILE--

Diff for: ‎ext/phar/tests/bug81211.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
22
Bug #81211 (Symlinks are followed when creating PHAR archive)
3+
--EXTENSIONS--
4+
phar
35
--SKIPIF--
46
<?php
5-
if (!extension_loaded('phar')) die('skip phar extension is not available');
67
if (PHP_OS_FAMILY === 'Windows') {
78
if (false === include __DIR__ . '/../../standard/tests/file/windows_links/common.inc') {
89
die('skip windows_links/common.inc is not available');

Diff for: ‎ext/simplexml/tests/libxml_global_state_entity_loader_bypass.phpt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--TEST--
22
GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
3+
--EXTENSIONS--
4+
libxml
5+
simplexml
6+
zend_test
37
--SKIPIF--
48
<?php
5-
if (!extension_loaded('libxml')) die('skip libxml extension not available');
6-
if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
7-
if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
89
if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
910
?>
1011
--FILE--

Diff for: ‎ext/xmlreader/tests/libxml_global_state_entity_loader_bypass.phpt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--TEST--
22
GHSA-3qrf-m4j2-pcrr (libxml global state entity loader bypass)
3+
--EXTENSIONS--
4+
libxml
5+
xmlreader
6+
zend_test
37
--SKIPIF--
48
<?php
5-
if (!extension_loaded('libxml')) die('skip libxml extension not available');
6-
if (!extension_loaded('xmlreader')) die('skip xmlreader extension not available');
7-
if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
89
if (!function_exists('zend_test_override_libxml_global_state')) die('skip not for Windows');
910
?>
1011
--FILE--

Diff for: ‎ext/zend_test/tests/observer_sqlite_create_function.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Observer: PDO::sqliteCreateFunction() can be observed
33
--EXTENSIONS--
44
zend_test
5-
PDO
5+
pdo
66
pdo_sqlite
77
--INI--
88
zend_test.observer.enabled=1

Diff for: ‎ext/zip/tests/bug77978.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #77978 (Dirname ending in colon unzips to wrong dir)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("zip")) die("skip zip extension not available");
6-
?>
3+
--EXTENSIONS--
4+
zip
75
--FILE--
86
<?php
97
$file = __DIR__ . "/bug77978.zip";

Diff for: ‎ext/zip/tests/bug80833.phpt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
--TEST--
22
Bug #80833 (ZipArchive::getStream doesn't use setPassword)
3+
--EXTENSIONS--
4+
zip
35
--SKIPIF--
46
<?php
5-
if (!extension_loaded('zip')) die("skip zip extension not available");
67
if (!method_exists('ZipArchive', 'setEncryptionName')) die('skip encryption not supported');
78
?>
89
--FILE--

Diff for: ‎ext/zip/tests/bug81420.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #81420 (ZipArchive::extractTo extracts outside of destination)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("zip")) die("skip zip extension not available");
6-
?>
3+
--EXTENSIONS--
4+
zip
75
--FILE--
86
<?php
97
$zip = new ZipArchive();

Diff for: ‎ext/zip/tests/bug81490.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug #81490 (ZipArchive::extractTo() may leak memory)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded("zip")) die("skip zip extension not available");
6-
?>
3+
--EXTENSIONS--
4+
zip
75
--FILE--
86
<?php
97
$zip = new ZipArchive();

Diff for: ‎ext/zip/tests/bug_gh8781.phpt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--TEST--
22
Bug GH-8781 (ZipArchive deletes zip file with no contents)
3-
--SKIPIF--
4-
<?php
5-
if (!extension_loaded('zip')) die('skip zip extension not available');
6-
?>
3+
--EXTENSIONS--
4+
zip
75
--FILE--
86
<?php
97
touch($file = __DIR__ . '/bug_gh8781.zip');

0 commit comments

Comments
 (0)