php · nikic · Jun 11, 2021 · Jun 11, 2021 · Jun 11, 2021 · Jun 11, 2021
diff --git a/Zend/tests/attributes/016_custom_attribute_validation.phpt b/Zend/tests/attributes/016_custom_attribute_validation.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Attribute validation callback of internal attributes.
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) {
-    echo "skip requires zend_test extension\n";
-}
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = "<root></root>";

diff --git a/Zend/tests/bug34617.phpt b/Zend/tests/bug34617.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called)
---SKIPIF--
-<?php if (!extension_loaded("xml")) print "skip the xml extension not available"; ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 class Thing {}

diff --git a/Zend/tests/bug39602.phpt b/Zend/tests/bug39602.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39602 (Invalid session.save_handler crashes PHP)
---SKIPIF--
-<?php if (!extension_loaded("session")) die("skip session extension required"); ?>
+--EXTENSIONS--
+session
 --INI--
 session.save_handler=qwerty
 error_reporting=0

diff --git a/Zend/tests/bug43918.phpt b/Zend/tests/bug43918.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43918 (Segmentation fault in garbage collector)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xmlstr = <<<XML

diff --git a/Zend/tests/bug69092.phpt b/Zend/tests/bug69092.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #69092 (Declare Encoding Compile Check Wrong)
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=On
 --FILE--

diff --git a/Zend/tests/bug70914.phpt b/Zend/tests/bug70914.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #70914 zend_throw_or_error() format string vulnerability
---SKIPIF--
-<?php
-if (!extension_loaded("pdo_sqlite")) {
-    die("skip pdo_sqlite required");
-}
-?>
+--EXTENSIONS--
+pdo_sqlite
 --FILE--
 <?php
 

diff --git a/Zend/tests/bug71428.2.phpt b/Zend/tests/bug71428.2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #71428.2: inheritance of ye olde dynamic interfaces
---SKIPIF--
-<?php if (!extension_loaded('pdo')) die("skip PDO is not available"); ?>
+--EXTENSIONS--
+pdo
 --FILE--
 <?php
 interface StatementInterface {

diff --git a/Zend/tests/bug71930.phpt b/Zend/tests/bug71930.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed)
---SKIPIF--
-<?php
-if (!extension_loaded("curl")) {
-  die("skip Require a resource which is able to hold a callback");
-}
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 

diff --git a/Zend/tests/bug78239.phpt b/Zend/tests/bug78239.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78239: Deprecation notice during string conversion converted to exception hangs
---SKIPIF--
-<?php if (!extension_loaded("zend_test")) die("skip requires zend_test extension"); ?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 function handleError($level, $message, $file = '', $line = 0, $context = [])

diff --git a/Zend/tests/bug78335_2.phpt b/Zend/tests/bug78335_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78335: Static properties containing cycles report as leak (internal class variant)
---SKIPIF--
-<?php if (!extension_loaded("zend_test")) die("skip requires zend_test"); ?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/bug78770.phpt b/Zend/tests/bug78770.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #78770: Incorrect callability check inside internal methods
---SKIPIF--
-<?php
-if (!extension_loaded("intl")) die("skip requires intl");
-?>
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 

diff --git a/Zend/tests/bug79919.phpt b/Zend/tests/bug79919.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79919 (Stack use-after-scope in define())
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $b = error_log(0);

diff --git a/Zend/tests/call_to_deprecated_function_args.phpt b/Zend/tests/call_to_deprecated_function_args.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Check that arguments are freed when calling a deprecated function
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/const_deprecation.phpt b/Zend/tests/const_deprecation.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Internal constant deprecation
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip requires zend_test');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/declare_001.phpt b/Zend/tests/declare_001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Testing declare statement with several type values
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires ext/mbstring");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--

diff --git a/Zend/tests/declare_002.phpt b/Zend/tests/declare_002.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Testing declare statement with several type values
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires ext/mbstring");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--

diff --git a/Zend/tests/inherit_internal_static.phpt b/Zend/tests/inherit_internal_static.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Inherit internal static property into userland class
---SKIPIF--
-<?php if (!extension_loaded('zend_test')) die('skip requires zend_test'); ?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/iterable_or_null.phpt b/Zend/tests/iterable_or_null.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test Z_PARAM_ITERABLE() and Z_PARAM_ITERABLE_OR_NULL
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/multibyte/bug68665.phpt b/Zend/tests/multibyte/bug68665.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Crash with Big5
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 internal_encoding=big5

diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Zend Multibyte and ShiftJIS
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 internal_encoding=SJIS

diff --git a/Zend/tests/multibyte/multibyte_encoding_002.phpt b/Zend/tests/multibyte/multibyte_encoding_002.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Zend Multibyte and UTF-8 BOM
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 internal_encoding=iso-8859-1

diff --git a/Zend/tests/multibyte/multibyte_encoding_003.phpt b/Zend/tests/multibyte/multibyte_encoding_003.phpt
diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
@@ -1,11 +1,7 @@
 --TEST--
 test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 zend.script_encoding=Shift_JIS

diff --git a/Zend/tests/multibyte/multibyte_encoding_005.phpt b/Zend/tests/multibyte/multibyte_encoding_005.phpt
@@ -1,11 +1,7 @@
 --TEST--
 encoding conversion from script encoding into internal encoding
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 mbstring.encoding_translation = On

diff --git a/Zend/tests/ns_086.phpt b/Zend/tests/ns_086.phpt
@@ -1,11 +1,7 @@
 --TEST--
 086: bracketed namespace with encoding
---SKIPIF--
-<?php
-if (!extension_loaded("mbstring")) {
-  die("skip Requires mbstring extension");
-}
-?>
+--EXTENSIONS--
+mbstring
 --INI--
 zend.multibyte=1
 --FILE--

diff --git a/Zend/tests/overloaded_func_001.phpt b/Zend/tests/overloaded_func_001.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Overloaded function 001
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 $o = new _ZendTestChildClass();

diff --git a/Zend/tests/overloaded_func_002.phpt b/Zend/tests/overloaded_func_002.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Overloaded function 002
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 $a = new _ZendTestClass();

diff --git a/Zend/tests/return_types/internal_functions001.phpt b/Zend/tests/return_types/internal_functions001.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Return type for internal functions
+--EXTENSIONS--
+zend_test
 --SKIPIF--
 <?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 // Internal function return types are only checked in debug builds
 if (!PHP_DEBUG) die('skip requires debug build');
 ?>

diff --git a/Zend/tests/return_types/internal_functions002.phpt b/Zend/tests/return_types/internal_functions002.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Return type for internal functions 2
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 zend_test_nullable_array_return();

diff --git a/Zend/tests/return_types/internal_functions003.phpt b/Zend/tests/return_types/internal_functions003.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Return type for internal functions 3: Void return type
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 var_dump(zend_test_void_return());

diff --git a/Zend/tests/str_or_obj_of_class_zpp.phpt b/Zend/tests/str_or_obj_of_class_zpp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test Z_PARAM_OBJ_OF_CLASS_OR_STR() and Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/str_or_obj_zpp.phpt b/Zend/tests/str_or_obj_zpp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test Z_PARAM_OBJ_OR_STR() and Z_PARAM_OBJ_OR_STR_OR_NULL
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
-?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 

diff --git a/Zend/tests/temporary_cleaning_014.phpt b/Zend/tests/temporary_cleaning_014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Leak in JMP_SET
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 set_error_handler(function() { throw new Exception; });