Give a reason why the test was skipped

7 files changed, 7 insertions, 7 deletions

diff --git a/Zend/tests/overloaded_func_001.phpt b/Zend/tests/overloaded_func_001.phpt
index 0b7360e8f9..31585d505a 100644
--- a/Zend/tests/overloaded_func_001.phpt
+++ b/Zend/tests/overloaded_func_001.phpt
@@ -2,7 +2,7 @@
 Overloaded function 001
 --SKIPIF--
 <?php
-if (!class_exists('_ZendTestClass')) die("skip needs class with overloaded function");
+if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/overloaded_func_002.phpt b/Zend/tests/overloaded_func_002.phpt
index 2762f41840..a02f1e8e37 100644
--- a/Zend/tests/overloaded_func_002.phpt
+++ b/Zend/tests/overloaded_func_002.phpt
@@ -2,7 +2,7 @@
 Overloaded function 002
 --SKIPIF--
 <?php
-if (!class_exists('_ZendTestClass')) die("skip needs class with overloaded function");
+if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/return_types/internal_functions001.phpt b/Zend/tests/return_types/internal_functions001.phpt
index 5dfd2784da..7ec5b9c08f 100644
--- a/Zend/tests/return_types/internal_functions001.phpt
+++ b/Zend/tests/return_types/internal_functions001.phpt
@@ -2,7 +2,7 @@
 Return type for internal functions
 --SKIPIF--
 <?php
-if (!function_exists('zend_test_array_return')) die('skip');
+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
index 0daf3481c8..531b6c452d 100644
--- a/Zend/tests/return_types/internal_functions002.phpt
+++ b/Zend/tests/return_types/internal_functions002.phpt
@@ -2,7 +2,7 @@
 Return type for internal functions 2
 --SKIPIF--
 <?php
-if (!function_exists('zend_test_nullable_array_return')) die('skip');
+if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 --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
index d2696a78c1..a7e71204fa 100644
--- a/Zend/tests/return_types/internal_functions003.phpt
+++ b/Zend/tests/return_types/internal_functions003.phpt
@@ -2,7 +2,7 @@
 Return type for internal functions 3: Void return type
 --SKIPIF--
 <?php
-if (!function_exists('zend_test_void_return')) die('skip');
+if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 --FILE--
 <?php
 var_dump(zend_test_void_return());
diff --git a/Zend/tests/traits/bug69579.phpt b/Zend/tests/traits/bug69579.phpt
index 009bddadca..94387ce3cd 100644
--- a/Zend/tests/traits/bug69579.phpt
+++ b/Zend/tests/traits/bug69579.phpt
@@ -2,7 +2,7 @@
 Bug #69579 (Internal trait double-free)
 --SKIPIF--
 <?php
-if (!trait_exists('_ZendTestTrait')) die("skip requires internal trait");
+if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/bug76337.phpt b/ext/opcache/tests/bug76337.phpt
index 07608e2660..fe3fd8d40e 100644
--- a/Zend/tests/bug76337.phpt
+++ b/ext/opcache/tests/bug76337.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug 76337: segmentation fault when an extension use zend_register_class_alias() and opcache enabled
 --SKIPIF--
-<?php if (!class_exists('_ZendTestClass') || !extension_loaded('Zend OPcache')) die('skip');
+<?php if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
 --INI--
 opcache.enable=1
 opcache.enable_cli=1