php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 22:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Add additional param to get_loaded_extensions() for returning Zend

Browse Source 
extensions (Fixes #41278) [DOC]
This commit is contained in:
Johannes Schlüter
2007-07-31 22:47:25 +00:00
parent 52bb8f78a0
commit ebaba40774
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/tests/017.phpt
View File

@@ -10,9 +10,9 @@ var_dump(get_resource_type($fp));
fclose($fp);
var_dump(get_resource_type($fp));
var_dump(get_loaded_extensions(true));
var_dump(gettype(get_loaded_extensions()));
var_dump(count(get_loaded_extensions()));
var_dump(count(get_loaded_extensions(true)));
define("USER_CONSTANT", "test");
@@ -50,11 +50,9 @@ Warning: Supplied argument is not a valid resource handle in %s on line %d
bool(false)
string(6) "stream"
string(7) "Unknown"
Warning: Wrong parameter count for get_loaded_extensions() in %s on line %d
NULL
string(5) "array"
int(%d)
int(2)
Warning: Wrong parameter count for get_defined_constants() in %s on line %d
NULL

32
Zend/zend_builtin_functions.c
View File

@@ -25,6 +25,7 @@
#include "zend_constants.h"
#include "zend_ini.h"
#include "zend_exceptions.h"
#include "zend_extensions.h"
#undef ZEND_TEST_EXCEPTIONS
@@ -1548,6 +1549,13 @@ static int add_extension_info(zend_module_entry *module, void *arg TSRMLS_DC)
return 0;
}
static int add_zendext_info(zend_extension *ext, void *arg TSRMLS_DC)
{
zval *name_array = (zval *)arg;
add_next_index_string(name_array, ext->name, 1);
return 0;
}
static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC)
{
zval *name_array = (zval *)arg;
@@ -1562,16 +1570,34 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC)
}
/* {{{ proto array get_loaded_extensions(void)
/* {{{ proto array get_loaded_extensions([mixed categorize]) U
Return an array containing names of loaded extensions */
ZEND_FUNCTION(get_loaded_extensions)
{
if (ZEND_NUM_ARGS() != 0) {
int argc = ZEND_NUM_ARGS();
if (argc != 0 && argc != 1) {
ZEND_WRONG_PARAM_COUNT();
}
array_init(return_value);
zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) add_extension_info, return_value TSRMLS_CC);
if (argc) {
zval *modules;
zval *extensions;
MAKE_STD_ZVAL(modules);
array_init(modules);
zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) add_extension_info, modules TSRMLS_CC);
add_assoc_zval_ex(return_value, "PHP Modules", sizeof("PHP Modules"), modules);
MAKE_STD_ZVAL(extensions);
array_init(extensions);
zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) add_zendext_info, extensions TSRMLS_CC);
add_assoc_zval_ex(return_value, "Zend Extensions", sizeof("Zend Extensions"), extensions);
} else {
zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) add_extension_info, return_value TSRMLS_CC);
}
}
/* }}} */