Rename zend-test to zend_test

The extension name should match the name of the ext/ directory,
otherwise it will not get picked up by run-tests. It would be possible
to remap this in run-tests, but I think it's better to rename the
extension to follow the standard format. Other extensions also
use underscore instead of hyphen (e.g. pdo_mysql and not pdo-mysql).
Of course, the ./configure option remains hyphenated.

Closes GH-6613.

Zend/tests/attributes/016_custom_attribute_validation.phpt

@@ -2,8 +2,8 @@
 Attribute validation callback of internal attributes.
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) {
-    echo "skip requires zend-test extension\n";
+if (!extension_loaded('zend_test')) {
+    echo "skip requires zend_test extension\n";
 }
 --FILE--
 <?php

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"); ?>
+<?php if (!extension_loaded("zend_test")) die("skip requires zend_test extension"); ?>
 --FILE--
 <?php
 function handleError($level, $message, $file = '', $line = 0, $context = [])

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"); ?>
+<?php if (!extension_loaded("zend_test")) die("skip requires zend_test"); ?>
 --FILE--
 <?php
 

Zend/tests/call_to_deprecated_function_args.phpt

@@ -2,7 +2,7 @@
 Check that arguments are freed when calling a deprecated function
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 --FILE--
 <?php
 

Zend/tests/const_deprecation.phpt

@@ -2,7 +2,7 @@
 Internal constant deprecation
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip requires zend-test');
+if (!extension_loaded('zend_test')) die('skip requires zend_test');
 ?>
 --FILE--
 <?php

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'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip requires zend_test'); ?>
 --FILE--
 <?php
 

Zend/tests/iterable_or_null.phpt

@@ -2,7 +2,7 @@
 Test Z_PARAM_ITERABLE() and Z_PARAM_ITERABLE_OR_NULL
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/overloaded_func_001.phpt

@@ -2,7 +2,7 @@
 Overloaded function 001
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/overloaded_func_002.phpt

@@ -2,7 +2,7 @@
 Overloaded function 002
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/return_types/internal_functions001.phpt

@@ -2,7 +2,7 @@
 Return type for internal functions
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+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');
 ?>

Zend/tests/return_types/internal_functions002.phpt

@@ -2,7 +2,7 @@
 Return type for internal functions 2
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 --FILE--
 <?php
 zend_test_nullable_array_return();

Zend/tests/return_types/internal_functions003.phpt

@@ -2,7 +2,7 @@
 Return type for internal functions 3: Void return type
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 --FILE--
 <?php
 var_dump(zend_test_void_return());

Zend/tests/str_or_obj_of_class_zpp.phpt

@@ -2,7 +2,7 @@
 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');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/str_or_obj_zpp.phpt

@@ -2,7 +2,7 @@
 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');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/traits/bug69579.phpt

@@ -2,7 +2,7 @@
 Bug #69579 (Internal trait double-free)
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/type_declarations/typed_properties_095.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Typed properties in internal classes
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip requires zend-test'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip requires zend_test'); ?>
 --FILE--
 <?php
 

Zend/tests/type_declarations/union_types/inheritance_internal.phpt

@@ -2,7 +2,7 @@
 Inheritance of union type from internal class
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip requires zend-test extension');
+if (!extension_loaded('zend_test')) die('skip requires zend_test extension');
 ?>
 --FILE--
 <?php

ext/ffi/tests/bug79096.phpt

@@ -3,7 +3,7 @@ Bug #79096 (FFI Struct Segfault)
 --SKIPIF--
 <?php
 if (!extension_loaded('ffi')) die('skip ffi extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not available');
 ?>
 --FILE--
 <?php

ext/ffi/tests/bug79177.phpt

@@ -3,7 +3,7 @@ Bug #79177 (FFI doesn't handle well PHP exceptions within callback)
 --SKIPIF--
 <?php
 if (!extension_loaded('ffi')) die('skip ffi extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not available');
 ?>
 --FILE--
 <?php

ext/ffi/tests/bug79532.phpt

@@ -3,7 +3,7 @@ Bug #79532 (sizeof off_t can be wrong)
 --SKIPIF--
 <?php
 if (!extension_loaded('ffi')) die('skip ffi extension not available');
-if (!extension_loaded('zend-test')) die('skip zend-test extension not available');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not available');
 ?>
 --FILE--
 <?php

ext/opcache/tests/bug76337.phpt

