diff options
Diffstat (limited to 'ext/zend_test')
| -rw-r--r-- | ext/zend_test/test.c | 12 | ||||
| -rw-r--r-- | ext/zend_test/tests/observer_jit_01.phpt | 25 |
2 files changed, 6 insertions, 31 deletions
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 0e4040d1bd..4ca98a3c08 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -317,7 +317,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("zend_test.observer.show_return_value", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_show_return_value, zend_zend_test_globals, zend_test_globals) PHP_INI_END() -static zend_observer_fcall observer_fcall_init(zend_function *fbc); +static zend_observer_fcall_handlers observer_fcall_init(zend_function *fbc); PHP_MINIT_FUNCTION(zend_test) { @@ -498,20 +498,20 @@ static void observer_show_init(zend_function *fbc) } } -static zend_observer_fcall observer_fcall_init(zend_function *fbc) +static zend_observer_fcall_handlers observer_fcall_init(zend_function *fbc) { if (ZT_G(observer_show_output)) { observer_show_init(fbc); } if (ZT_G(observer_observe_all)) { - return (zend_observer_fcall){observer_begin, observer_end}; + return (zend_observer_fcall_handlers){observer_begin, observer_end}; } else if (ZT_G(observer_observe_includes) && !fbc->common.function_name) { - return (zend_observer_fcall){observer_begin, observer_end}; + return (zend_observer_fcall_handlers){observer_begin, observer_end}; } else if (ZT_G(observer_observe_functions) && fbc->common.function_name) { - return (zend_observer_fcall){observer_begin, observer_end}; + return (zend_observer_fcall_handlers){observer_begin, observer_end}; } - return (zend_observer_fcall){NULL, NULL}; + return (zend_observer_fcall_handlers){NULL, NULL}; } PHP_RINIT_FUNCTION(zend_test) diff --git a/ext/zend_test/tests/observer_jit_01.phpt b/ext/zend_test/tests/observer_jit_01.phpt deleted file mode 100644 index f489986b6e..0000000000 --- a/ext/zend_test/tests/observer_jit_01.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -Observer: JIT is disabled when observer extension is present ---SKIPIF-- -<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?> -<?php if (!extension_loaded('Zend OPcache')) die('skip: OPcache extension required'); ?> -<?php if (!isset(opcache_get_status()['jit'])) die('skip: Build with JIT required'); ?> ---INI-- -zend_test.observer.enabled=1 -zend_test.observer.observe_all=1 -opcache.enable=1 -opcache.enable_cli=1 -opcache.jit=1 -opcache.jit_buffer_size=1M ---FILE-- -<?php -$status = opcache_get_status(); -echo 'JIT enabled: ' . ($status['jit']['enabled'] ? 'yes' : 'no') . PHP_EOL; -echo 'JIT on: ' . ($status['jit']['on'] ? 'yes' : 'no') . PHP_EOL; -?> ---EXPECTF-- -<!-- init '%s/observer_jit_%d.php' --> -<file '%s/observer_jit_%d.php'> -JIT enabled: no -JIT on: no -</file '%s/observer_jit_%d.php'> |