@@ -2,7 +2,7 @@
 Bug 76337: segmentation fault when an extension use zend_register_class_alias() and opcache enabled
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+<?php if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 --INI--
 opcache.enable=1
 opcache.enable_cli=1

ext/opcache/tests/internal_func_info_static_method.phpt

@@ -2,7 +2,7 @@
 Internal static methods should not be confused with global functions
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip requires zend-test');
+if (!extension_loaded('zend_test')) die('skip requires zend_test');
 ?>
 --FILE--
 <?php

ext/opcache/tests/jit/bug80426.phpt

@@ -8,7 +8,7 @@ zend_test.replace_zend_execute_ex=1
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php if (!isset(opcache_get_status()["jit"])) die('skip: JIT is not available'); ?>
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --FILE--
 <?php
 

ext/zend_test/config.m4

@@ -1,7 +1,7 @@
 PHP_ARG_ENABLE([zend-test],
   [whether to enable zend-test extension],
   [AS_HELP_STRING([--enable-zend-test],
-    [Enable zend-test extension])])
+    [Enable zend_test extension])])
 
 if test "$PHP_ZEND_TEST" != "no"; then
   PHP_NEW_EXTENSION(zend_test, test.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)

ext/zend_test/config.w32

@@ -1,6 +1,6 @@
 // vim:ft=javascript
 
-ARG_ENABLE("zend-test", "enable zend-test extension", "no");
+ARG_ENABLE("zend-test", "enable zend_test extension", "no");
 
 if (PHP_ZEND_TEST != "no") {
 	EXTENSION("zend_test", "test.c", PHP_ZEND_TEST_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");

ext/zend_test/test.c

@@ -607,7 +607,7 @@ static PHP_GINIT_FUNCTION(zend_test)
 PHP_MINFO_FUNCTION(zend_test)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "zend-test extension", "enabled");
+	php_info_print_table_header(2, "zend_test extension", "enabled");
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();
@@ -615,7 +615,7 @@ PHP_MINFO_FUNCTION(zend_test)
 
 zend_module_entry zend_test_module_entry = {
 	STANDARD_MODULE_HEADER,
-	"zend-test",
+	"zend_test",
 	ext_functions,
 	PHP_MINIT(zend_test),
 	PHP_MSHUTDOWN(zend_test),

ext/zend_test/tests/observer_backtrace_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Show backtrace on init
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_basic_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of userland functions
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_basic_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of userland methods
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_basic_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of includes
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_basic_04.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of includes only (no functions)
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_includes=1

ext/zend_test/tests/observer_basic_05.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of functions only (no includes)
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_functions=1

ext/zend_test/tests/observer_call_user_func_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: call_user_func() from root namespace
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_call_user_func_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: call_user_func_array() from root namespace
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_call_user_func_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: call_user_func() from namespace
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_call_user_func_04.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: call_user_func_array() from namespace
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_closure_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of closures
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_error_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: End handlers fire after a fatal error
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_error_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: End handlers fire after a userland fatal error
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_error_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: non-fatal errors do not fire end handlers prematurely
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_error_04.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: fatal errors caught with zend_try will not fire end handlers prematurely
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 <?php if (!extension_loaded('soap')) die('skip: soap extension required'); ?>
 --INI--
 zend_test.observer.enabled=1

ext/zend_test/tests/observer_eval_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic eval observability
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_exception_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic observability of userland functions with uncaught exceptions
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_generator_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic generator observability
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_generator_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Generator with explicit return
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_generator_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Generator with 'yield from'
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_generator_04.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Generator with manual traversal
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_generator_05.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Generator with uncaught exception
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_magic_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Basic magic method observability
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_opline_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Ensure opline exists on the execute_data
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: IS_CONST
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Unused retvals from generators are still observable
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: refcounted, IS_CV
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_04.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: refcounted, IS_VAR
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_05.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: IS_CV, IS_UNDEF
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_06.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: IS_CV
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_07.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals are observable that are: IS_REFERENCE, IS_VAR
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_by_ref_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals by reference are observable that are: IS_CV
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_by_ref_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals by reference are observable that are: IS_TMP_VAR
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_retval_by_ref_03.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Retvals by reference are observable that are: IS_VAR, ZEND_RETURNS_FUNCTION
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_shutdown_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Function calls from a shutdown handler are observable
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_shutdown_02.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Function calls from a __destruct during shutdown are observable
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_types_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Observe basic TypeError
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1

ext/zend_test/tests/observer_zend_call_function_01.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Observer: Calls that go through zend_call_function are observed
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --INI--
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1