diff options
| author | Max Semenik <maxsem.wiki@gmail.com> | 2020-07-01 16:32:55 +0300 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-07-06 21:13:34 +0200 |
| commit | 2b5de6f839feea0ae1d5289d59dd7f159fcdcc8c (patch) | |
| tree | f23a5c00a96f30a62ddcf626b4c6a6d53809d14f | |
| parent | 47579986504022d3eab38e24fff5861d5e4eadad (diff) | |
| download | php-git-2b5de6f839feea0ae1d5289d59dd7f159fcdcc8c.tar.gz | |
Remove proto comments from C files
Closes GH-5758
234 files changed, 3892 insertions, 8084 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 47c44c8fd6..f766227343 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -65,8 +65,7 @@ int zend_startup_builtin_functions(void) /* {{{ */ } /* }}} */ -/* {{{ proto string zend_version(void) - Get the version of the Zend Engine */ +/* {{{ Get the version of the Zend Engine */ ZEND_FUNCTION(zend_version) { ZEND_PARSE_PARAMETERS_NONE(); @@ -75,8 +74,7 @@ ZEND_FUNCTION(zend_version) } /* }}} */ -/* {{{ proto int gc_mem_caches(void) - Reclaims memory used by MM caches. +/* {{{ Reclaims memory used by MM caches. Returns number of freed bytes */ ZEND_FUNCTION(gc_mem_caches) { @@ -86,8 +84,7 @@ ZEND_FUNCTION(gc_mem_caches) } /* }}} */ -/* {{{ proto int gc_collect_cycles(void) - Forces collection of any existing garbage cycles. +/* {{{ Forces collection of any existing garbage cycles. Returns number of freed zvals */ ZEND_FUNCTION(gc_collect_cycles) { @@ -97,8 +94,7 @@ ZEND_FUNCTION(gc_collect_cycles) } /* }}} */ -/* {{{ proto void gc_enabled(void) - Returns status of the circular reference collector */ +/* {{{ Returns status of the circular reference collector */ ZEND_FUNCTION(gc_enabled) { ZEND_PARSE_PARAMETERS_NONE(); @@ -107,8 +103,7 @@ ZEND_FUNCTION(gc_enabled) } /* }}} */ -/* {{{ proto void gc_enable(void) - Activates the circular reference collector */ +/* {{{ Activates the circular reference collector */ ZEND_FUNCTION(gc_enable) { zend_string *key; @@ -121,8 +116,7 @@ ZEND_FUNCTION(gc_enable) } /* }}} */ -/* {{{ proto void gc_disable(void) - Deactivates the circular reference collector */ +/* {{{ Deactivates the circular reference collector */ ZEND_FUNCTION(gc_disable) { zend_string *key; @@ -135,8 +129,7 @@ ZEND_FUNCTION(gc_disable) } /* }}} */ -/* {{{ proto array gc_status(void) - Returns current GC statistics */ +/* {{{ Returns current GC statistics */ ZEND_FUNCTION(gc_status) { zend_gc_status status; @@ -154,8 +147,7 @@ ZEND_FUNCTION(gc_status) } /* }}} */ -/* {{{ proto int func_num_args(void) - Get the number of arguments that were passed to the function */ +/* {{{ Get the number of arguments that were passed to the function */ ZEND_FUNCTION(func_num_args) { zend_execute_data *ex = EX(prev_execute_data); @@ -175,8 +167,7 @@ ZEND_FUNCTION(func_num_args) } /* }}} */ -/* {{{ proto mixed func_get_arg(int arg_num) - Get the $arg_num'th argument that was passed to the function */ +/* {{{ Get the $arg_num'th argument that was passed to the function */ ZEND_FUNCTION(func_get_arg) { uint32_t arg_count, first_extra_arg; @@ -222,8 +213,7 @@ ZEND_FUNCTION(func_get_arg) } /* }}} */ -/* {{{ proto array func_get_args() - Get an array of the arguments that were passed to the function */ +/* {{{ Get an array of the arguments that were passed to the function */ ZEND_FUNCTION(func_get_args) { zval *p, *q; @@ -292,8 +282,7 @@ ZEND_FUNCTION(func_get_args) } /* }}} */ -/* {{{ proto int strlen(string str) - Get string length +/* {{{ Get string length Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ ZEND_FUNCTION(strlen) { @@ -307,8 +296,7 @@ ZEND_FUNCTION(strlen) } /* }}} */ -/* {{{ proto int strcmp(string str1, string str2) - Binary safe string comparison */ +/* {{{ Binary safe string comparison */ ZEND_FUNCTION(strcmp) { zend_string *s1, *s2; @@ -322,8 +310,7 @@ ZEND_FUNCTION(strcmp) } /* }}} */ -/* {{{ proto int strncmp(string str1, string str2, int len) - Binary safe string comparison */ +/* {{{ Binary safe string comparison */ ZEND_FUNCTION(strncmp) { zend_string *s1, *s2; @@ -344,8 +331,7 @@ ZEND_FUNCTION(strncmp) } /* }}} */ -/* {{{ proto int strcasecmp(string str1, string str2) - Binary safe case-insensitive string comparison */ +/* {{{ Binary safe case-insensitive string comparison */ ZEND_FUNCTION(strcasecmp) { zend_string *s1, *s2; @@ -359,8 +345,7 @@ ZEND_FUNCTION(strcasecmp) } /* }}} */ -/* {{{ proto int strncasecmp(string str1, string str2, int len) - Binary safe string comparison */ +/* {{{ Binary safe string comparison */ ZEND_FUNCTION(strncasecmp) { zend_string *s1, *s2; @@ -381,8 +366,7 @@ ZEND_FUNCTION(strncasecmp) } /* }}} */ -/* {{{ proto int error_reporting([int new_error_level]) - Return the current error_reporting level, and if an argument was passed - change to the new level */ +/* {{{ Return the current error_reporting level, and if an argument was passed - change to the new level */ ZEND_FUNCTION(error_reporting) { zval *err = NULL; @@ -496,8 +480,7 @@ static void copy_constant_array(zval *dst, zval *src) /* {{{ */ } /* }}} */ -/* {{{ proto bool define(string constant_name, mixed value[, bool case_insensitive]) - Define a new constant */ +/* {{{ Define a new constant */ ZEND_FUNCTION(define) { zend_string *name; @@ -571,8 +554,7 @@ register_constant: } /* }}} */ -/* {{{ proto bool defined(string constant_name) - Check whether a constant exists +/* {{{ Check whether a constant exists Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ ZEND_FUNCTION(defined) { @@ -590,8 +572,7 @@ ZEND_FUNCTION(defined) } /* }}} */ -/* {{{ proto string get_class([object object]) - Retrieves the class name */ +/* {{{ Retrieves the class name */ ZEND_FUNCTION(get_class) { zval *obj = NULL; @@ -615,8 +596,7 @@ ZEND_FUNCTION(get_class) } /* }}} */ -/* {{{ proto string get_called_class() - Retrieves the "Late Static Binding" class name */ +/* {{{ Retrieves the "Late Static Binding" class name */ ZEND_FUNCTION(get_called_class) { zend_class_entry *called_scope; @@ -633,8 +613,7 @@ ZEND_FUNCTION(get_called_class) } /* }}} */ -/* {{{ proto mixed get_parent_class([mixed object]) - Retrieves the parent class name for object or class or current scope or false if not in a scope. */ +/* {{{ Retrieves the parent class name for object or class or current scope or false if not in a scope. */ ZEND_FUNCTION(get_parent_class) { zend_class_entry *ce = NULL; @@ -708,16 +687,14 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /* } /* }}} */ -/* {{{ proto bool is_subclass_of(mixed object_or_string, string class_name [, bool allow_string]) - Returns true if the object has this class as one of its parents */ +/* {{{ Returns true if the object has this class as one of its parents */ ZEND_FUNCTION(is_subclass_of) { is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool is_a(mixed object_or_string, string class_name [, bool allow_string]) - Returns true if the first argument is an object and is this class or has this class as one of its parents, */ +/* {{{ Returns true if the first argument is an object and is this class or has this class as one of its parents, */ ZEND_FUNCTION(is_a) { is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -771,8 +748,7 @@ static void add_class_vars(zend_class_entry *scope, zend_class_entry *ce, int st } /* }}} */ -/* {{{ proto array get_class_vars(string class_name) - Returns an array of default properties of the class. */ +/* {{{ Returns an array of default properties of the class. */ ZEND_FUNCTION(get_class_vars) { zend_string *class_name; @@ -799,8 +775,7 @@ ZEND_FUNCTION(get_class_vars) } /* }}} */ -/* {{{ proto array get_object_vars(object obj) - Returns an array of object properties */ +/* {{{ Returns an array of object properties */ ZEND_FUNCTION(get_object_vars) { zval *obj; @@ -870,8 +845,7 @@ ZEND_FUNCTION(get_object_vars) } /* }}} */ -/* {{{ proto array get_mangled_object_vars(object obj) - Returns an array of mangled object properties. Does not respect property visibility. */ +/* {{{ Returns an array of mangled object properties. Does not respect property visibility. */ ZEND_FUNCTION(get_mangled_object_vars) { zval *obj; @@ -913,8 +887,7 @@ static int same_name(zend_string *key, zend_string *name) /* {{{ */ } /* }}} */ -/* {{{ proto array get_class_methods(mixed class) - Returns an array of method names for class or class instance. */ +/* {{{ Returns an array of method names for class or class instance. */ ZEND_FUNCTION(get_class_methods) { zval method_name; @@ -944,8 +917,7 @@ ZEND_FUNCTION(get_class_methods) } /* }}} */ -/* {{{ proto bool method_exists(object object, string method) - Checks if the class method exists */ +/* {{{ Checks if the class method exists */ ZEND_FUNCTION(method_exists) { zval *klass; @@ -1002,8 +974,7 @@ ZEND_FUNCTION(method_exists) } /* }}} */ -/* {{{ proto bool property_exists(mixed object_or_class, string property_name) - Checks if the object or class has a property */ +/* {{{ Checks if the object or class has a property */ ZEND_FUNCTION(property_exists) { zval *object; @@ -1078,32 +1049,28 @@ static inline void class_exists_impl(INTERNAL_FUNCTION_PARAMETERS, int flags, in } /* {{{ */ -/* {{{ proto bool class_exists(string classname [, bool autoload]) - Checks if the class exists */ +/* {{{ Checks if the class exists */ ZEND_FUNCTION(class_exists) { class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT); } /* }}} */ -/* {{{ proto bool interface_exists(string classname [, bool autoload]) - Checks if the class exists */ +/* {{{ Checks if the class exists */ ZEND_FUNCTION(interface_exists) { class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED|ZEND_ACC_INTERFACE, 0); } /* }}} */ -/* {{{ proto bool trait_exists(string traitname [, bool autoload]) - Checks if the trait exists */ +/* {{{ Checks if the trait exists */ ZEND_FUNCTION(trait_exists) { class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0); } /* }}} */ -/* {{{ proto bool function_exists(string function_name) - Checks if the function exists */ +/* {{{ Checks if the function exists */ ZEND_FUNCTION(function_exists) { zend_string *name; @@ -1129,8 +1096,7 @@ ZEND_FUNCTION(function_exists) } /* }}} */ -/* {{{ proto bool class_alias(string user_class_name , string alias_name [, bool autoload]) - Creates an alias for user defined class */ +/* {{{ Creates an alias for user defined class */ ZEND_FUNCTION(class_alias) { zend_string *class_name; @@ -1164,8 +1130,7 @@ ZEND_FUNCTION(class_alias) } /* }}} */ -/* {{{ proto array get_included_files(void) - Returns an array with the file names that were include_once()'d */ +/* {{{ Returns an array with the file names that were include_once()'d */ ZEND_FUNCTION(get_included_files) { zend_string *entry; @@ -1181,8 +1146,7 @@ ZEND_FUNCTION(get_included_files) } /* }}} */ -/* {{{ proto bool trigger_error(string message [, int error_type]) - Generates a user-level error/warning/notice message */ +/* {{{ Generates a user-level error/warning/notice message */ ZEND_FUNCTION(trigger_error) { zend_long error_type = E_USER_NOTICE; @@ -1212,8 +1176,7 @@ ZEND_FUNCTION(trigger_error) } /* }}} */ -/* {{{ proto string set_error_handler(callable error_handler [, int error_types]) - Sets a user-defined error handler function. Returns the previously defined error handler, or false on error */ +/* {{{ Sets a user-defined error handler function. Returns the previously defined error handler, or false on error */ ZEND_FUNCTION(set_error_handler) { zval *error_handler; @@ -1249,8 +1212,7 @@ ZEND_FUNCTION(set_error_handler) } /* }}} */ -/* {{{ proto void restore_error_handler(void) - Restores the previously defined error handler function */ +/* {{{ Restores the previously defined error handler function */ ZEND_FUNCTION(restore_error_handler) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1279,8 +1241,7 @@ ZEND_FUNCTION(restore_error_handler) } /* }}} */ -/* {{{ proto mixed set_exception_handler(callable exception_handler) - Sets a user-defined exception handler function. Returns the previously defined exception handler, or false on error */ +/* {{{ Sets a user-defined exception handler function. Returns the previously defined exception handler, or false on error */ ZEND_FUNCTION(set_exception_handler) { zval *exception_handler; @@ -1313,8 +1274,7 @@ ZEND_FUNCTION(set_exception_handler) } /* }}} */ -/* {{{ proto void restore_exception_handler(void) - Restores the previously defined exception handler function */ +/* {{{ Restores the previously defined exception handler function */ ZEND_FUNCTION(restore_exception_handler) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1364,32 +1324,28 @@ static inline void get_declared_class_impl(INTERNAL_FUNCTION_PARAMETERS, int fla } /* {{{ */ -/* {{{ proto array get_declared_traits() - Returns an array of all declared traits. */ +/* {{{ Returns an array of all declared traits. */ ZEND_FUNCTION(get_declared_traits) { get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0); } /* }}} */ -/* {{{ proto array get_declared_classes() - Returns an array of all declared classes. */ +/* {{{ Returns an array of all declared classes. */ ZEND_FUNCTION(get_declared_classes) { get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT); } /* }}} */ -/* {{{ proto array get_declared_interfaces() - Returns an array of all declared interfaces. */ +/* {{{ Returns an array of all declared interfaces. */ ZEND_FUNCTION(get_declared_interfaces) { get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_INTERFACE, 0); } /* }}} */ -/* {{{ proto array get_defined_functions(void) - Returns an array of all defined functions */ +/* {{{ Returns an array of all defined functions */ ZEND_FUNCTION(get_defined_functions) { zval internal, user; @@ -1425,8 +1381,7 @@ ZEND_FUNCTION(get_defined_functions) } /* }}} */ -/* {{{ proto array get_defined_vars(void) - Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */ +/* {{{ Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */ ZEND_FUNCTION(get_defined_vars) { zend_array *symbol_table; @@ -1455,8 +1410,7 @@ ZEND_FUNCTION(zend_thread_id) } #endif -/* {{{ proto string get_resource_type(resource res) - Get the resource type name for a given resource */ +/* {{{ Get the resource type name for a given resource */ ZEND_FUNCTION(get_resource_type) { const char *resource_type; @@ -1475,8 +1429,7 @@ ZEND_FUNCTION(get_resource_type) } /* }}} */ -/* {{{ proto int get_resource_id(resource res) - Get the resource ID for a given resource */ +/* {{{ Get the resource ID for a given resource */ ZEND_FUNCTION(get_resource_id) { zval *resource; @@ -1489,8 +1442,7 @@ ZEND_FUNCTION(get_resource_id) } /* }}} */ -/* {{{ proto array get_resources([string resource_type]) - Get an array with all active resources */ +/* {{{ Get an array with all active resources */ ZEND_FUNCTION(get_resources) { zend_string *type = NULL; @@ -1544,8 +1496,7 @@ static void add_zendext_info(zend_extension *ext, void *arg) /* {{{ */ } /* }}} */ -/* {{{ proto array get_loaded_extensions([bool zend_extensions]) - Return an array containing names of loaded extensions */ +/* {{{ Return an array containing names of loaded extensions */ ZEND_FUNCTION(get_loaded_extensions) { zend_bool zendext = 0; @@ -1568,8 +1519,7 @@ ZEND_FUNCTION(get_loaded_extensions) } /* }}} */ -/* {{{ proto array get_defined_constants([bool categorize]) - Return an array containing the names and values of all defined constants */ +/* {{{ Return an array containing the names and values of all defined constants */ ZEND_FUNCTION(get_defined_constants) { zend_bool categorize = 0; @@ -1743,7 +1693,7 @@ static inline zend_bool skip_internal_handler(zend_execute_data *skip) /* {{{ */ } /* {{{ */ -/* {{{ proto void debug_print_backtrace([int options[, int limit]]) */ +/* {{{ */ ZEND_FUNCTION(debug_print_backtrace) { zend_execute_data *call, *ptr, *skip; @@ -2129,8 +2079,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int } /* }}} */ -/* {{{ proto array debug_backtrace([int options[, int limit]]) - Return backtrace as array */ +/* {{{ Return backtrace as array */ ZEND_FUNCTION(debug_backtrace) { zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT; @@ -2144,8 +2093,7 @@ ZEND_FUNCTION(debug_backtrace) } /* }}} */ -/* {{{ proto bool extension_loaded(string extension_name) - Returns true if the named extension is loaded */ +/* {{{ Returns true if the named extension is loaded */ ZEND_FUNCTION(extension_loaded) { zend_string *extension_name; @@ -2165,8 +2113,7 @@ ZEND_FUNCTION(extension_loaded) } /* }}} */ -/* {{{ proto array get_extension_funcs(string extension_name) - Returns an array with the names of functions belonging to the named extension */ +/* {{{ Returns an array with the names of functions belonging to the named extension */ ZEND_FUNCTION(get_extension_funcs) { zend_string *extension_name; diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 40ebaae0ab..7331188228 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -109,8 +109,7 @@ static zend_bool zend_valid_closure_binding( } /* }}} */ -/* {{{ proto mixed Closure::call(object to [, mixed parameter] [, mixed ...] ) - Call closure, binding to a given object with its class as the scope */ +/* {{{ Call closure, binding to a given object with its class as the scope */ ZEND_METHOD(Closure, call) { zval *newthis, closure_result; @@ -187,8 +186,7 @@ ZEND_METHOD(Closure, call) } /* }}} */ -/* {{{ proto Closure Closure::bind(callable old, object to [, mixed scope]) - Create a closure from another one and bind to another object and scope */ +/* {{{ Create a closure from another one and bind to another object and scope */ ZEND_METHOD(Closure, bind) { zval *newthis, *zclosure, *scope_arg = NULL; @@ -323,8 +321,7 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable, } /* }}} */ -/* {{{ proto Closure Closure::fromCallable(callable callable) - Create a closure from a callable using the current scope. */ +/* {{{ Create a closure from a callable using the current scope. */ ZEND_METHOD(Closure, fromCallable) { zval *callable; @@ -591,8 +588,7 @@ static HashTable *zend_closure_get_gc(zend_object *obj, zval **table, int *n) /* } /* }}} */ -/* {{{ proto Closure::__construct() - Private constructor preventing instantiation */ +/* {{{ Private constructor preventing instantiation */ ZEND_COLD ZEND_METHOD(Closure, __construct) { zend_throw_error(NULL, "Instantiation of 'Closure' is not allowed"); diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index c66a918993..4954a1bd5b 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -267,8 +267,7 @@ static zend_object *zend_error_exception_new(zend_class_entry *class_type) /* {{ } /* }}} */ -/* {{{ proto Exception|Error Exception|Error::__clone() - Clone the exception object */ +/* {{{ Clone the exception object */ ZEND_COLD ZEND_METHOD(Exception, __clone) { /* Should never be executable */ @@ -276,8 +275,7 @@ ZEND_COLD ZEND_METHOD(Exception, __clone) } /* }}} */ -/* {{{ proto Exception|Error::__construct(string message, int code [, Throwable previous]) - Exception constructor */ +/* {{{ Exception constructor */ ZEND_METHOD(Exception, __construct) { zend_string *message = NULL; @@ -308,8 +306,7 @@ ZEND_METHOD(Exception, __construct) } /* }}} */ -/* {{{ proto Exception::__wakeup() - Exception unserialize checks */ +/* {{{ Exception unserialize checks */ #define CHECK_EXC_TYPE(id, type) \ pvalue = zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &value); \ if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \ @@ -329,8 +326,7 @@ ZEND_METHOD(Exception, __wakeup) } /* }}} */ -/* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Throwable previous]]]) - ErrorException constructor */ +/* {{{ ErrorException constructor */ ZEND_METHOD(ErrorException, __construct) { zend_string *message = NULL, *filename = NULL; @@ -380,8 +376,7 @@ ZEND_METHOD(ErrorException, __construct) #define GET_PROPERTY_SILENT(object, id) \ zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &rv) -/* {{{ proto string Exception|Error::getFile() - Get the file in which the exception occurred */ +/* {{{ Get the file in which the exception occurred */ ZEND_METHOD(Exception, getFile) { zval *prop, rv; @@ -393,8 +388,7 @@ ZEND_METHOD(Exception, getFile) } /* }}} */ -/* {{{ proto int Exception|Error::getLine() - Get the line in which the exception occurred */ +/* {{{ Get the line in which the exception occurred */ ZEND_METHOD(Exception, getLine) { zval *prop, rv; @@ -406,8 +400,7 @@ ZEND_METHOD(Exception, getLine) } /* }}} */ -/* {{{ proto string Exception|Error::getMessage() - Get the exception message */ +/* {{{ Get the exception message */ ZEND_METHOD(Exception, getMessage) { zval *prop, rv; @@ -419,8 +412,7 @@ ZEND_METHOD(Exception, getMessage) } /* }}} */ -/* {{{ proto int Exception|Error::getCode() - Get the exception code */ +/* {{{ Get the exception code */ ZEND_METHOD(Exception, getCode) { zval *prop, rv; @@ -433,8 +425,7 @@ ZEND_METHOD(Exception, getCode) } /* }}} */ -/* {{{ proto array Exception|Error::getTrace() - Get the stack trace for the location in which the exception occurred */ +/* {{{ Get the stack trace for the location in which the exception occurred */ ZEND_METHOD(Exception, getTrace) { zval *prop, rv; @@ -447,8 +438,7 @@ ZEND_METHOD(Exception, getTrace) } /* }}} */ -/* {{{ proto int ErrorException::getSeverity() - Get the exception severity */ +/* {{{ Get the exception severity */ ZEND_METHOD(ErrorException, getSeverity) { zval *prop, rv; @@ -590,8 +580,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /* } /* }}} */ -/* {{{ proto string Exception|Error::getTraceAsString() - Obtain the backtrace for the exception as a string (instead of an array) */ +/* {{{ Obtain the backtrace for the exception as a string (instead of an array) */ ZEND_METHOD(Exception, getTraceAsString) { zval *trace, *frame, rv; @@ -631,8 +620,7 @@ ZEND_METHOD(Exception, getTraceAsString) } /* }}} */ -/* {{{ proto Throwable Exception|Error::getPrevious() - Return previous Throwable or NULL. */ +/* {{{ Return previous Throwable or NULL. */ ZEND_METHOD(Exception, getPrevious) { zval rv; @@ -642,8 +630,7 @@ ZEND_METHOD(Exception, getPrevious) ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS)); } /* }}} */ -/* {{{ proto string Exception|Error::__toString() - Obtain the string representation of the Exception object */ +/* {{{ Obtain the string representation of the Exception object */ ZEND_METHOD(Exception, __toString) { zval trace, *exception; diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index fe7066c0c8..21a44b3865 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -828,8 +828,7 @@ static inline void zend_generator_rewind(zend_generator *generator) /* {{{ */ } /* }}} */ -/* {{{ proto void Generator::rewind() - * Rewind the generator */ +/* {{{ Rewind the generator */ ZEND_METHOD(Generator, rewind) { zend_generator *generator; @@ -842,8 +841,7 @@ ZEND_METHOD(Generator, rewind) } /* }}} */ -/* {{{ proto bool Generator::valid() - * Check whether the generator is valid */ +/* {{{ Check whether the generator is valid */ ZEND_METHOD(Generator, valid) { zend_generator *generator; @@ -860,8 +858,7 @@ ZEND_METHOD(Generator, valid) } /* }}} */ -/* {{{ proto mixed Generator::current() - * Get the current value */ +/* {{{ Get the current value */ ZEND_METHOD(Generator, current) { zend_generator *generator, *root; @@ -881,8 +878,7 @@ ZEND_METHOD(Generator, current) } /* }}} */ -/* {{{ proto mixed Generator::key() - * Get the current key */ +/* {{{ Get the current key */ ZEND_METHOD(Generator, key) { zend_generator *generator, *root; @@ -902,8 +898,7 @@ ZEND_METHOD(Generator, key) } /* }}} */ -/* {{{ proto void Generator::next() - * Advances the generator */ +/* {{{ Advances the generator */ ZEND_METHOD(Generator, next) { zend_generator *generator; @@ -918,8 +913,7 @@ ZEND_METHOD(Generator, next) } /* }}} */ -/* {{{ proto mixed Generator::send(mixed value) - * Sends a value to the generator */ +/* {{{ Sends a value to the generator */ ZEND_METHOD(Generator, send) { zval *value; @@ -955,8 +949,7 @@ ZEND_METHOD(Generator, send) } /* }}} */ -/* {{{ proto mixed Generator::throw(Exception exception) - * Throws an exception into the generator */ +/* {{{ Throws an exception into the generator */ ZEND_METHOD(Generator, throw) { zval *exception; @@ -993,8 +986,7 @@ ZEND_METHOD(Generator, throw) } /* }}} */ -/* {{{ proto mixed Generator::getReturn() - * Retrieves the return value of the generator */ +/* {{{ Retrieves the return value of the generator */ ZEND_METHOD(Generator, getReturn) { zend_generator *generator; diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 5b82ec2f6a..373dee7aeb 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -60,8 +60,7 @@ static int get_int_val(zval *op) { } } -/* {{{ zend_ini_do_op() -*/ +/* {{{ zend_ini_do_op() */ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2) { int i_result; @@ -98,8 +97,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2) } /* }}} */ -/* {{{ zend_ini_init_string() -*/ +/* {{{ zend_ini_init_string() */ static void zend_ini_init_string(zval *result) { if (ZEND_SYSTEM_INI) { @@ -110,8 +108,7 @@ static void zend_ini_init_string(zval *result) } /* }}} */ -/* {{{ zend_ini_add_string() -*/ +/* {{{ zend_ini_add_string() */ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) { int length, op1_len; @@ -139,8 +136,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) } /* }}} */ -/* {{{ zend_ini_get_constant() -*/ +/* {{{ zend_ini_get_constant() */ static void zend_ini_get_constant(zval *result, zval *name) { zval *c, tmp; @@ -167,8 +163,7 @@ static void zend_ini_get_constant(zval *result, zval *name) } /* }}} */ -/* {{{ zend_ini_get_var() -*/ +/* {{{ zend_ini_get_var() */ static void zend_ini_get_var(zval *result, zval *name) { zval *curval; @@ -187,8 +182,7 @@ static void zend_ini_get_var(zval *result, zval *name) } /* }}} */ -/* {{{ ini_error() -*/ +/* {{{ ini_error() */ static ZEND_COLD void ini_error(const char *msg) { char *error_buf; @@ -217,8 +211,7 @@ static ZEND_COLD void ini_error(const char *msg) } /* }}} */ -/* {{{ zend_parse_ini_file() -*/ +/* {{{ zend_parse_ini_file() */ ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg) { int retval; @@ -246,8 +239,7 @@ ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_erro } /* }}} */ -/* {{{ zend_parse_ini_string() -*/ +/* {{{ zend_parse_ini_string() */ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg) { int retval; @@ -274,8 +266,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s } /* }}} */ -/* {{{ zval_ini_dtor() -*/ +/* {{{ zval_ini_dtor() */ static void zval_ini_dtor(zval *zv) { if (Z_TYPE_P(zv) == IS_STRING) { diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 1f4bc34742..e8641faa49 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -217,8 +217,7 @@ static void yy_scan_buffer(char *str, unsigned int len) #define ini_filename SCNG(filename) -/* {{{ init_ini_scanner() -*/ +/* {{{ init_ini_scanner() */ static int init_ini_scanner(int scanner_mode, zend_file_handle *fh) { /* Sanity check */ @@ -244,8 +243,7 @@ static int init_ini_scanner(int scanner_mode, zend_file_handle *fh) } /* }}} */ -/* {{{ shutdown_ini_scanner() -*/ +/* {{{ shutdown_ini_scanner() */ void shutdown_ini_scanner(void) { zend_stack_destroy(&SCNG(state_stack)); @@ -255,24 +253,21 @@ void shutdown_ini_scanner(void) } /* }}} */ -/* {{{ zend_ini_scanner_get_lineno() -*/ +/* {{{ zend_ini_scanner_get_lineno() */ ZEND_COLD int zend_ini_scanner_get_lineno(void) { return SCNG(lineno); } /* }}} */ -/* {{{ zend_ini_scanner_get_filename() -*/ +/* {{{ zend_ini_scanner_get_filename() */ ZEND_COLD char *zend_ini_scanner_get_filename(void) { return ini_filename ? ini_filename : "Unknown"; } /* }}} */ -/* {{{ zend_ini_open_file_for_scanning() -*/ +/* {{{ zend_ini_open_file_for_scanning() */ int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode) { char *buf; @@ -293,8 +288,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode) } /* }}} */ -/* {{{ zend_ini_prepare_string_for_scanning() -*/ +/* {{{ zend_ini_prepare_string_for_scanning() */ int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode) { int len = (int)strlen(str); @@ -309,8 +303,7 @@ int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode) } /* }}} */ -/* {{{ zend_ini_escape_string() - */ +/* {{{ zend_ini_escape_string() */ static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type) { register char *s, *t; diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index e69914752a..2086f03dd8 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -330,8 +330,7 @@ void zend_signal_activate(void) SIGG(depth) = 0; } /* }}} */ -/* {{{ zend_signal_deactivate - * */ +/* {{{ zend_signal_deactivate */ void zend_signal_deactivate(void) { if (SIGG(check)) { diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index f1e298b5cc..17f28f1781 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -79,8 +79,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(bcmath) { #if defined(COMPILE_DL_BCMATH) && defined(ZTS) @@ -91,8 +90,7 @@ static PHP_GINIT_FUNCTION(bcmath) } /* }}} */ -/* {{{ PHP_GSHUTDOWN_FUNCTION - */ +/* {{{ PHP_GSHUTDOWN_FUNCTION */ static PHP_GSHUTDOWN_FUNCTION(bcmath) { _bc_free_num_ex(&bcmath_globals->_zero_, 1); @@ -101,8 +99,7 @@ static PHP_GSHUTDOWN_FUNCTION(bcmath) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(bcmath) { REGISTER_INI_ENTRIES(); @@ -111,8 +108,7 @@ PHP_MINIT_FUNCTION(bcmath) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(bcmath) { UNREGISTER_INI_ENTRIES(); @@ -121,8 +117,7 @@ PHP_MSHUTDOWN_FUNCTION(bcmath) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(bcmath) { php_info_print_table_start(); @@ -151,8 +146,7 @@ static void php_str2num(bc_num *num, char *str) } /* }}} */ -/* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) - Returns the sum of two arbitrary precision numbers */ +/* {{{ Returns the sum of two arbitrary precision numbers */ PHP_FUNCTION(bcadd) { zend_string *left, *right; @@ -192,8 +186,7 @@ PHP_FUNCTION(bcadd) } /* }}} */ -/* {{{ proto string bcsub(string left_operand, string right_operand [, int scale]) - Returns the difference between two arbitrary precision numbers */ +/* {{{ Returns the difference between two arbitrary precision numbers */ PHP_FUNCTION(bcsub) { zend_string *left, *right; @@ -233,8 +226,7 @@ PHP_FUNCTION(bcsub) } /* }}} */ -/* {{{ proto string bcmul(string left_operand, string right_operand [, int scale]) - Returns the multiplication of two arbitrary precision numbers */ +/* {{{ Returns the multiplication of two arbitrary precision numbers */ PHP_FUNCTION(bcmul) { zend_string *left, *right; @@ -274,8 +266,7 @@ PHP_FUNCTION(bcmul) } /* }}} */ -/* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale]) - Returns the quotient of two arbitrary precision numbers (division) */ +/* {{{ Returns the quotient of two arbitrary precision numbers (division) */ PHP_FUNCTION(bcdiv) { zend_string *left, *right; @@ -322,8 +313,7 @@ PHP_FUNCTION(bcdiv) } /* }}} */ -/* {{{ proto string bcmod(string left_operand, string right_operand [, int scale]) - Returns the modulus of the two arbitrary precision operands */ +/* {{{ Returns the modulus of the two arbitrary precision operands */ PHP_FUNCTION(bcmod) { zend_string *left, *right; @@ -369,8 +359,7 @@ PHP_FUNCTION(bcmod) } /* }}} */ -/* {{{ proto string bcpowmod(string x, string y, string mod [, int scale]) - Returns the value of an arbitrary precision number raised to the power of another reduced by a modulus */ +/* {{{ Returns the value of an arbitrary precision number raised to the power of another reduced by a modulus */ PHP_FUNCTION(bcpowmod) { zend_string *left, *right, *modulus; @@ -423,8 +412,7 @@ PHP_FUNCTION(bcpowmod) } /* }}} */ -/* {{{ proto string bcpow(string x, string y [, int scale]) - Returns the value of an arbitrary precision number raised to the power of another */ +/* {{{ Returns the value of an arbitrary precision number raised to the power of another */ PHP_FUNCTION(bcpow) { zend_string *left, *right; @@ -463,8 +451,7 @@ PHP_FUNCTION(bcpow) } /* }}} */ -/* {{{ proto string bcsqrt(string operand [, int scale]) - Returns the square root of an arbitrary precision number */ +/* {{{ Returns the square root of an arbitrary precision number */ PHP_FUNCTION(bcsqrt) { zend_string *left; @@ -502,8 +489,7 @@ PHP_FUNCTION(bcsqrt) } /* }}} */ -/* {{{ proto int bccomp(string left_operand, string right_operand [, int scale]) - Compares two arbitrary precision numbers */ +/* {{{ Compares two arbitrary precision numbers */ PHP_FUNCTION(bccomp) { zend_string *left, *right; @@ -545,8 +531,7 @@ PHP_FUNCTION(bccomp) } /* }}} */ -/* {{{ proto int bcscale([int scale]) - Sets default scale parameter for all bc math functions */ +/* {{{ Sets default scale parameter for all bc math functions */ PHP_FUNCTION(bcscale) { zend_long old_scale, new_scale; diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index 575c129422..e5f06f6a6e 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -301,8 +301,7 @@ static PHP_MINFO_FUNCTION(bz2) php_info_print_table_end(); } -/* {{{ proto string bzread(resource bz[, int length]) - Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */ +/* {{{ Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */ PHP_FUNCTION(bzread) { zval *bz; @@ -329,8 +328,7 @@ PHP_FUNCTION(bzread) } /* }}} */ -/* {{{ proto resource bzopen(string|int file|fp, string mode) - Opens a new BZip2 stream */ +/* {{{ Opens a new BZip2 stream */ PHP_FUNCTION(bzopen) { zval *file; /* The file to open */ @@ -420,32 +418,28 @@ PHP_FUNCTION(bzopen) } /* }}} */ -/* {{{ proto int bzerrno(resource bz) - Returns the error number */ +/* {{{ Returns the error number */ PHP_FUNCTION(bzerrno) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO); } /* }}} */ -/* {{{ proto string bzerrstr(resource bz) - Returns the error string */ +/* {{{ Returns the error string */ PHP_FUNCTION(bzerrstr) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR); } /* }}} */ -/* {{{ proto array bzerror(resource bz) - Returns the error number and error string in an associative array */ +/* {{{ Returns the error number and error string in an associative array */ PHP_FUNCTION(bzerror) { php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH); } /* }}} */ -/* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]]) - Compresses a string into BZip2 encoded data */ +/* {{{ Compresses a string into BZip2 encoded data */ PHP_FUNCTION(bzcompress) { char *source; /* Source data to compress */ @@ -495,8 +489,7 @@ PHP_FUNCTION(bzcompress) } /* }}} */ -/* {{{ proto string bzdecompress(string source [, int small]) - Decompresses BZip2 compressed data */ +/* {{{ Decompresses BZip2 compressed data */ PHP_FUNCTION(bzdecompress) { char *source; diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c index cfcc62f11b..6b5fbf7f79 100644 --- a/ext/calendar/cal_unix.c +++ b/ext/calendar/cal_unix.c @@ -21,8 +21,7 @@ #include "sdncal.h" #include <time.h> -/* {{{ proto int unixtojd([int timestamp]) - Convert UNIX timestamp to Julian Day */ +/* {{{ Convert UNIX timestamp to Julian Day */ PHP_FUNCTION(unixtojd) { time_t ts; @@ -48,8 +47,7 @@ PHP_FUNCTION(unixtojd) } /* }}} */ -/* {{{ proto int jdtounix(int jday) - Convert Julian Day to UNIX timestamp */ +/* {{{ Convert Julian Day to UNIX timestamp */ PHP_FUNCTION(jdtounix) { zend_long uday; diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index fd8b107156..4de31ccf77 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -169,8 +169,7 @@ static void _php_cal_info(int cal, zval *ret) } -/* {{{ proto array cal_info([int calendar]) - Returns information about a particular calendar */ +/* {{{ Returns information about a particular calendar */ PHP_FUNCTION(cal_info) { zend_long cal = -1; @@ -201,8 +200,7 @@ PHP_FUNCTION(cal_info) } /* }}} */ -/* {{{ proto int cal_days_in_month(int calendar, int month, int year) - Returns the number of days in a month for a given year and calendar */ +/* {{{ Returns the number of days in a month for a given year and calendar */ PHP_FUNCTION(cal_days_in_month) { zend_long cal, month, year; @@ -249,8 +247,7 @@ PHP_FUNCTION(cal_days_in_month) } /* }}} */ -/* {{{ proto int cal_to_jd(int calendar, int month, int day, int year) - Converts from a supported calendar to Julian Day Count */ +/* {{{ Converts from a supported calendar to Julian Day Count */ PHP_FUNCTION(cal_to_jd) { zend_long cal, month, day, year; @@ -268,8 +265,7 @@ PHP_FUNCTION(cal_to_jd) } /* }}} */ -/* {{{ proto array cal_from_jd(int jd, int calendar) - Converts from Julian Day Count to a supported calendar and return extended information */ +/* {{{ Converts from Julian Day Count to a supported calendar and return extended information */ PHP_FUNCTION(cal_from_jd) { zend_long jd, cal; @@ -320,8 +316,7 @@ PHP_FUNCTION(cal_from_jd) } /* }}} */ -/* {{{ proto string jdtogregorian(int juliandaycount) - Converts a julian day count to a gregorian calendar date */ +/* {{{ Converts a julian day count to a gregorian calendar date */ PHP_FUNCTION(jdtogregorian) { zend_long julday; @@ -337,8 +332,7 @@ PHP_FUNCTION(jdtogregorian) } /* }}} */ -/* {{{ proto int gregoriantojd(int month, int day, int year) - Converts a gregorian calendar date to julian day count */ +/* {{{ Converts a gregorian calendar date to julian day count */ PHP_FUNCTION(gregoriantojd) { zend_long year, month, day; @@ -351,8 +345,7 @@ PHP_FUNCTION(gregoriantojd) } /* }}} */ -/* {{{ proto string jdtojulian(int juliandaycount) - Convert a julian day count to a julian calendar date */ +/* {{{ Convert a julian day count to a julian calendar date */ PHP_FUNCTION(jdtojulian) { zend_long julday; @@ -368,8 +361,7 @@ PHP_FUNCTION(jdtojulian) } /* }}} */ -/* {{{ proto int juliantojd(int month, int day, int year) - Converts a julian calendar date to julian day count */ +/* {{{ Converts a julian calendar date to julian day count */ PHP_FUNCTION(juliantojd) { zend_long year, month, day; @@ -478,8 +470,7 @@ static char *heb_number_to_chars(int n, int fl, char **ret) } /* }}} */ -/* {{{ proto string jdtojewish(int juliandaycount [, bool hebrew [, int fl]]) - Converts a julian day count to a jewish calendar date */ +/* {{{ Converts a julian day count to a jewish calendar date */ PHP_FUNCTION(jdtojewish) { zend_long julday, fl = 0; @@ -512,8 +503,7 @@ PHP_FUNCTION(jdtojewish) } /* }}} */ -/* {{{ proto int jewishtojd(int month, int day, int year) - Converts a jewish calendar date to a julian day count */ +/* {{{ Converts a jewish calendar date to a julian day count */ PHP_FUNCTION(jewishtojd) { zend_long year, month, day; @@ -526,8 +516,7 @@ PHP_FUNCTION(jewishtojd) } /* }}} */ -/* {{{ proto string jdtofrench(int juliandaycount) - Converts a julian day count to a french republic calendar date */ +/* {{{ Converts a julian day count to a french republic calendar date */ PHP_FUNCTION(jdtofrench) { zend_long julday; @@ -543,8 +532,7 @@ PHP_FUNCTION(jdtofrench) } /* }}} */ -/* {{{ proto int frenchtojd(int month, int day, int year) - Converts a french republic calendar date to julian day count */ +/* {{{ Converts a french republic calendar date to julian day count */ PHP_FUNCTION(frenchtojd) { zend_long year, month, day; @@ -557,8 +545,7 @@ PHP_FUNCTION(frenchtojd) } /* }}} */ -/* {{{ proto mixed jddayofweek(int juliandaycount [, int mode]) - Returns name or number of day of week from julian day count */ +/* {{{ Returns name or number of day of week from julian day count */ PHP_FUNCTION(jddayofweek) { zend_long julday, mode = CAL_DOW_DAYNO; @@ -588,8 +575,7 @@ PHP_FUNCTION(jddayofweek) } /* }}} */ -/* {{{ proto string jdmonthname(int juliandaycount, int mode) - Returns name of month for julian day count */ +/* {{{ Returns name of month for julian day count */ PHP_FUNCTION(jdmonthname) { zend_long julday, mode; diff --git a/ext/calendar/easter.c b/ext/calendar/easter.c index 05f54084b4..291fd4a272 100644 --- a/ext/calendar/easter.c +++ b/ext/calendar/easter.c @@ -115,16 +115,14 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, zend_long gm) ZVAL_LONG(return_value, result); } -/* {{{ proto int easter_date([int year]) - Return the timestamp of midnight on Easter of a given year (defaults to current year) */ +/* {{{ Return the timestamp of midnight on Easter of a given year (defaults to current year) */ PHP_FUNCTION(easter_date) { _cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int easter_days([int year, [int method]]) - Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */ +/* {{{ Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */ PHP_FUNCTION(easter_days) { _cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index 768e3a1169..315e091ca3 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -282,8 +282,7 @@ PHP_METHOD(com, __construct) } /* }}} */ -/* {{{ proto object com_get_active_object(string progid [, int code_page ]) - Returns a handle to an already running instance of a COM object */ +/* {{{ Returns a handle to an already running instance of a COM object */ PHP_FUNCTION(com_get_active_object) { CLSID clsid; @@ -658,8 +657,7 @@ int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen, return php_com_do_invoke_by_id(obj, dispid, flags, v, nargs, args, 0, allow_noarg); } -/* {{{ proto string com_create_guid() - Generate a globally unique identifier (GUID) */ +/* {{{ Generate a globally unique identifier (GUID) */ PHP_FUNCTION(com_create_guid) { GUID retval; @@ -686,8 +684,7 @@ PHP_FUNCTION(com_create_guid) } /* }}} */ -/* {{{ proto bool com_event_sink(object comobject, object sinkobject [, mixed sinkinterface]) - Connect events from a COM object to a PHP object */ +/* {{{ Connect events from a COM object to a PHP object */ PHP_FUNCTION(com_event_sink) { zval *object, *sinkobject, *sink=NULL; @@ -746,8 +743,7 @@ PHP_FUNCTION(com_event_sink) } /* }}} */ -/* {{{ proto bool com_print_typeinfo(object comobject | string typelib, string dispinterface, bool wantsink) - Print out a PHP class definition for a dispatchable interface */ +/* {{{ Print out a PHP class definition for a dispatchable interface */ PHP_FUNCTION(com_print_typeinfo) { zval *arg1; @@ -783,8 +779,7 @@ PHP_FUNCTION(com_print_typeinfo) } /* }}} */ -/* {{{ proto bool com_message_pump([int timeoutms]) - Process COM messages, sleeping for up to timeoutms milliseconds */ +/* {{{ Process COM messages, sleeping for up to timeoutms milliseconds */ PHP_FUNCTION(com_message_pump) { zend_long timeoutms = 0; @@ -811,8 +806,7 @@ PHP_FUNCTION(com_message_pump) } /* }}} */ -/* {{{ proto bool com_load_typelib(string typelib_name [, bool case_insensitive]) - Loads a Typelibrary and registers its constants */ +/* {{{ Loads a Typelibrary and registers its constants */ PHP_FUNCTION(com_load_typelib) { char *name; diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 66f64207b0..a39e792ae9 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -37,8 +37,7 @@ zend_class_entry *php_com_exception_class_entry, *php_com_saproxy_class_entry; -/* {{{ com_dotnet_module_entry - */ +/* {{{ com_dotnet_module_entry */ zend_module_entry com_dotnet_module_entry = { STANDARD_MODULE_HEADER, "com_dotnet", @@ -64,8 +63,7 @@ ZEND_TSRMLS_CACHE_DEFINE() ZEND_GET_MODULE(com_dotnet) #endif -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ /* com.typelib_file is the path to a file containing a * list of typelibraries to register *persistently*. @@ -149,8 +147,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(com_dotnet) { #if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS) @@ -161,8 +158,7 @@ static PHP_GINIT_FUNCTION(com_dotnet) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(com_dotnet) { zend_class_entry ce, *tmp; @@ -288,8 +284,7 @@ PHP_MINIT_FUNCTION(com_dotnet) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(com_dotnet) { UNREGISTER_INI_ENTRIES(); @@ -305,8 +300,7 @@ PHP_MSHUTDOWN_FUNCTION(com_dotnet) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(com_dotnet) { COMG(rshutdown_started) = 0; @@ -314,8 +308,7 @@ PHP_RINIT_FUNCTION(com_dotnet) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(com_dotnet) { #if HAVE_MSCOREE_H @@ -328,8 +321,7 @@ PHP_RSHUTDOWN_FUNCTION(com_dotnet) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(com_dotnet) { php_info_print_table_start(); diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index e43ef5e5ea..c45910583b 100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -320,8 +320,7 @@ static inline HRESULT get_persist_file(php_com_persist_helper *helper) } -/* {{{ proto string COMPersistHelper::GetCurFile() - Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */ +/* {{{ Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */ CPH_METHOD(GetCurFileName) { HRESULT res; @@ -359,8 +358,7 @@ CPH_METHOD(GetCurFileName) /* }}} */ -/* {{{ proto bool COMPersistHelper::SaveToFile(string filename [, bool remember]) - Persist object data to file, via IPersistFile::Save */ +/* {{{ Persist object data to file, via IPersistFile::Save */ CPH_METHOD(SaveToFile) { HRESULT res; @@ -421,8 +419,7 @@ CPH_METHOD(SaveToFile) } /* }}} */ -/* {{{ proto bool COMPersistHelper::LoadFromFile(string filename [, int flags]) - Load object data from file, via IPersistFile::Load */ +/* {{{ Load object data from file, via IPersistFile::Load */ CPH_METHOD(LoadFromFile) { HRESULT res; @@ -466,8 +463,7 @@ CPH_METHOD(LoadFromFile) } /* }}} */ -/* {{{ proto int COMPersistHelper::GetMaxStreamSize() - Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */ +/* {{{ Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */ CPH_METHOD(GetMaxStreamSize) { HRESULT res; @@ -502,8 +498,7 @@ CPH_METHOD(GetMaxStreamSize) } /* }}} */ -/* {{{ proto int COMPersistHelper::InitNew() - Initializes the object to a default state, via IPersistStreamInit::InitNew */ +/* {{{ Initializes the object to a default state, via IPersistStreamInit::InitNew */ CPH_METHOD(InitNew) { HRESULT res; @@ -530,8 +525,7 @@ CPH_METHOD(InitNew) } /* }}} */ -/* {{{ proto mixed COMPersistHelper::LoadFromStream(resource stream) - Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */ +/* {{{ Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */ CPH_METHOD(LoadFromStream) { zval *zstm; @@ -589,8 +583,7 @@ CPH_METHOD(LoadFromStream) } /* }}} */ -/* {{{ proto int COMPersistHelper::SaveToStream(resource stream) - Saves the object to a stream, via IPersistStream::Save */ +/* {{{ Saves the object to a stream, via IPersistStream::Save */ CPH_METHOD(SaveToStream) { zval *zstm; @@ -639,8 +632,7 @@ CPH_METHOD(SaveToStream) } /* }}} */ -/* {{{ proto COMPersistHelper::__construct([object com_object]) - Creates a persistence helper object, usually associated with a com_object */ +/* {{{ Creates a persistence helper object, usually associated with a com_object */ CPH_METHOD(__construct) { php_com_dotnet_object *obj = NULL; diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 83940e93a1..949f3ca1dd 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -491,8 +491,7 @@ PHP_METHOD(variant, __construct) } /* }}} */ -/* {{{ proto void variant_set(object variant, mixed value) - Assigns a new value for a variant object */ +/* {{{ Assigns a new value for a variant object */ PHP_FUNCTION(variant_set) { zval *zobj, *zvalue = NULL; @@ -638,104 +637,91 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN } /* }}} */ -/* {{{ proto mixed variant_add(mixed left, mixed right) - "Adds" two variant values together and returns the result */ +/* {{{ "Adds" two variant values together and returns the result */ PHP_FUNCTION(variant_add) { variant_binary_operation(VOP_ADD, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_cat(mixed left, mixed right) - concatenates two variant values together and returns the result */ +/* {{{ concatenates two variant values together and returns the result */ PHP_FUNCTION(variant_cat) { variant_binary_operation(VOP_CAT, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_sub(mixed left, mixed right) - subtracts the value of the right variant from the left variant value and returns the result */ +/* {{{ subtracts the value of the right variant from the left variant value and returns the result */ PHP_FUNCTION(variant_sub) { variant_binary_operation(VOP_SUB, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_mul(mixed left, mixed right) - multiplies the values of the two variants and returns the result */ +/* {{{ multiplies the values of the two variants and returns the result */ PHP_FUNCTION(variant_mul) { variant_binary_operation(VOP_MUL, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_and(mixed left, mixed right) - performs a bitwise AND operation between two variants and returns the result */ +/* {{{ performs a bitwise AND operation between two variants and returns the result */ PHP_FUNCTION(variant_and) { variant_binary_operation(VOP_AND, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_div(mixed left, mixed right) - Returns the result from dividing two variants */ +/* {{{ Returns the result from dividing two variants */ PHP_FUNCTION(variant_div) { variant_binary_operation(VOP_DIV, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_eqv(mixed left, mixed right) - Performs a bitwise equivalence on two variants */ +/* {{{ Performs a bitwise equivalence on two variants */ PHP_FUNCTION(variant_eqv) { variant_binary_operation(VOP_EQV, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_idiv(mixed left, mixed right) - Converts variants to integers and then returns the result from dividing them */ +/* {{{ Converts variants to integers and then returns the result from dividing them */ PHP_FUNCTION(variant_idiv) { variant_binary_operation(VOP_IDIV, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_imp(mixed left, mixed right) - Performs a bitwise implication on two variants */ +/* {{{ Performs a bitwise implication on two variants */ PHP_FUNCTION(variant_imp) { variant_binary_operation(VOP_IMP, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_mod(mixed left, mixed right) - Divides two variants and returns only the remainder */ +/* {{{ Divides two variants and returns only the remainder */ PHP_FUNCTION(variant_mod) { variant_binary_operation(VOP_MOD, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_or(mixed left, mixed right) - Performs a logical disjunction on two variants */ +/* {{{ Performs a logical disjunction on two variants */ PHP_FUNCTION(variant_or) { variant_binary_operation(VOP_OR, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_pow(mixed left, mixed right) - Returns the result of performing the power function with two variants */ +/* {{{ Returns the result of performing the power function with two variants */ PHP_FUNCTION(variant_pow) { variant_binary_operation(VOP_POW, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_xor(mixed left, mixed right) - Performs a logical exclusion on two variants */ +/* {{{ Performs a logical exclusion on two variants */ PHP_FUNCTION(variant_xor) { variant_binary_operation(VOP_XOR, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -798,48 +784,42 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT } /* }}} */ -/* {{{ proto mixed variant_abs(mixed left) - Returns the absolute value of a variant */ +/* {{{ Returns the absolute value of a variant */ PHP_FUNCTION(variant_abs) { variant_unary_operation(VOP_ABS, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_fix(mixed left) - Returns the integer part ? of a variant */ +/* {{{ Returns the integer part ? of a variant */ PHP_FUNCTION(variant_fix) { variant_unary_operation(VOP_FIX, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_int(mixed left) - Returns the integer portion of a variant */ +/* {{{ Returns the integer portion of a variant */ PHP_FUNCTION(variant_int) { variant_unary_operation(VOP_INT, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_neg(mixed left) - Performs logical negation on a variant */ +/* {{{ Performs logical negation on a variant */ PHP_FUNCTION(variant_neg) { variant_unary_operation(VOP_NEG, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_not(mixed left) - Performs bitwise not negation on a variant */ +/* {{{ Performs bitwise not negation on a variant */ PHP_FUNCTION(variant_not) { variant_unary_operation(VOP_NOT, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto mixed variant_round(mixed left, int decimals) - Rounds a variant to the specified number of decimal places */ +/* {{{ Rounds a variant to the specified number of decimal places */ PHP_FUNCTION(variant_round) { VARIANT vres; @@ -874,8 +854,7 @@ PHP_FUNCTION(variant_round) } /* }}} */ -/* {{{ proto int variant_cmp(mixed left, mixed right [, int lcid [, int flags]]) - Compares two variants */ +/* {{{ Compares two variants */ PHP_FUNCTION(variant_cmp) { VARIANT left_val, right_val; @@ -932,8 +911,7 @@ PHP_FUNCTION(variant_cmp) } /* }}} */ -/* {{{ proto int variant_date_to_timestamp(object variant) - Converts a variant date/time value to unix timestamp */ +/* {{{ Converts a variant date/time value to unix timestamp */ PHP_FUNCTION(variant_date_to_timestamp) { VARIANT vres; @@ -971,8 +949,7 @@ PHP_FUNCTION(variant_date_to_timestamp) } /* }}} */ -/* {{{ proto object variant_date_from_timestamp(int timestamp) - Returns a variant date representation of a unix timestamp */ +/* {{{ Returns a variant date representation of a unix timestamp */ PHP_FUNCTION(variant_date_from_timestamp) { zend_long timestamp; @@ -1020,8 +997,7 @@ PHP_FUNCTION(variant_date_from_timestamp) } /* }}} */ -/* {{{ proto int variant_get_type(object variant) - Returns the VT_XXX type code for a variant */ +/* {{{ Returns the VT_XXX type code for a variant */ PHP_FUNCTION(variant_get_type) { zval *zobj; @@ -1037,8 +1013,7 @@ PHP_FUNCTION(variant_get_type) } /* }}} */ -/* {{{ proto void variant_set_type(object variant, int type) - Convert a variant into another type. Variant is modified "in-place" */ +/* {{{ Convert a variant into another type. Variant is modified "in-place" */ PHP_FUNCTION(variant_set_type) { zval *zobj; @@ -1072,8 +1047,7 @@ PHP_FUNCTION(variant_set_type) } /* }}} */ -/* {{{ proto object variant_cast(object variant, int type) - Convert a variant into a new variant object of another type */ +/* {{{ Convert a variant into a new variant object of another type */ PHP_FUNCTION(variant_cast) { zval *zobj; diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 18d36a7b82..2c76c57d2d 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -33,8 +33,7 @@ static PHP_MINFO_FUNCTION(ctype); /* }}} */ -/* {{{ ctype_module_entry - */ +/* {{{ ctype_module_entry */ zend_module_entry ctype_module_entry = { STANDARD_MODULE_HEADER, "ctype", @@ -53,8 +52,7 @@ zend_module_entry ctype_module_entry = { ZEND_GET_MODULE(ctype) #endif -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(ctype) { php_info_print_table_start(); @@ -63,8 +61,7 @@ static PHP_MINFO_FUNCTION(ctype) } /* }}} */ -/* {{{ ctype - */ +/* {{{ ctype */ #define CTYPE(iswhat, allow_digits, allow_minus) \ zval *c; \ ZEND_PARSE_PARAMETERS_START(1, 1); \ @@ -97,88 +94,77 @@ static PHP_MINFO_FUNCTION(ctype) /* }}} */ -/* {{{ proto bool ctype_alnum(mixed c) - Checks for alphanumeric character(s) */ +/* {{{ Checks for alphanumeric character(s) */ PHP_FUNCTION(ctype_alnum) { CTYPE(isalnum, 1, 0); } /* }}} */ -/* {{{ proto bool ctype_alpha(mixed c) - Checks for alphabetic character(s) */ +/* {{{ Checks for alphabetic character(s) */ PHP_FUNCTION(ctype_alpha) { CTYPE(isalpha, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_cntrl(mixed c) - Checks for control character(s) */ +/* {{{ Checks for control character(s) */ PHP_FUNCTION(ctype_cntrl) { CTYPE(iscntrl, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_digit(mixed c) - Checks for numeric character(s) */ +/* {{{ Checks for numeric character(s) */ PHP_FUNCTION(ctype_digit) { CTYPE(isdigit, 1, 0); } /* }}} */ -/* {{{ proto bool ctype_lower(mixed c) - Checks for lowercase character(s) */ +/* {{{ Checks for lowercase character(s) */ PHP_FUNCTION(ctype_lower) { CTYPE(islower, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_graph(mixed c) - Checks for any printable character(s) except space */ +/* {{{ Checks for any printable character(s) except space */ PHP_FUNCTION(ctype_graph) { CTYPE(isgraph, 1, 1); } /* }}} */ -/* {{{ proto bool ctype_print(mixed c) - Checks for printable character(s) */ +/* {{{ Checks for printable character(s) */ PHP_FUNCTION(ctype_print) { CTYPE(isprint, 1, 1); } /* }}} */ -/* {{{ proto bool ctype_punct(mixed c) - Checks for any printable character which is not whitespace or an alphanumeric character */ +/* {{{ Checks for any printable character which is not whitespace or an alphanumeric character */ PHP_FUNCTION(ctype_punct) { CTYPE(ispunct, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_space(mixed c) - Checks for whitespace character(s)*/ +/* {{{ Checks for whitespace character(s)*/ PHP_FUNCTION(ctype_space) { CTYPE(isspace, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_upper(mixed c) - Checks for uppercase character(s) */ +/* {{{ Checks for uppercase character(s) */ PHP_FUNCTION(ctype_upper) { CTYPE(isupper, 0, 0); } /* }}} */ -/* {{{ proto bool ctype_xdigit(mixed c) - Checks for character(s) representing a hexadecimal digit */ +/* {{{ Checks for character(s) representing a hexadecimal digit */ PHP_FUNCTION(ctype_xdigit) { CTYPE(isxdigit, 1, 0); diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index bb0449c179..7f31451f55 100644 --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@ -50,8 +50,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS) } } -/* {{{ proto CURLFile::__construct(string $name, [string $mimetype [, string $postfilename]]) - Create the CURLFile object */ +/* {{{ Create the CURLFile object */ ZEND_METHOD(CURLFile, __construct) { return_value = ZEND_THIS; @@ -59,8 +58,7 @@ ZEND_METHOD(CURLFile, __construct) } /* }}} */ -/* {{{ proto CURLFile curl_file_create(string $name, [string $mimetype [, string $postfilename]]) - Create the CURLFile object */ +/* {{{ Create the CURLFile object */ PHP_FUNCTION(curl_file_create) { object_init_ex( return_value, curl_CURLFile_class ); @@ -88,40 +86,35 @@ static void curlfile_set_property(char *name, size_t name_len, INTERNAL_FUNCTION zend_update_property_string(curl_CURLFile_class, ZEND_THIS, name, name_len, ZSTR_VAL(arg)); } -/* {{{ proto string CURLFile::getFilename() - Get file name */ +/* {{{ Get file name */ ZEND_METHOD(CURLFile, getFilename) { curlfile_get_property("name", sizeof("name")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto string CURLFile::getMimeType() - Get MIME type */ +/* {{{ Get MIME type */ ZEND_METHOD(CURLFile, getMimeType) { curlfile_get_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto string CURLFile::getPostFilename() - Get file name for POST */ +/* {{{ Get file name for POST */ ZEND_METHOD(CURLFile, getPostFilename) { curlfile_get_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto void CURLFile::setMimeType(string $mime) - Set MIME type */ +/* {{{ Set MIME type */ ZEND_METHOD(CURLFile, setMimeType) { curlfile_set_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto void CURLFile::setPostFilename(string $name) - Set file name for POST */ +/* {{{ Set file name for POST */ ZEND_METHOD(CURLFile, setPostFilename) { curlfile_set_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); diff --git a/ext/curl/interface.c b/ext/curl/interface.c index e17bfebc59..0c416774f2 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -210,8 +210,7 @@ void _php_curl_verify_handlers(php_curl *ch, int reporterror) /* {{{ */ } /* }}} */ -/* {{{ curl_module_entry - */ +/* {{{ curl_module_entry */ zend_module_entry curl_module_entry = { STANDARD_MODULE_HEADER, "curl", @@ -250,8 +249,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(curl) { curl_version_info_data *d; @@ -370,8 +368,7 @@ PHP_MINFO_FUNCTION(curl) #define REGISTER_CURL_CONSTANT(__c) REGISTER_LONG_CONSTANT(#__c, __c, CONST_CS | CONST_PERSISTENT) -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(curl) { REGISTER_INI_ENTRIES(); @@ -1316,8 +1313,7 @@ int curl_cast_object(zend_object *obj, zval *result, int type) return zend_std_cast_object_tostring(obj, result, type); } -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(curl) { curl_global_cleanup(); @@ -1350,8 +1346,7 @@ static size_t curl_write_nothing(char *data, size_t size, size_t nmemb, void *ct } /* }}} */ -/* {{{ curl_write - */ +/* {{{ curl_write */ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *) ctx; @@ -1413,8 +1408,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx) } /* }}} */ -/* {{{ curl_fnmatch - */ +/* {{{ curl_fnmatch */ static int curl_fnmatch(void *ctx, const char *pattern, const char *string) { php_curl *ch = (php_curl *) ctx; @@ -1459,8 +1453,7 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string) } /* }}} */ -/* {{{ curl_progress - */ +/* {{{ curl_progress */ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { php_curl *ch = (php_curl *)clientp; @@ -1513,8 +1506,7 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double } /* }}} */ -/* {{{ curl_read - */ +/* {{{ curl_read */ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *)ctx; @@ -1576,8 +1568,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) } /* }}} */ -/* {{{ curl_write_header - */ +/* {{{ curl_write_header */ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *) ctx; @@ -1657,16 +1648,14 @@ static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, v } /* }}} */ -/* {{{ curl_free_string - */ +/* {{{ curl_free_string */ static void curl_free_string(void **string) { efree((char *)*string); } /* }}} */ -/* {{{ curl_free_post - */ +/* {{{ curl_free_post */ static void curl_free_post(void **post) { #if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */ @@ -1682,8 +1671,7 @@ struct mime_data_cb_arg { php_stream *stream; }; -/* {{{ curl_free_cb_arg - */ +/* {{{ curl_free_cb_arg */ static void curl_free_cb_arg(void **cb_arg_p) { struct mime_data_cb_arg *cb_arg = (struct mime_data_cb_arg *) *cb_arg_p; @@ -1694,16 +1682,14 @@ static void curl_free_cb_arg(void **cb_arg_p) } /* }}} */ -/* {{{ curl_free_slist - */ +/* {{{ curl_free_slist */ static void curl_free_slist(zval *el) { curl_slist_free_all(((struct curl_slist *)Z_PTR_P(el))); } /* }}} */ -/* {{{ proto array curl_version() - Return cURL version information. */ +/* {{{ Return cURL version information. */ PHP_FUNCTION(curl_version) { curl_version_info_data *d; @@ -1795,8 +1781,7 @@ void init_curl_handle(php_curl *ch) /* }}} */ -/* {{{ create_certinfo - */ +/* {{{ create_certinfo */ static void create_certinfo(struct curl_certinfo *ci, zval *listcode) { int i; @@ -1864,8 +1849,7 @@ static void _php_curl_set_default_options(php_curl *ch) } /* }}} */ -/* {{{ proto CurlHandle curl_init([string url]) - Initialize a cURL session */ +/* {{{ Initialize a cURL session */ PHP_FUNCTION(curl_init) { php_curl *ch; @@ -2183,8 +2167,7 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields } /* }}} */ -/* {{{ proto CurlHandle curl_copy_handle(CurlHandle ch) - Copy a cURL handle along with all of it's preferences */ +/* {{{ Copy a cURL handle along with all of it's preferences */ PHP_FUNCTION(curl_copy_handle) { php_curl *ch; @@ -2878,8 +2861,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ } /* }}} */ -/* {{{ proto bool curl_setopt(CurlHandle ch, int option, mixed value) - Set an option for a cURL transfer */ +/* {{{ Set an option for a cURL transfer */ PHP_FUNCTION(curl_setopt) { zval *zid, *zvalue; @@ -2907,8 +2889,7 @@ PHP_FUNCTION(curl_setopt) } /* }}} */ -/* {{{ proto bool curl_setopt_array(CurlHandle ch, array options) - Set an array of option for a cURL transfer */ +/* {{{ Set an array of option for a cURL transfer */ PHP_FUNCTION(curl_setopt_array) { zval *zid, *arr, *entry; @@ -2954,8 +2935,7 @@ void _php_curl_cleanup_handle(php_curl *ch) } /* }}} */ -/* {{{ proto bool curl_exec(CurlHandle ch) - Perform a cURL session */ +/* {{{ Perform a cURL session */ PHP_FUNCTION(curl_exec) { CURLcode error; @@ -3009,8 +2989,7 @@ PHP_FUNCTION(curl_exec) } /* }}} */ -/* {{{ proto mixed curl_getinfo(CurlHandle ch [, int option]) - Get information regarding a specific transfer */ +/* {{{ Get information regarding a specific transfer */ PHP_FUNCTION(curl_getinfo) { zval *zid; @@ -3263,8 +3242,7 @@ PHP_FUNCTION(curl_getinfo) } /* }}} */ -/* {{{ proto string curl_error(CurlHandle ch) - Return a string contain the last error for the current session */ +/* {{{ Return a string contain the last error for the current session */ PHP_FUNCTION(curl_error) { zval *zid; @@ -3285,8 +3263,7 @@ PHP_FUNCTION(curl_error) } /* }}} */ -/* {{{ proto int curl_errno(CurlHandle ch) - Return an integer containing the last error number */ +/* {{{ Return an integer containing the last error number */ PHP_FUNCTION(curl_errno) { zval *zid; @@ -3302,8 +3279,7 @@ PHP_FUNCTION(curl_errno) } /* }}} */ -/* {{{ proto void curl_close(CurlHandle ch) - Close a cURL session */ +/* {{{ Close a cURL session */ PHP_FUNCTION(curl_close) { zval *zid; @@ -3395,8 +3371,7 @@ static void curl_free_obj(zend_object *object) } /* }}} */ -/* {{{ proto bool curl_strerror(int code) - return string describing error code */ +/* {{{ return string describing error code */ PHP_FUNCTION(curl_strerror) { zend_long code; @@ -3461,8 +3436,7 @@ static void _php_curl_reset_handlers(php_curl *ch) } /* }}} */ -/* {{{ proto void curl_reset(CurlHandle ch) - Reset all options of a libcurl session handle */ +/* {{{ Reset all options of a libcurl session handle */ PHP_FUNCTION(curl_reset) { zval *zid; @@ -3485,8 +3459,7 @@ PHP_FUNCTION(curl_reset) } /* }}} */ -/* {{{ proto void curl_escape(CurlHandle ch, string str) - URL encodes the given string */ +/* {{{ URL encodes the given string */ PHP_FUNCTION(curl_escape) { zend_string *str; @@ -3514,8 +3487,7 @@ PHP_FUNCTION(curl_escape) } /* }}} */ -/* {{{ proto void curl_unescape(CurlHandle ch, string str) - URL decodes the given string */ +/* {{{ URL decodes the given string */ PHP_FUNCTION(curl_unescape) { char *out = NULL; @@ -3544,8 +3516,7 @@ PHP_FUNCTION(curl_unescape) } /* }}} */ -/* {{{ proto void curl_pause(CurlHandle ch, int bitmask) - pause and unpause a connection */ +/* {{{ pause and unpause a connection */ PHP_FUNCTION(curl_pause) { zend_long bitmask; diff --git a/ext/curl/multi.c b/ext/curl/multi.c index ee3c034523..e1fed9f2ee 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -58,8 +58,7 @@ static inline php_curlm *curl_multi_from_obj(zend_object *obj) { #define Z_CURL_MULTI_P(zv) curl_multi_from_obj(Z_OBJ_P(zv)) -/* {{{ proto CurlMultiHandle curl_multi_init(void) - Returns a new cURL multi handle */ +/* {{{ Returns a new cURL multi handle */ PHP_FUNCTION(curl_multi_init) { php_curlm *mh; @@ -75,8 +74,7 @@ PHP_FUNCTION(curl_multi_init) } /* }}} */ -/* {{{ proto int curl_multi_add_handle(CurlMultiHandle mh, Curl ch) - Add a normal cURL handle to a cURL multi handle */ +/* {{{ Add a normal cURL handle to a cURL multi handle */ PHP_FUNCTION(curl_multi_add_handle) { zval *z_mh; @@ -144,8 +142,7 @@ static zval *_php_curl_multi_find_easy_handle(php_curlm *mh, CURL *easy) /* {{{ } /* }}} */ -/* {{{ proto int curl_multi_remove_handle(CurlMultiHandle mh, Curl ch) - Remove a multi handle from a set of cURL handles */ +/* {{{ Remove a multi handle from a set of cURL handles */ PHP_FUNCTION(curl_multi_remove_handle) { zval *z_mh; @@ -171,8 +168,7 @@ PHP_FUNCTION(curl_multi_remove_handle) } /* }}} */ -/* {{{ proto int curl_multi_select(CurlMultiHandle mh[, double timeout]) - Get all the sockets associated with the cURL extension, which can then be "selected" */ +/* {{{ Get all the sockets associated with the cURL extension, which can then be "selected" */ PHP_FUNCTION(curl_multi_select) { zval *z_mh; @@ -199,8 +195,7 @@ PHP_FUNCTION(curl_multi_select) } /* }}} */ -/* {{{ proto int curl_multi_exec(CurlMultiHandle mh, int &still_running) - Run the sub-connections of the current cURL handle */ +/* {{{ Run the sub-connections of the current cURL handle */ PHP_FUNCTION(curl_multi_exec) { zval *z_mh; @@ -238,8 +233,7 @@ PHP_FUNCTION(curl_multi_exec) } /* }}} */ -/* {{{ proto string curl_multi_getcontent(CurlHandle ch) - Return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set */ +/* {{{ Return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set */ PHP_FUNCTION(curl_multi_getcontent) { zval *z_ch; @@ -263,8 +257,7 @@ PHP_FUNCTION(curl_multi_getcontent) } /* }}} */ -/* {{{ proto array curl_multi_info_read(CurlMultiHandle mh [, int &msgs_in_queue]) - Get information about the current transfers */ +/* {{{ Get information about the current transfers */ PHP_FUNCTION(curl_multi_info_read) { zval *z_mh; @@ -310,8 +303,7 @@ PHP_FUNCTION(curl_multi_info_read) } /* }}} */ -/* {{{ proto void curl_multi_close(CurlMultiHandle mh) - Close a set of cURL handles */ +/* {{{ Close a set of cURL handles */ PHP_FUNCTION(curl_multi_close) { php_curlm *mh; @@ -336,8 +328,7 @@ PHP_FUNCTION(curl_multi_close) } /* }}} */ -/* {{{ proto int curl_multi_errno(CurlMultiHandle mh) - Return an integer containing the last multi curl error number */ +/* {{{ Return an integer containing the last multi curl error number */ PHP_FUNCTION(curl_multi_errno) { zval *z_mh; @@ -353,8 +344,7 @@ PHP_FUNCTION(curl_multi_errno) } /* }}} */ -/* {{{ proto bool curl_multi_strerror(int code) - return string describing error code */ +/* {{{ return string describing error code */ PHP_FUNCTION(curl_multi_strerror) { zend_long code; @@ -498,8 +488,7 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue, } /* }}} */ -/* {{{ proto int curl_multi_setopt(CurlMultiHandle mh, int option, mixed value) - Set an option for the curl multi handle */ +/* {{{ Set an option for the curl multi handle */ PHP_FUNCTION(curl_multi_setopt) { zval *z_mh, *zvalue; diff --git a/ext/curl/share.c b/ext/curl/share.c index aa6b27f458..9cabed2e91 100644 --- a/ext/curl/share.c +++ b/ext/curl/share.c @@ -31,8 +31,7 @@ #define SAVE_CURLSH_ERROR(__handle, __err) (__handle)->err.no = (int) __err; -/* {{{ proto CurlShareHandle curl_share_init() - Initialize a share curl handle */ +/* {{{ Initialize a share curl handle */ PHP_FUNCTION(curl_share_init) { php_curlsh *sh; @@ -46,8 +45,7 @@ PHP_FUNCTION(curl_share_init) } /* }}} */ -/* {{{ proto void curl_share_close(CurlShareHandle sh) - Close a set of cURL handles */ +/* {{{ Close a set of cURL handles */ PHP_FUNCTION(curl_share_close) { zval *z_sh; @@ -80,8 +78,7 @@ static int _php_curl_share_setopt(php_curlsh *sh, zend_long option, zval *zvalue } /* }}} */ -/* {{{ proto bool curl_share_setopt(CurlShareHandle sh, int option, mixed value) - Set an option for a cURL transfer */ +/* {{{ Set an option for a cURL transfer */ PHP_FUNCTION(curl_share_setopt) { zval *z_sh, *zvalue; @@ -104,8 +101,7 @@ PHP_FUNCTION(curl_share_setopt) } /* }}} */ -/* {{{ proto int curl_share_errno(CurlShareHandle sh) - Return an integer containing the last share curl error number */ +/* {{{ Return an integer containing the last share curl error number */ PHP_FUNCTION(curl_share_errno) { zval *z_sh; @@ -122,8 +118,7 @@ PHP_FUNCTION(curl_share_errno) /* }}} */ -/* {{{ proto bool curl_share_strerror(int code) - return string describing error code */ +/* {{{ return string describing error code */ PHP_FUNCTION(curl_share_strerror) { zend_long code; diff --git a/ext/date/php_date.c b/ext/date/php_date.c index bff52f178d..e59e121dfb 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -823,8 +823,7 @@ PHPAPI zend_string *php_format_date(const char *format, size_t format_len, time_ } /* }}} */ -/* {{{ php_idate - */ +/* {{{ php_idate */ PHPAPI int php_idate(char format, time_t ts, int localtime) { timelib_time *t; @@ -920,24 +919,21 @@ PHPAPI int php_idate(char format, time_t ts, int localtime) } /* }}} */ -/* {{{ proto string date(string format [, int timestamp]) - Format a local date/time */ +/* {{{ Format a local date/time */ PHP_FUNCTION(date) { php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string gmdate(string format [, int timestamp]) - Format a GMT date/time */ +/* {{{ Format a GMT date/time */ PHP_FUNCTION(gmdate) { php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int idate(string format [, int timestamp]) - Format a local time/date as integer */ +/* {{{ Format a local time/date as integer */ PHP_FUNCTION(idate) { zend_string *format; @@ -1006,8 +1002,7 @@ PHPAPI zend_long php_parse_date(const char *string, zend_long *now) } /* }}} */ -/* {{{ proto int strtotime(string time [, int now ]) - Convert string representation of date and time to a timestamp */ +/* {{{ Convert string representation of date and time to a timestamp */ PHP_FUNCTION(strtotime) { zend_string *times; @@ -1129,24 +1124,21 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } /* }}} */ -/* {{{ proto int mktime(int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]) - Get UNIX timestamp for a date */ +/* {{{ Get UNIX timestamp for a date */ PHP_FUNCTION(mktime) { php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int gmmktime(int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]) - Get UNIX timestamp for a GMT date */ +/* {{{ Get UNIX timestamp for a GMT date */ PHP_FUNCTION(gmmktime) { php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool checkdate(int month, int day, int year) - Returns true(1) if it is a valid date in gregorian calendar */ +/* {{{ Returns true(1) if it is a valid date in gregorian calendar */ PHP_FUNCTION(checkdate) { zend_long m, d, y; @@ -1263,24 +1255,21 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) } /* }}} */ -/* {{{ proto string strftime(string format [, int timestamp]) - Format a local time/date according to locale settings */ +/* {{{ Format a local time/date according to locale settings */ PHP_FUNCTION(strftime) { php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string gmstrftime(string format [, int timestamp]) - Format a GMT/UCT time/date according to locale settings */ +/* {{{ Format a GMT/UCT time/date according to locale settings */ PHP_FUNCTION(gmstrftime) { php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int time(void) - Return current UNIX timestamp */ +/* {{{ Return current UNIX timestamp */ PHP_FUNCTION(time) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1289,8 +1278,7 @@ PHP_FUNCTION(time) } /* }}} */ -/* {{{ proto array localtime([int timestamp [, bool associative_array]]) - Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */ +/* {{{ Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */ PHP_FUNCTION(localtime) { zend_long timestamp; @@ -1343,8 +1331,7 @@ PHP_FUNCTION(localtime) } /* }}} */ -/* {{{ proto array getdate([int timestamp]) - Get date/time information */ +/* {{{ Get date/time information */ PHP_FUNCTION(getdate) { zend_long timestamp; @@ -2284,9 +2271,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, const char *time_str, size return 1; } /* }}} */ -/* {{{ proto DateTime date_create([string time[, DateTimeZone object]]) - Returns new DateTime object -*/ +/* {{{ Returns new DateTime object */ PHP_FUNCTION(date_create) { zval *timezone_object = NULL; @@ -2307,9 +2292,7 @@ PHP_FUNCTION(date_create) } /* }}} */ -/* {{{ proto DateTime date_create_immutable([string time[, DateTimeZone object]]) - Returns new DateTime object -*/ +/* {{{ Returns new DateTime object */ PHP_FUNCTION(date_create_immutable) { zval *timezone_object = NULL; @@ -2330,9 +2313,7 @@ PHP_FUNCTION(date_create_immutable) } /* }}} */ -/* {{{ proto DateTime date_create_from_format(string format, string time[, DateTimeZone object]) - Returns new DateTime object formatted according to the specified format -*/ +/* {{{ Returns new DateTime object formatted according to the specified format */ PHP_FUNCTION(date_create_from_format) { zval *timezone_object = NULL; @@ -2354,9 +2335,7 @@ PHP_FUNCTION(date_create_from_format) } /* }}} */ -/* {{{ proto DateTime date_create_immutable_from_format(string format, string time[, DateTimeZone object]) - Returns new DateTime object formatted according to the specified format -*/ +/* {{{ Returns new DateTime object formatted according to the specified format */ PHP_FUNCTION(date_create_immutable_from_format) { zval *timezone_object = NULL; @@ -2378,9 +2357,7 @@ PHP_FUNCTION(date_create_immutable_from_format) } /* }}} */ -/* {{{ proto DateTime::__construct([string time[, DateTimeZone object]]) - Creates new DateTime object -*/ +/* {{{ Creates new DateTime object */ PHP_METHOD(DateTime, __construct) { zval *timezone_object = NULL; @@ -2400,9 +2377,7 @@ PHP_METHOD(DateTime, __construct) } /* }}} */ -/* {{{ proto DateTimeImmutable::__construct([string time[, DateTimeZone object]]) - Creates new DateTimeImmutable object -*/ +/* {{{ Creates new DateTimeImmutable object */ PHP_METHOD(DateTimeImmutable, __construct) { zval *timezone_object = NULL; @@ -2422,9 +2397,7 @@ PHP_METHOD(DateTimeImmutable, __construct) } /* }}} */ -/* {{{ proto DateTime::createFromImmutable(DateTimeImmutable object) - Creates new DateTime object from an existing immutable DateTimeImmutable object. -*/ +/* {{{ Creates new DateTime object from an existing immutable DateTimeImmutable object. */ PHP_METHOD(DateTime, createFromImmutable) { zval *datetimeimmutable_object = NULL; @@ -2443,9 +2416,7 @@ PHP_METHOD(DateTime, createFromImmutable) } /* }}} */ -/* {{{ proto DateTime::createFromInterface(DateTimeInterface object) - Creates new DateTime object from an existing DateTimeInterface object. -*/ +/* {{{ Creates new DateTime object from an existing DateTimeInterface object. */ PHP_METHOD(DateTime, createFromInterface) { zval *datetimeinterface_object = NULL; @@ -2464,9 +2435,7 @@ PHP_METHOD(DateTime, createFromInterface) } /* }}} */ -/* {{{ proto DateTimeImmutable::createFromMutable(DateTime object) - Creates new DateTimeImmutable object from an existing mutable DateTime object. -*/ +/* {{{ Creates new DateTimeImmutable object from an existing mutable DateTime object. */ PHP_METHOD(DateTimeImmutable, createFromMutable) { zval *datetime_object = NULL; @@ -2485,9 +2454,7 @@ PHP_METHOD(DateTimeImmutable, createFromMutable) } /* }}} */ -/* {{{ proto DateTimeImmutable::createFromInterface(DateTimeInterface object) - Creates new DateTimeImmutable object from an existing DateTimeInterface object. -*/ +/* {{{ Creates new DateTimeImmutable object from an existing DateTimeInterface object. */ PHP_METHOD(DateTimeImmutable, createFromInterface) { zval *datetimeinterface_object = NULL; @@ -2555,8 +2522,7 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht return 0; } /* }}} */ -/* {{{ proto DateTime::__set_state(array array) -*/ +/* {{{ */ PHP_METHOD(DateTime, __set_state) { php_date_obj *dateobj; @@ -2577,8 +2543,7 @@ PHP_METHOD(DateTime, __set_state) } /* }}} */ -/* {{{ proto DateTimeImmutable::__set_state(array array) -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, __set_state) { php_date_obj *dateobj; @@ -2599,8 +2564,7 @@ PHP_METHOD(DateTimeImmutable, __set_state) } /* }}} */ -/* {{{ proto DateTime::__wakeup() -*/ +/* {{{ */ PHP_METHOD(DateTime, __wakeup) { zval *object = ZEND_THIS; @@ -2619,8 +2583,7 @@ PHP_METHOD(DateTime, __wakeup) } /* }}} */ -/* {{{ proto DateTimeImmutable::__wakeup() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, __wakeup) { zval *object = ZEND_THIS; @@ -2660,9 +2623,7 @@ static void zval_from_error_container(zval *z, timelib_error_container *error) / add_assoc_zval(z, "errors", &element); } /* }}} */ -/* {{{ proto array date_get_last_errors() - Returns the warnings and errors found while parsing a date/time string. -*/ +/* {{{ Returns the warnings and errors found while parsing a date/time string. */ PHP_FUNCTION(date_get_last_errors) { ZEND_PARSE_PARAMETERS_NONE(); @@ -2750,9 +2711,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * timelib_time_dtor(parsed_time); } /* }}} */ -/* {{{ proto array date_parse(string date) - Returns associative array with detailed info about given date -*/ +/* {{{ Returns associative array with detailed info about given date */ PHP_FUNCTION(date_parse) { zend_string *date; @@ -2768,9 +2727,7 @@ PHP_FUNCTION(date_parse) } /* }}} */ -/* {{{ proto array date_parse_from_format(string format, string date) - Returns associative array with detailed info about given date -*/ +/* {{{ Returns associative array with detailed info about given date */ PHP_FUNCTION(date_parse_from_format) { zend_string *date, *format; @@ -2787,9 +2744,7 @@ PHP_FUNCTION(date_parse_from_format) } /* }}} */ -/* {{{ proto string date_format(DateTimeInterface object, string format) - Returns date formatted according to given format -*/ +/* {{{ Returns date formatted according to given format */ PHP_FUNCTION(date_format) { zval *object; @@ -2874,9 +2829,7 @@ static int php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{ return 1; } /* }}} */ -/* {{{ proto DateTime date_modify(DateTime object, string modify) - Alters the timestamp. -*/ +/* {{{ Alters the timestamp. */ PHP_FUNCTION(date_modify) { zval *object; @@ -2895,8 +2848,7 @@ PHP_FUNCTION(date_modify) } /* }}} */ -/* {{{ proto DateTimeImmutable::modify() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, modify) { zval *object, new_object; @@ -2934,9 +2886,7 @@ static void php_date_add(zval *object, zval *interval, zval *return_value) /* {{ dateobj->time = new_time; } /* }}} */ -/* {{{ proto DateTime date_add(DateTime object, DateInterval interval) - Adds an interval to the current date in object. -*/ +/* {{{ Adds an interval to the current date in object. */ PHP_FUNCTION(date_add) { zval *object, *interval; @@ -2951,8 +2901,7 @@ PHP_FUNCTION(date_add) } /* }}} */ -/* {{{ proto DateTimeImmutable::add() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, add) { zval *object, *interval, new_object; @@ -2990,9 +2939,7 @@ static void php_date_sub(zval *object, zval *interval, zval *return_value) /* {{ dateobj->time = new_time; } /* }}} */ -/* {{{ proto DateTime date_sub(DateTime object, DateInterval interval) - Subtracts an interval to the current date in object. -*/ +/* {{{ Subtracts an interval to the current date in object. */ PHP_FUNCTION(date_sub) { zval *object, *interval; @@ -3007,8 +2954,7 @@ PHP_FUNCTION(date_sub) } /* }}} */ -/* {{{ proto DateTimeImmutable::sub() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, sub) { zval *object, *interval, new_object; @@ -3045,9 +2991,7 @@ static void set_timezone_from_timelib_time(php_timezone_obj *tzobj, timelib_time } -/* {{{ proto DateTimeZone date_timezone_get(DateTimeInterface object) - Return new DateTimeZone object relative to give DateTime -*/ +/* {{{ Return new DateTimeZone object relative to give DateTime */ PHP_FUNCTION(date_timezone_get) { zval *object; @@ -3092,9 +3036,7 @@ static void php_date_timezone_set(zval *object, zval *timezone_object, zval *ret timelib_unixtime2local(dateobj->time, dateobj->time->sse); } /* }}} */ -/* {{{ proto DateTime date_timezone_set(DateTime object, DateTimeZone object) - Sets the timezone for the DateTime object. -*/ +/* {{{ Sets the timezone for the DateTime object. */ PHP_FUNCTION(date_timezone_set) { zval *object; @@ -3110,8 +3052,7 @@ PHP_FUNCTION(date_timezone_set) } /* }}} */ -/* {{{ proto DateTimeImmutable::setTimezone() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, setTimezone) { zval *object, new_object; @@ -3129,9 +3070,7 @@ PHP_METHOD(DateTimeImmutable, setTimezone) } /* }}} */ -/* {{{ proto int date_offset_get(DateTimeInterface object) - Returns the DST offset. -*/ +/* {{{ Returns the DST offset. */ PHP_FUNCTION(date_offset_get) { zval *object; @@ -3178,9 +3117,7 @@ static void php_date_time_set(zval *object, zend_long h, zend_long i, zend_long timelib_update_from_sse(dateobj->time); } /* }}} */ -/* {{{ proto DateTime date_time_set(DateTime object, int hour, int minute[, int second[, int microseconds]]) - Sets the time. -*/ +/* {{{ Sets the time. */ PHP_FUNCTION(date_time_set) { zval *object; @@ -3196,8 +3133,7 @@ PHP_FUNCTION(date_time_set) } /* }}} */ -/* {{{ proto DateTimeImmutable::setTime() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, setTime) { zval *object, new_object; @@ -3227,9 +3163,7 @@ static void php_date_date_set(zval *object, zend_long y, zend_long m, zend_long timelib_update_ts(dateobj->time, NULL); } /* }}} */ -/* {{{ proto DateTime date_date_set(DateTime object, int year, int month, int day) - Sets the date. -*/ +/* {{{ Sets the date. */ PHP_FUNCTION(date_date_set) { zval *object; @@ -3245,8 +3179,7 @@ PHP_FUNCTION(date_date_set) } /* }}} */ -/* {{{ proto DateTimeImmutable::setDate() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, setDate) { zval *object, new_object; @@ -3280,9 +3213,7 @@ static void php_date_isodate_set(zval *object, zend_long y, zend_long w, zend_lo timelib_update_ts(dateobj->time, NULL); } /* }}} */ -/* {{{ proto DateTime date_isodate_set(DateTime object, int year, int week[, int day]) - Sets the ISO date. -*/ +/* {{{ Sets the ISO date. */ PHP_FUNCTION(date_isodate_set) { zval *object; @@ -3298,8 +3229,7 @@ PHP_FUNCTION(date_isodate_set) } /* }}} */ -/* {{{ proto DateTimeImmutable::setISODate() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, setISODate) { zval *object, new_object; @@ -3328,9 +3258,7 @@ static void php_date_timestamp_set(zval *object, zend_long timestamp, zval *retu php_date_set_time_fraction(dateobj->time, 0); } /* }}} */ -/* {{{ proto DateTime date_timestamp_set(DateTime object, int unixTimestamp) - Sets the date and time based on an Unix timestamp. -*/ +/* {{{ Sets the date and time based on an Unix timestamp. */ PHP_FUNCTION(date_timestamp_set) { zval *object; @@ -3346,8 +3274,7 @@ PHP_FUNCTION(date_timestamp_set) } /* }}} */ -/* {{{ proto DateTimeImmutable::setTimestamp() -*/ +/* {{{ */ PHP_METHOD(DateTimeImmutable, setTimestamp) { zval *object, new_object; @@ -3365,9 +3292,7 @@ PHP_METHOD(DateTimeImmutable, setTimestamp) } /* }}} */ -/* {{{ proto int date_timestamp_get(DateTimeInterface object) - Gets the Unix timestamp. -*/ +/* {{{ Gets the Unix timestamp. */ PHP_FUNCTION(date_timestamp_get) { zval *object; @@ -3391,9 +3316,7 @@ PHP_FUNCTION(date_timestamp_get) } /* }}} */ -/* {{{ proto DateInterval date_diff(DateTime object [, bool absolute]) - Returns the difference between two DateTime objects. -*/ +/* {{{ Returns the difference between two DateTime objects. */ PHP_FUNCTION(date_diff) { zval *object1, *object2; @@ -3446,9 +3369,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size } } /* }}} */ -/* {{{ proto DateTimeZone timezone_open(string timezone) - Returns new DateTimeZone object -*/ +/* {{{ Returns new DateTimeZone object */ PHP_FUNCTION(timezone_open) { zend_string *tz; @@ -3466,9 +3387,7 @@ PHP_FUNCTION(timezone_open) } /* }}} */ -/* {{{ proto DateTimeZone::__construct(string timezone) - Creates new DateTimeZone object. -*/ +/* {{{ Creates new DateTimeZone object. */ PHP_METHOD(DateTimeZone, __construct) { zend_string *tz; @@ -3508,8 +3427,7 @@ static int php_date_timezone_initialize_from_hash(zval **return_value, php_timez return FAILURE; } /* }}} */ -/* {{{ proto DateTimeZone::__set_state(array array) - * */ +/* {{{ */ PHP_METHOD(DateTimeZone, __set_state) { php_timezone_obj *tzobj; @@ -3531,8 +3449,7 @@ PHP_METHOD(DateTimeZone, __set_state) } /* }}} */ -/* {{{ proto DateTimeZone::__wakeup() - * */ +/* {{{ */ PHP_METHOD(DateTimeZone, __wakeup) { zval *object = ZEND_THIS; @@ -3551,9 +3468,7 @@ PHP_METHOD(DateTimeZone, __wakeup) } /* }}} */ -/* {{{ proto string timezone_name_get(DateTimeZone object) - Returns the name of the timezone. -*/ +/* {{{ Returns the name of the timezone. */ PHP_FUNCTION(timezone_name_get) { zval *object; @@ -3568,9 +3483,7 @@ PHP_FUNCTION(timezone_name_get) } /* }}} */ -/* {{{ proto string timezone_name_from_abbr(string abbr[, int gmtOffset[, int isdst]]) - Returns the timezone name from abbreviation -*/ +/* {{{ Returns the timezone name from abbreviation */ PHP_FUNCTION(timezone_name_from_abbr) { zend_string *abbr; @@ -3595,9 +3508,7 @@ PHP_FUNCTION(timezone_name_from_abbr) } /* }}} */ -/* {{{ proto int timezone_offset_get(DateTimeZone object, DateTimeInterface datetime) - Returns the timezone offset. -*/ +/* {{{ Returns the timezone offset. */ PHP_FUNCTION(timezone_offset_get) { zval *object, *dateobject; @@ -3629,9 +3540,7 @@ PHP_FUNCTION(timezone_offset_get) } /* }}} */ -/* {{{ proto array timezone_transitions_get(DateTimeZone object [, int timestamp_begin [, int timestamp_end ]]) - Returns numerically indexed array containing associative array for all transitions in the specified range for the timezone. -*/ +/* {{{ Returns numerically indexed array containing associative array for all transitions in the specified range for the timezone. */ PHP_FUNCTION(timezone_transitions_get) { zval *object, element; @@ -3710,9 +3619,7 @@ PHP_FUNCTION(timezone_transitions_get) } /* }}} */ -/* {{{ proto array timezone_location_get() - Returns location information for a timezone, including country code, latitude/longitude and comments -*/ +/* {{{ Returns location information for a timezone, including country code, latitude/longitude and comments */ PHP_FUNCTION(timezone_location_get) { zval *object; @@ -3896,9 +3803,7 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string } /* }}} */ -/* {{{ proto DateInterval::__construct([string interval_spec]) - Creates new DateInterval object. -*/ +/* {{{ Creates new DateInterval object. */ PHP_METHOD(DateInterval, __construct) { zend_string *interval_string = NULL; @@ -4001,8 +3906,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter return 0; } /* }}} */ -/* {{{ proto DateInterval::__set_state(array array) -*/ +/* {{{ */ PHP_METHOD(DateInterval, __set_state) { php_interval_obj *intobj; @@ -4021,8 +3925,7 @@ PHP_METHOD(DateInterval, __set_state) } /* }}} */ -/* {{{ proto DateInterval::__wakeup() -*/ +/* {{{ */ PHP_METHOD(DateInterval, __wakeup) { zval *object = ZEND_THIS; @@ -4039,9 +3942,7 @@ PHP_METHOD(DateInterval, __wakeup) } /* }}} */ -/* {{{ proto DateInterval date_interval_create_from_date_string(string time) - Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string -*/ +/* {{{ Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string */ PHP_FUNCTION(date_interval_create_from_date_string) { zend_string *time_str = NULL; @@ -4143,9 +4044,7 @@ static zend_string *date_interval_format(char *format, size_t format_len, timeli } /* }}} */ -/* {{{ proto string date_interval_format(DateInterval object, string format) - Formats the interval. -*/ +/* {{{ Formats the interval. */ PHP_FUNCTION(date_interval_format) { zval *object; @@ -4190,9 +4089,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_ return retval; } /* }}} */ -/* {{{ proto DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end) - Creates new DatePeriod object. -*/ +/* {{{ Creates new DatePeriod object. */ PHP_METHOD(DatePeriod, __construct) { php_period_obj *dpobj; @@ -4281,9 +4178,7 @@ PHP_METHOD(DatePeriod, __construct) } /* }}} */ -/* {{{ proto DatePeriod::getStartDate() - Get start date. -*/ +/* {{{ Get start date. */ PHP_METHOD(DatePeriod, getStartDate) { php_period_obj *dpobj; @@ -4306,9 +4201,7 @@ PHP_METHOD(DatePeriod, getStartDate) } /* }}} */ -/* {{{ proto DatePeriod::getEndDate() - Get end date. -*/ +/* {{{ Get end date. */ PHP_METHOD(DatePeriod, getEndDate) { php_period_obj *dpobj; @@ -4335,9 +4228,7 @@ PHP_METHOD(DatePeriod, getEndDate) } /* }}} */ -/* {{{ proto DatePeriod::getDateInterval() - Get date interval. -*/ +/* {{{ Get date interval. */ PHP_METHOD(DatePeriod, getDateInterval) { php_period_obj *dpobj; @@ -4354,9 +4245,7 @@ PHP_METHOD(DatePeriod, getDateInterval) } /* }}} */ -/* {{{ proto int DatePeriod::getRecurrences() - Get recurrences. -*/ +/* {{{ Get recurrences. */ PHP_METHOD(DatePeriod, getRecurrences) { php_period_obj *dpobj; @@ -4396,9 +4285,7 @@ static int check_id_allowed(char *id, zend_long what) /* {{{ */ return 0; } /* }}} */ -/* {{{ proto array timezone_identifiers_list([long what[, string country]]) - Returns numerically index array with all timezone identifiers. -*/ +/* {{{ Returns numerically index array with all timezone identifiers. */ PHP_FUNCTION(timezone_identifiers_list) { const timelib_tzdb *tzdb; @@ -4437,9 +4324,7 @@ PHP_FUNCTION(timezone_identifiers_list) } /* }}} */ -/* {{{ proto string timezone_version_get() - Returns the Olson database version number. -*/ +/* {{{ Returns the Olson database version number. */ PHP_FUNCTION(timezone_version_get) { const timelib_tzdb *tzdb; @@ -4451,9 +4336,7 @@ PHP_FUNCTION(timezone_version_get) } /* }}} */ -/* {{{ proto array timezone_abbreviations_list() - Returns associative array containing dst, offset and the timezone name -*/ +/* {{{ Returns associative array containing dst, offset and the timezone name */ PHP_FUNCTION(timezone_abbreviations_list) { const timelib_tz_lookup_table *table, *entry; @@ -4488,8 +4371,7 @@ PHP_FUNCTION(timezone_abbreviations_list) } /* }}} */ -/* {{{ proto bool date_default_timezone_set(string timezone_identifier) - Sets the default timezone used by all date/time functions in a script */ +/* {{{ Sets the default timezone used by all date/time functions in a script */ PHP_FUNCTION(date_default_timezone_set) { char *zone; @@ -4512,8 +4394,7 @@ PHP_FUNCTION(date_default_timezone_set) } /* }}} */ -/* {{{ proto string date_default_timezone_get() - Gets the default timezone used by all date/time functions in a script */ +/* {{{ Gets the default timezone used by all date/time functions in a script */ PHP_FUNCTION(date_default_timezone_get) { timelib_tzinfo *default_tz; @@ -4613,24 +4494,21 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su } /* }}} */ -/* {{{ proto mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) - Returns time of sunrise for a given day and location */ +/* {{{ Returns time of sunrise for a given day and location */ PHP_FUNCTION(date_sunrise) { php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) - Returns time of sunset for a given day and location */ +/* {{{ Returns time of sunset for a given day and location */ PHP_FUNCTION(date_sunset) { php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto array date_sun_info(int time, float latitude, float longitude) - Returns an array with information about sun set/rise and twilight begin/end */ +/* {{{ Returns an array with information about sun set/rise and twilight begin/end */ PHP_FUNCTION(date_sun_info) { zend_long time; @@ -4887,8 +4765,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash return 1; } /* }}} */ -/* {{{ proto DatePeriod::__set_state(array array) -*/ +/* {{{ */ PHP_METHOD(DatePeriod, __set_state) { php_period_obj *period_obj; @@ -4909,8 +4786,7 @@ PHP_METHOD(DatePeriod, __set_state) } /* }}} */ -/* {{{ proto DatePeriod::__wakeup() -*/ +/* {{{ */ PHP_METHOD(DatePeriod, __wakeup) { zval *object = ZEND_THIS; diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 01fffa3259..3efcacdb2c 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -319,8 +319,7 @@ PHPAPI dba_handler *dba_get_handler(const char* handler_name) */ /* }}} */ -/* {{{ dba_close - */ +/* {{{ dba_close */ static void dba_close(dba_info *info) { if (info->hnd) { @@ -350,8 +349,7 @@ static void dba_close(dba_info *info) } /* }}} */ -/* {{{ dba_close_rsrc - */ +/* {{{ dba_close_rsrc */ static void dba_close_rsrc(zend_resource *rsrc) { dba_info *info = (dba_info *)rsrc->ptr; @@ -385,8 +383,7 @@ static void dba_close_pe_rsrc(zend_resource *rsrc) } /* }}} */ -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ ZEND_INI_MH(OnUpdateDefaultHandler) { dba_handler *hptr; @@ -411,8 +408,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(dba) { #if defined(COMPILE_DL_DBA) && defined(ZTS) @@ -423,8 +419,7 @@ static PHP_GINIT_FUNCTION(dba) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(dba) { REGISTER_INI_ENTRIES(); @@ -434,8 +429,7 @@ PHP_MINIT_FUNCTION(dba) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(dba) { UNREGISTER_INI_ENTRIES(); @@ -445,8 +439,7 @@ PHP_MSHUTDOWN_FUNCTION(dba) #include "zend_smart_str.h" -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(dba) { dba_handler *hptr; @@ -471,8 +464,7 @@ PHP_MINFO_FUNCTION(dba) } /* }}} */ -/* {{{ php_dba_update - */ +/* {{{ php_dba_update */ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) { size_t val_len; @@ -508,8 +500,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) #define FREENOW if(args) {int i; for (i=0; i<ac; i++) { zval_ptr_dtor(&args[i]); } efree(args);} if(key) efree(key) -/* {{{ php_find_dbm - */ +/* {{{ php_find_dbm */ dba_info *php_dba_find(const char* path) { zend_resource *le; @@ -533,8 +524,7 @@ dba_info *php_dba_find(const char* path) } /* }}} */ -/* {{{ php_dba_open - */ +/* {{{ php_dba_open */ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) { zval *args = NULL; @@ -918,24 +908,21 @@ restart: /* }}} */ #undef FREENOW -/* {{{ proto resource dba_popen(string path, string mode [, string handlername, string ...]) - Opens path using the specified handler in mode persistently */ +/* {{{ Opens path using the specified handler in mode persistently */ PHP_FUNCTION(dba_popen) { php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto resource dba_open(string path, string mode [, string handlername, string ...]) - Opens path using the specified handler in mode*/ +/* {{{ Opens path using the specified handler in mode*/ PHP_FUNCTION(dba_open) { php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto void dba_close(resource handle) - Closes database */ +/* {{{ Closes database */ PHP_FUNCTION(dba_close) { zval *id; @@ -951,8 +938,7 @@ PHP_FUNCTION(dba_close) } /* }}} */ -/* {{{ proto bool dba_exists(string key, resource handle) - Checks, if the specified key exists */ +/* {{{ Checks, if the specified key exists */ PHP_FUNCTION(dba_exists) { DBA_ID_GET2; @@ -966,8 +952,7 @@ PHP_FUNCTION(dba_exists) } /* }}} */ -/* {{{ proto string dba_fetch(string key, [int skip ,] resource handle) - Fetches the data associated with key */ +/* {{{ Fetches the data associated with key */ PHP_FUNCTION(dba_fetch) { char *val; @@ -1009,8 +994,7 @@ PHP_FUNCTION(dba_fetch) } /* }}} */ -/* {{{ proto array|false dba_key_split(string key) - Splits an inifile key into an array of the form array(0=>group,1=>value_name) but returns false if input is false or null */ +/* {{{ Splits an inifile key into an array of the form array(0=>group,1=>value_name) but returns false if input is false or null */ PHP_FUNCTION(dba_key_split) { zval *zkey; @@ -1039,8 +1023,7 @@ PHP_FUNCTION(dba_key_split) } /* }}} */ -/* {{{ proto string dba_firstkey(resource handle) - Resets the internal key pointer and returns the first key */ +/* {{{ Resets the internal key pointer and returns the first key */ PHP_FUNCTION(dba_firstkey) { char *fkey; @@ -1066,8 +1049,7 @@ PHP_FUNCTION(dba_firstkey) } /* }}} */ -/* {{{ proto string dba_nextkey(resource handle) - Returns the next key */ +/* {{{ Returns the next key */ PHP_FUNCTION(dba_nextkey) { char *nkey; @@ -1093,8 +1075,7 @@ PHP_FUNCTION(dba_nextkey) } /* }}} */ -/* {{{ proto bool dba_delete(string key, resource handle) - Deletes the entry associated with key +/* {{{ Deletes the entry associated with key If inifile: remove all other key lines */ PHP_FUNCTION(dba_delete) { @@ -1112,8 +1093,7 @@ PHP_FUNCTION(dba_delete) } /* }}} */ -/* {{{ proto bool dba_insert(string key, string value, resource handle) - If not inifile: Insert value as key, return false, if key exists already +/* {{{ If not inifile: Insert value as key, return false, if key exists already If inifile: Add vakue as key (next instance of key) */ PHP_FUNCTION(dba_insert) { @@ -1121,8 +1101,7 @@ PHP_FUNCTION(dba_insert) } /* }}} */ -/* {{{ proto bool dba_replace(string key, string value, resource handle) - Inserts value as key, replaces key, if key exists already +/* {{{ Inserts value as key, replaces key, if key exists already If inifile: remove all other key lines */ PHP_FUNCTION(dba_replace) { @@ -1130,8 +1109,7 @@ PHP_FUNCTION(dba_replace) } /* }}} */ -/* {{{ proto bool dba_optimize(resource handle) - Optimizes (e.g. clean up, vacuum) database */ +/* {{{ Optimizes (e.g. clean up, vacuum) database */ PHP_FUNCTION(dba_optimize) { zval *id; @@ -1153,8 +1131,7 @@ PHP_FUNCTION(dba_optimize) } /* }}} */ -/* {{{ proto bool dba_sync(resource handle) - Synchronizes database */ +/* {{{ Synchronizes database */ PHP_FUNCTION(dba_sync) { zval *id; @@ -1174,8 +1151,7 @@ PHP_FUNCTION(dba_sync) } /* }}} */ -/* {{{ proto array dba_handlers([bool full_info]) - List configured database handlers */ +/* {{{ List configured database handlers */ PHP_FUNCTION(dba_handlers) { dba_handler *hptr; @@ -1200,8 +1176,7 @@ PHP_FUNCTION(dba_handlers) } /* }}} */ -/* {{{ proto array dba_list() - List opened databases */ +/* {{{ List opened databases */ PHP_FUNCTION(dba_list) { zend_ulong numitems, i; diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c index bceeaff3c5..4dd4a04595 100644 --- a/ext/dba/libflatfile/flatfile.c +++ b/ext/dba/libflatfile/flatfile.c @@ -43,8 +43,7 @@ * ret = 1 key already exists - nothing done */ -/* {{{ flatfile_store - */ +/* {{{ flatfile_store */ int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode) { if (mode == FLATFILE_INSERT) { if (flatfile_findkey(dba, key_datum)) { @@ -79,8 +78,7 @@ int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode) } /* }}} */ -/* {{{ flatfile_fetch - */ +/* {{{ flatfile_fetch */ datum flatfile_fetch(flatfile *dba, datum key_datum) { datum value_datum = {NULL, 0}; char buf[16]; @@ -99,8 +97,7 @@ datum flatfile_fetch(flatfile *dba, datum key_datum) { } /* }}} */ -/* {{{ flatfile_delete - */ +/* {{{ flatfile_delete */ int flatfile_delete(flatfile *dba, datum key_datum) { char *key = key_datum.dptr; size_t size = key_datum.dsize; @@ -151,8 +148,7 @@ int flatfile_delete(flatfile *dba, datum key_datum) { } /* }}} */ -/* {{{ flatfile_findkey - */ +/* {{{ flatfile_findkey */ int flatfile_findkey(flatfile *dba, datum key_datum) { size_t buf_size = FLATFILE_BLOCK_SIZE; char *buf = emalloc(buf_size); @@ -194,8 +190,7 @@ int flatfile_findkey(flatfile *dba, datum key_datum) { } /* }}} */ -/* {{{ flatfile_firstkey - */ +/* {{{ flatfile_firstkey */ datum flatfile_firstkey(flatfile *dba) { datum res; size_t num; @@ -237,8 +232,7 @@ datum flatfile_firstkey(flatfile *dba) { } /* }}} */ -/* {{{ flatfile_nextkey - */ +/* {{{ flatfile_nextkey */ datum flatfile_nextkey(flatfile *dba) { datum res; size_t num; diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c index 7302b753bd..43227c42d7 100644 --- a/ext/dba/libinifile/inifile.c +++ b/ext/dba/libinifile/inifile.c @@ -160,8 +160,7 @@ static char *etrim(const char *str) } /* }}} */ -/* {{{ inifile_findkey - */ +/* {{{ inifile_findkey */ static int inifile_read(inifile *dba, line_type *ln) { char *fline; char *pos; @@ -238,8 +237,7 @@ static int inifile_key_cmp(const key_type *k1, const key_type *k2) } /* }}} */ -/* {{{ inifile_fetch - */ +/* {{{ inifile_fetch */ val_type inifile_fetch(inifile *dba, const key_type *key, int skip) { line_type ln = {{NULL,NULL},{NULL},0}; val_type val; @@ -282,8 +280,7 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip) { } /* }}} */ -/* {{{ inifile_firstkey - */ +/* {{{ inifile_firstkey */ int inifile_firstkey(inifile *dba) { inifile_line_free(&dba->curr); dba->curr.pos = 0; @@ -291,8 +288,7 @@ int inifile_firstkey(inifile *dba) { } /* }}} */ -/* {{{ inifile_nextkey - */ +/* {{{ inifile_nextkey */ int inifile_nextkey(inifile *dba) { line_type ln = {{NULL,NULL},{NULL},0}; @@ -306,8 +302,7 @@ int inifile_nextkey(inifile *dba) { } /* }}} */ -/* {{{ inifile_truncate - */ +/* {{{ inifile_truncate */ static int inifile_truncate(inifile *dba, size_t size) { int res; @@ -380,8 +375,7 @@ static int inifile_next_group(inifile *dba, const key_type *key, size_t *pos_grp } /* }}} */ -/* {{{ inifile_copy_to - */ +/* {{{ inifile_copy_to */ static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifile **ini_copy) { php_stream *fp; @@ -458,8 +452,7 @@ static int inifile_filter(inifile *dba, inifile *from, const key_type *key, zend } /* }}} */ -/* {{{ inifile_delete_replace_append - */ +/* {{{ inifile_delete_replace_append */ static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append, zend_bool *found) { size_t pos_grp_start=0, pos_grp_next; @@ -561,40 +554,35 @@ static int inifile_delete_replace_append(inifile *dba, const key_type *key, cons } /* }}} */ -/* {{{ inifile_delete - */ +/* {{{ inifile_delete */ int inifile_delete(inifile *dba, const key_type *key) { return inifile_delete_replace_append(dba, key, NULL, 0, NULL); } /* }}} */ -/* {{{ inifile_delete_ex - */ +/* {{{ inifile_delete_ex */ int inifile_delete_ex(inifile *dba, const key_type *key, zend_bool *found) { return inifile_delete_replace_append(dba, key, NULL, 0, found); } /* }}} */ -/* {{{ inifile_relace - */ +/* {{{ inifile_relace */ int inifile_replace(inifile *dba, const key_type *key, const val_type *value) { return inifile_delete_replace_append(dba, key, value, 0, NULL); } /* }}} */ -/* {{{ inifile_replace_ex - */ +/* {{{ inifile_replace_ex */ int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *value, zend_bool *found) { return inifile_delete_replace_append(dba, key, value, 0, found); } /* }}} */ -/* {{{ inifile_append - */ +/* {{{ inifile_append */ int inifile_append(inifile *dba, const key_type *key, const val_type *value) { return inifile_delete_replace_append(dba, key, value, 1, NULL); diff --git a/ext/dom/attr.c b/ext/dom/attr.c index a89cce5750..99178bfe3e 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -32,7 +32,7 @@ * Since: */ -/* {{{ proto DOMAttr::__construct(string name, [string value]) */ +/* {{{ */ PHP_METHOD(DOMAttr, __construct) { xmlAttrPtr nodep = NULL; @@ -202,8 +202,7 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ proto bool domattr::isId() -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId Since: DOM Level 3 */ PHP_METHOD(DOMAttr, isId) diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index 72bf77a04f..ce62377917 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMCdataSection::__construct(string value); */ +/* {{{ */ PHP_METHOD(DOMCdataSection, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index b43636a8a4..b3774c3c88 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -108,8 +108,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ proto string dom_characterdata_substring_data(int offset, int count); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF Since: */ PHP_METHOD(DOMCharacterData, substringData) @@ -158,8 +157,7 @@ PHP_METHOD(DOMCharacterData, substringData) } /* }}} end dom_characterdata_substring_data */ -/* {{{ proto void dom_characterdata_append_data(string arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F Since: */ PHP_METHOD(DOMCharacterData, appendData) @@ -181,8 +179,7 @@ PHP_METHOD(DOMCharacterData, appendData) } /* }}} end dom_characterdata_append_data */ -/* {{{ proto void dom_characterdata_insert_data(int offset, string arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F Since: */ PHP_METHOD(DOMCharacterData, insertData) @@ -231,8 +228,7 @@ PHP_METHOD(DOMCharacterData, insertData) } /* }}} end dom_characterdata_insert_data */ -/* {{{ proto void dom_characterdata_delete_data(int offset, int count); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 Since: */ PHP_METHOD(DOMCharacterData, deleteData) @@ -287,8 +283,7 @@ PHP_METHOD(DOMCharacterData, deleteData) } /* }}} end dom_characterdata_delete_data */ -/* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB Since: */ PHP_METHOD(DOMCharacterData, replaceData) diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 44cde90166..db2341b725 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMComment::__construct([string value]); */ +/* {{{ */ PHP_METHOD(DOMComment, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; diff --git a/ext/dom/document.c b/ext/dom/document.c index aa1d99ebd2..d16a085463 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -505,8 +505,7 @@ int dom_document_config_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 Since: */ PHP_METHOD(DOMDocument, createElement) @@ -540,8 +539,7 @@ PHP_METHOD(DOMDocument, createElement) } /* }}} end dom_document_create_element */ -/* {{{ proto DOMDocumentFragment dom_document_create_document_fragment() -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 Since: */ PHP_METHOD(DOMDocument, createDocumentFragment) @@ -568,8 +566,7 @@ PHP_METHOD(DOMDocument, createDocumentFragment) } /* }}} end dom_document_create_document_fragment */ -/* {{{ proto DOMText dom_document_create_text_node(string data) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 Since: */ PHP_METHOD(DOMDocument, createTextNode) @@ -598,8 +595,7 @@ PHP_METHOD(DOMDocument, createTextNode) } /* }}} end dom_document_create_text_node */ -/* {{{ proto DOMComment dom_document_create_comment(string data) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 Since: */ PHP_METHOD(DOMDocument, createComment) @@ -628,8 +624,7 @@ PHP_METHOD(DOMDocument, createComment) } /* }}} end dom_document_create_comment */ -/* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 Since: */ PHP_METHOD(DOMDocument, createCDATASection) @@ -658,8 +653,7 @@ PHP_METHOD(DOMDocument, createCDATASection) } /* }}} end dom_document_create_cdatasection */ -/* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 Since: */ PHP_METHOD(DOMDocument, createProcessingInstruction) @@ -695,8 +689,7 @@ PHP_METHOD(DOMDocument, createProcessingInstruction) } /* }}} end dom_document_create_processing_instruction */ -/* {{{ proto DOMAttr dom_document_create_attribute(string name) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 Since: */ PHP_METHOD(DOMDocument, createAttribute) @@ -731,8 +724,7 @@ PHP_METHOD(DOMDocument, createAttribute) } /* }}} end dom_document_create_attribute */ -/* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE Since: */ PHP_METHOD(DOMDocument, createEntityReference) @@ -766,8 +758,7 @@ PHP_METHOD(DOMDocument, createEntityReference) } /* }}} end dom_document_create_entity_reference */ -/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 Since: */ PHP_METHOD(DOMDocument, getElementsByTagName) @@ -793,8 +784,7 @@ PHP_METHOD(DOMDocument, getElementsByTagName) } /* }}} end dom_document_get_elements_by_tag_name */ -/* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, bool deep) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode Since: DOM Level 2 */ PHP_METHOD(DOMDocument, importNode) @@ -852,8 +842,7 @@ PHP_METHOD(DOMDocument, importNode) } /* }}} end dom_document_import_node */ -/* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS Since: DOM Level 2 */ PHP_METHOD(DOMDocument, createElementNS) @@ -917,8 +906,7 @@ PHP_METHOD(DOMDocument, createElementNS) } /* }}} end dom_document_create_element_ns */ -/* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS Since: DOM Level 2 */ PHP_METHOD(DOMDocument, createAttributeNS) @@ -984,8 +972,7 @@ PHP_METHOD(DOMDocument, createAttributeNS) } /* }}} end dom_document_create_attribute_ns */ -/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS Since: DOM Level 2 */ PHP_METHOD(DOMDocument, getElementsByTagNameNS) @@ -1012,8 +999,7 @@ PHP_METHOD(DOMDocument, getElementsByTagNameNS) } /* }}} end dom_document_get_elements_by_tag_name_ns */ -/* {{{ proto DOMElement dom_document_get_element_by_id(string elementId) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId Since: DOM Level 2 */ PHP_METHOD(DOMDocument, getElementById) @@ -1044,8 +1030,7 @@ PHP_METHOD(DOMDocument, getElementById) } /* }}} end dom_document_get_element_by_id */ -/* {{{ proto DOMNode dom_document_adopt_node(DOMNode source) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode Since: DOM Level 3 */ PHP_METHOD(DOMDocument, adoptNode) @@ -1060,8 +1045,7 @@ PHP_METHOD(DOMDocument, adoptNode) } /* }}} end dom_document_adopt_node */ -/* {{{ proto void dom_document_normalize_document() -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument Since: DOM Level 3 */ PHP_METHOD(DOMDocument, normalizeDocument) @@ -1081,7 +1065,7 @@ PHP_METHOD(DOMDocument, normalizeDocument) } /* }}} end dom_document_normalize_document */ -/* {{{ proto DOMDocument::__construct([string version], [string encoding]); */ +/* {{{ */ PHP_METHOD(DOMDocument, __construct) { xmlDoc *docp = NULL, *olddoc; @@ -1366,8 +1350,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { } /* }}} end dom_parser_document */ -/* {{{ proto DOMNode dom_document_load(string source [, int options]) -URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load +/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load Since: DOM Level 3 */ PHP_METHOD(DOMDocument, load) @@ -1376,8 +1359,7 @@ PHP_METHOD(DOMDocument, load) } /* }}} end dom_document_load */ -/* {{{ proto DOMNode dom_document_loadxml(string source [, int options]) -URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML +/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML Since: DOM Level 3 */ PHP_METHOD(DOMDocument, loadXML) @@ -1386,9 +1368,7 @@ PHP_METHOD(DOMDocument, loadXML) } /* }}} end dom_document_loadxml */ -/* {{{ proto int dom_document_save(string file) -Convenience method to save to file -*/ +/* {{{ Convenience method to save to file */ PHP_METHOD(DOMDocument, save) { zval *id; @@ -1431,8 +1411,7 @@ PHP_METHOD(DOMDocument, save) } /* }}} end dom_document_save */ -/* {{{ proto string dom_document_savexml([node n]) -URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML +/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML Since: DOM Level 3 */ PHP_METHOD(DOMDocument, saveXML) @@ -1544,8 +1523,7 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */ } /* }}} */ -/* {{{ proto int dom_document_xinclude([int options]) - Substitutues xincludes in a DomDocument */ +/* {{{ Substitutues xincludes in a DomDocument */ PHP_METHOD(DOMDocument, xinclude) { zval *id; @@ -1590,9 +1568,7 @@ PHP_METHOD(DOMDocument, xinclude) } /* }}} */ -/* {{{ proto bool dom_document_validate() -Since: DOM extended -*/ +/* {{{ Since: DOM extended */ PHP_METHOD(DOMDocument, validate) { zval *id; @@ -1714,14 +1690,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type } /* }}} */ -/* {{{ proto bool dom_document_schema_validate_file(string filename, int flags); */ +/* {{{ */ PHP_METHOD(DOMDocument, schemaValidate) { _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_schema_validate_file */ -/* {{{ proto bool dom_document_schema_validate(string source, int flags); */ +/* {{{ */ PHP_METHOD(DOMDocument, schemaValidateSource) { _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); @@ -1808,14 +1784,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ } /* }}} */ -/* {{{ proto bool dom_document_relaxNG_validate_file(string filename); */ +/* {{{ */ PHP_METHOD(DOMDocument, relaxNGValidate) { _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_relaxNG_validate_file */ -/* {{{ proto bool dom_document_relaxNG_validate_xml(string source); */ +/* {{{ */ PHP_METHOD(DOMDocument, relaxNGValidateSource) { _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); @@ -1920,27 +1896,21 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ } /* }}} */ -/* {{{ proto DOMNode dom_document_load_html_file(string source) -Since: DOM extended -*/ +/* {{{ Since: DOM extended */ PHP_METHOD(DOMDocument, loadHTMLFile) { dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_load_html_file */ -/* {{{ proto DOMNode dom_document_load_html(string source) -Since: DOM extended -*/ +/* {{{ Since: DOM extended */ PHP_METHOD(DOMDocument, loadHTML) { dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); } /* }}} end dom_document_load_html */ -/* {{{ proto int dom_document_save_html_file(string file) -Convenience method to save to file as html -*/ +/* {{{ Convenience method to save to file as html */ PHP_METHOD(DOMDocument, saveHTMLFile) { zval *id; @@ -1978,9 +1948,7 @@ PHP_METHOD(DOMDocument, saveHTMLFile) } /* }}} end dom_document_save_html_file */ -/* {{{ proto string dom_document_save_html() -Convenience method to output as html -*/ +/* {{{ Convenience method to output as html */ PHP_METHOD(DOMDocument, saveHTML) { zval *id, *nodep = NULL; @@ -2067,8 +2035,7 @@ PHP_METHOD(DOMDocument, saveHTML) #endif /* defined(LIBXML_HTML_ENABLED) */ -/* {{{ proto bool DOMDocument::registerNodeClass(string baseclass, string extendedclass) - Register extended class used to create base node type */ +/* {{{ Register extended class used to create base node type */ PHP_METHOD(DOMDocument, registerNodeClass) { zval *id; @@ -2091,8 +2058,7 @@ PHP_METHOD(DOMDocument, registerNodeClass) } /* }}} */ -/* {{{ proto void domdocument::append(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-append +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMDocument, append) @@ -2113,8 +2079,7 @@ PHP_METHOD(DOMDocument, append) } /* }}} */ -/* {{{ proto void domdocument::prepend(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMDocument, prepend) diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 14cdaf1d21..641c3f5b34 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMDocumentFragment::__construct() */ +/* {{{ */ PHP_METHOD(DOMDocumentFragment, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; @@ -91,7 +91,7 @@ static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */ } /* }}} */ -/* {{{ proto void DOMDocumentFragment::appendXML(string data) */ +/* {{{ */ PHP_METHOD(DOMDocumentFragment, appendXML) { zval *id; xmlNode *nodep; @@ -130,8 +130,7 @@ PHP_METHOD(DOMDocumentFragment, appendXML) { } /* }}} */ -/* {{{ proto void domdocumentfragment::append(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-append +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMDocumentFragment, append) @@ -152,8 +151,7 @@ PHP_METHOD(DOMDocumentFragment, append) } /* }}} */ -/* {{{ proto void domdocumentfragment::prepend(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMDocumentFragment, prepend) diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index 1dfe95ab61..86ec4a2368 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -30,8 +30,7 @@ * Since: */ -/* {{{ proto bool dom_domimplementation_has_feature(string feature, string version); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7 Since: */ PHP_METHOD(DOMImplementation, hasFeature) @@ -51,8 +50,7 @@ PHP_METHOD(DOMImplementation, hasFeature) } /* }}} end dom_domimplementation_has_feature */ -/* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType Since: DOM Level 2 */ PHP_METHOD(DOMImplementation, createDocumentType) @@ -113,8 +111,7 @@ PHP_METHOD(DOMImplementation, createDocumentType) } /* }}} end dom_domimplementation_create_document_type */ -/* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument Since: DOM Level 2 */ PHP_METHOD(DOMImplementation, createDocument) @@ -218,8 +215,7 @@ PHP_METHOD(DOMImplementation, createDocument) } /* }}} end dom_domimplementation_create_document */ -/* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature Since: DOM Level 3 */ PHP_METHOD(DOMImplementation, getFeature) diff --git a/ext/dom/element.c b/ext/dom/element.c index cd67e214a5..41bc7296ca 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMElement::__construct(string name, [string value], [string uri]) */ +/* {{{ */ PHP_METHOD(DOMElement, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; @@ -193,8 +193,7 @@ static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{ } /* }}} */ -/* {{{ proto string dom_element_get_attribute(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 Since: */ PHP_METHOD(DOMElement, getAttribute) @@ -237,8 +236,7 @@ PHP_METHOD(DOMElement, getAttribute) } /* }}} end dom_element_get_attribute */ -/* {{{ proto void dom_element_set_attribute(string name, string value); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 Since: */ PHP_METHOD(DOMElement, setAttribute) @@ -305,8 +303,7 @@ PHP_METHOD(DOMElement, setAttribute) } /* }}} end dom_element_set_attribute */ -/* {{{ proto void dom_element_remove_attribute(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 Since: */ PHP_METHOD(DOMElement, removeAttribute) @@ -354,8 +351,7 @@ PHP_METHOD(DOMElement, removeAttribute) } /* }}} end dom_element_remove_attribute */ -/* {{{ proto DOMAttr dom_element_get_attribute_node(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 Since: */ PHP_METHOD(DOMElement, getAttributeNode) @@ -402,8 +398,7 @@ PHP_METHOD(DOMElement, getAttributeNode) } /* }}} end dom_element_get_attribute_node */ -/* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 Since: */ PHP_METHOD(DOMElement, setAttributeNode) @@ -469,8 +464,7 @@ PHP_METHOD(DOMElement, setAttributeNode) } /* }}} end dom_element_set_attribute_node */ -/* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 Since: */ PHP_METHOD(DOMElement, removeAttributeNode) @@ -507,8 +501,7 @@ PHP_METHOD(DOMElement, removeAttributeNode) } /* }}} end dom_element_remove_attribute_node */ -/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D Since: */ PHP_METHOD(DOMElement, getElementsByTagName) @@ -534,8 +527,7 @@ PHP_METHOD(DOMElement, getElementsByTagName) } /* }}} end dom_element_get_elements_by_tag_name */ -/* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, getAttributeNS) @@ -615,8 +607,7 @@ static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /* } /* }}} */ -/* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, setAttributeNS) @@ -744,8 +735,7 @@ PHP_METHOD(DOMElement, setAttributeNS) } /* }}} end dom_element_set_attribute_ns */ -/* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, removeAttributeNS) @@ -802,8 +792,7 @@ PHP_METHOD(DOMElement, removeAttributeNS) } /* }}} end dom_element_remove_attribute_ns */ -/* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, getAttributeNodeNS) @@ -858,8 +847,7 @@ PHP_METHOD(DOMElement, getAttributeNodeNS) } /* }}} end dom_element_get_attribute_node_ns */ -/* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, setAttributeNodeNS) @@ -932,8 +920,7 @@ PHP_METHOD(DOMElement, setAttributeNodeNS) } /* }}} end dom_element_set_attribute_node_ns */ -/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 Since: DOM Level 2 */ PHP_METHOD(DOMElement, getElementsByTagNameNS) @@ -961,8 +948,7 @@ PHP_METHOD(DOMElement, getElementsByTagNameNS) } /* }}} end dom_element_get_elements_by_tag_name_ns */ -/* {{{ proto bool dom_element_has_attribute(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr Since: DOM Level 2 */ PHP_METHOD(DOMElement, hasAttribute) @@ -990,8 +976,7 @@ PHP_METHOD(DOMElement, hasAttribute) } /* }}} end dom_element_has_attribute */ -/* {{{ proto bool dom_element_has_attribute_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS Since: DOM Level 2 */ PHP_METHOD(DOMElement, hasAttributeNS) @@ -1048,8 +1033,7 @@ static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) /* {{{ */ } /* }}} */ -/* {{{ proto void dom_element_set_id_attribute(string name, bool isId); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr Since: DOM Level 3 */ PHP_METHOD(DOMElement, setIdAttribute) @@ -1085,8 +1069,7 @@ PHP_METHOD(DOMElement, setIdAttribute) } /* }}} end dom_element_set_id_attribute */ -/* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, bool isId); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS Since: DOM Level 3 */ PHP_METHOD(DOMElement, setIdAttributeNS) @@ -1122,8 +1105,7 @@ PHP_METHOD(DOMElement, setIdAttributeNS) } /* }}} end dom_element_set_id_attribute_ns */ -/* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, bool isId); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode Since: DOM Level 3 */ PHP_METHOD(DOMElement, setIdAttributeNode) @@ -1158,8 +1140,7 @@ PHP_METHOD(DOMElement, setIdAttributeNode) } /* }}} end dom_element_set_id_attribute_node */ -/* {{{ proto void DOMElement::remove(); -URL: +/* {{{ URL: Since: */ PHP_METHOD(DOMElement, remove) @@ -1213,8 +1194,7 @@ PHP_METHOD(DOMElement, before) dom_parent_node_before(intern, args, argc); } -/* {{{ proto void domelement::append(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-append +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMElement, append) @@ -1235,8 +1215,7 @@ PHP_METHOD(DOMElement, append) } /* }}} end DOMElement::append */ -/* {{{ proto void domelement::prepend(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMElement, prepend) @@ -1257,8 +1236,7 @@ PHP_METHOD(DOMElement, prepend) } /* }}} end DOMElement::prepend */ -/* {{{ proto void domelement::replaceWith(string|DOMNode ...$nodes) -URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend +/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend Since: DOM Living Standard (DOM4) */ PHP_METHOD(DOMElement, replaceWith) diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index 370d4510ce..4e45119b48 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMEntityReference::__construct(string name) */ +/* {{{ */ PHP_METHOD(DOMEntityReference, __construct) { xmlNode *node; diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 943a3e1156..fd96003e56 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -72,8 +72,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ proto DOMNode dom_namednodemap_get_named_item(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 Since: */ PHP_METHOD(DOMNamedNodeMap, getNamedItem) @@ -128,8 +127,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItem) } /* }}} end dom_namednodemap_get_named_item */ -/* {{{ proto DOMNode dom_namednodemap_item(int index); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 Since: */ PHP_METHOD(DOMNamedNodeMap, item) @@ -192,8 +190,7 @@ PHP_METHOD(DOMNamedNodeMap, item) } /* }}} end dom_namednodemap_item */ -/* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS Since: DOM Level 2 */ PHP_METHOD(DOMNamedNodeMap, getNamedItemNS) @@ -248,8 +245,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItemNS) } /* }}} end dom_namednodemap_get_named_item_ns */ -/* {{{ proto int|bool dom_namednodemap_count(); -*/ +/* {{{ */ PHP_METHOD(DOMNamedNodeMap, count) { zval *id; diff --git a/ext/dom/node.c b/ext/dom/node.c index f2da0d92b7..16a6c6cc54 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -831,8 +831,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, } /* }}} */ -/* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 Since: */ PHP_METHOD(DOMNode, insertBefore) @@ -993,8 +992,7 @@ PHP_METHOD(DOMNode, insertBefore) } /* }}} end dom_node_insert_before */ -/* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 Since: */ PHP_METHOD(DOMNode, replaceChild) @@ -1082,8 +1080,7 @@ PHP_METHOD(DOMNode, replaceChild) } /* }}} end dom_node_replace_child */ -/* {{{ proto DomNode dom_node_remove_child(DomNode oldChild); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 Since: */ PHP_METHOD(DOMNode, removeChild) @@ -1134,8 +1131,7 @@ PHP_METHOD(DOMNode, removeChild) } /* }}} end dom_node_remove_child */ -/* {{{ proto DomNode dom_node_append_child(DomNode newChild); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 Since: */ PHP_METHOD(DOMNode, appendChild) @@ -1236,8 +1232,7 @@ PHP_METHOD(DOMNode, appendChild) } /* }}} end dom_node_append_child */ -/* {{{ proto bool dom_node_has_child_nodes(); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 Since: */ PHP_METHOD(DOMNode, hasChildNodes) @@ -1265,8 +1260,7 @@ PHP_METHOD(DOMNode, hasChildNodes) } /* }}} end dom_node_has_child_nodes */ -/* {{{ proto DomNode dom_node_clone_node(bool deep); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 Since: */ PHP_METHOD(DOMNode, cloneNode) @@ -1327,8 +1321,7 @@ PHP_METHOD(DOMNode, cloneNode) } /* }}} end dom_node_clone_node */ -/* {{{ proto void dom_node_normalize(); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize Since: */ PHP_METHOD(DOMNode, normalize) @@ -1349,8 +1342,7 @@ PHP_METHOD(DOMNode, normalize) } /* }}} end dom_node_normalize */ -/* {{{ proto bool dom_node_is_supported(string feature, string version); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports Since: DOM Level 2 */ PHP_METHOD(DOMNode, isSupported) @@ -1370,8 +1362,7 @@ PHP_METHOD(DOMNode, isSupported) } /* }}} end dom_node_is_supported */ -/* {{{ proto bool dom_node_has_attributes(); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs Since: DOM Level 2 */ PHP_METHOD(DOMNode, hasAttributes) @@ -1398,8 +1389,7 @@ PHP_METHOD(DOMNode, hasAttributes) } /* }}} end dom_node_has_attributes */ -/* {{{ proto bool dom_node_is_same_node(DomNode other); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode Since: DOM Level 3 */ PHP_METHOD(DOMNode, isSameNode) @@ -1425,8 +1415,7 @@ PHP_METHOD(DOMNode, isSameNode) } /* }}} end dom_node_is_same_node */ -/* {{{ proto string dom_node_lookup_prefix(string namespaceURI); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix Since: DOM Level 3 */ PHP_METHOD(DOMNode, lookupPrefix) @@ -1477,8 +1466,7 @@ PHP_METHOD(DOMNode, lookupPrefix) } /* }}} end dom_node_lookup_prefix */ -/* {{{ proto bool dom_node_is_default_namespace(string namespaceURI); -URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace +/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace Since: DOM Level 3 */ PHP_METHOD(DOMNode, isDefaultNamespace) @@ -1511,8 +1499,7 @@ PHP_METHOD(DOMNode, isDefaultNamespace) } /* }}} end dom_node_is_default_namespace */ -/* {{{ proto string dom_node_lookup_namespace_uri(string prefix); -URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI +/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI Since: DOM Level 3 */ PHP_METHOD(DOMNode, lookupNamespaceURI) @@ -1721,24 +1708,21 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ } /* }}} */ -/* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) - Canonicalize nodes to a string */ +/* {{{ Canonicalize nodes to a string */ PHP_METHOD(DOMNode, C14N) { dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) - Canonicalize nodes to a file */ +/* {{{ Canonicalize nodes to a file */ PHP_METHOD(DOMNode, C14NFile) { dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string|null DOMNode::getNodePath() - Gets an xpath for a node */ +/* {{{ Gets an xpath for a node */ PHP_METHOD(DOMNode, getNodePath) { zval *id; @@ -1762,8 +1746,7 @@ PHP_METHOD(DOMNode, getNodePath) } /* }}} */ -/* {{{ proto int DOMNode::getLineNo() - Gets line number for a node */ +/* {{{ Gets line number for a node */ PHP_METHOD(DOMNode, getLineNo) { zval *id; diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 723024ba96..893061636c 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -82,8 +82,7 @@ int dom_nodelist_length_read(dom_object *obj, zval *retval) } -/* {{{ proto int|bool dom_nodelist_count(); -*/ +/* {{{ */ PHP_METHOD(DOMNodeList, count) { zval *id; @@ -103,8 +102,7 @@ PHP_METHOD(DOMNodeList, count) /* }}} */ -/* {{{ proto DOMNode dom_nodelist_item(int index); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 Since: */ PHP_METHOD(DOMNodeList, item) diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 218bf1972f..054240acd9 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -448,8 +448,7 @@ void *php_dom_export_node(zval *object) /* {{{ */ } /* }}} */ -/* {{{ proto somNode dom_import_simplexml(sxeobject node) - Get a simplexml_element object from dom to allow for processing */ +/* {{{ Get a simplexml_element object from dom to allow for processing */ PHP_FUNCTION(dom_import_simplexml) { zval *node; diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 7d4a080953..9255213e71 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -30,7 +30,7 @@ * Since: */ -/* {{{ proto DOMProcessingInstruction::__construct(string name, [string value]); */ +/* {{{ */ PHP_METHOD(DOMProcessingInstruction, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; diff --git a/ext/dom/text.c b/ext/dom/text.c index 63651985ca..b1053b2039 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -31,7 +31,7 @@ * Since: */ -/* {{{ proto DOMText::__construct([string value]); */ +/* {{{ */ PHP_METHOD(DOMText, __construct) { xmlNodePtr nodep = NULL, oldnode = NULL; @@ -101,8 +101,7 @@ int dom_text_whole_text_read(dom_object *obj, zval *retval) /* }}} */ -/* {{{ proto DOMText dom_text_split_text(int offset) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D Since: */ PHP_METHOD(DOMText, splitText) @@ -163,8 +162,7 @@ PHP_METHOD(DOMText, splitText) } /* }}} end dom_text_split_text */ -/* {{{ proto bool dom_text_is_whitespace_in_element_content() -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent Since: DOM Level 3 */ PHP_METHOD(DOMText, isWhitespaceInElementContent) diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index f453ca72f2..7c63c33e86 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -209,7 +209,7 @@ static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int } /* }}} */ -/* {{{ proto DOMXPath::__construct(DOMDocument doc) U */ +/* {{{ */ PHP_METHOD(DOMXPath, __construct) { zval *doc; @@ -290,7 +290,7 @@ int dom_xpath_register_node_ns_write(dom_object *obj, zval *newval) } /* }}} */ -/* {{{ proto bool dom_xpath_register_ns(string prefix, string uri) */ +/* {{{ */ PHP_METHOD(DOMXPath, registerNamespace) { zval *id; @@ -475,21 +475,21 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ } /* }}} */ -/* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context [, bool registerNodeNS]]) */ +/* {{{ */ PHP_METHOD(DOMXPath, query) { php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY); } /* }}} end dom_xpath_query */ -/* {{{ proto mixed dom_xpath_evaluate(string expr [,DOMNode context [, bool registerNodeNS]]) */ +/* {{{ */ PHP_METHOD(DOMXPath, evaluate) { php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE); } /* }}} end dom_xpath_evaluate */ -/* {{{ proto void dom_xpath_register_php_functions() */ +/* {{{ */ PHP_METHOD(DOMXPath, registerPhpFunctions) { zval *id = ZEND_THIS; diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 09d6c914af..089f1a9a5c 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -82,8 +82,7 @@ static zend_object *enchant_dict_create_object(zend_class_entry *class_type) { #define PHP_ENCHANT_MYSPELL 1 #define PHP_ENCHANT_ISPELL 2 -/* {{{ enchant_module_entry - */ +/* {{{ enchant_module_entry */ zend_module_entry enchant_module_entry = { STANDARD_MODULE_HEADER, "enchant", @@ -184,8 +183,7 @@ static void php_enchant_dict_free(zend_object *object) /* {{{ */ } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(enchant) { zend_class_entry bce, dce; @@ -223,8 +221,7 @@ PHP_MINIT_FUNCTION(enchant) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(enchant) { return SUCCESS; @@ -240,8 +237,7 @@ static void __enumerate_providers_fn (const char * const name, } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(enchant) { EnchantBroker *pbroker; @@ -277,8 +273,7 @@ PHP_MINFO_FUNCTION(enchant) RETURN_THROWS(); \ } -/* {{{ proto resource enchant_broker_init() - create a new broker object capable of requesting */ +/* {{{ create a new broker object capable of requesting */ PHP_FUNCTION(enchant_broker_init) { enchant_broker *broker; @@ -300,8 +295,7 @@ PHP_FUNCTION(enchant_broker_init) } /* }}} */ -/* {{{ proto bool enchant_broker_free(resource broker) - Destroys the broker object and its dictionaries */ +/* {{{ Destroys the broker object and its dictionaries */ PHP_FUNCTION(enchant_broker_free) { zval *broker; @@ -324,8 +318,7 @@ PHP_FUNCTION(enchant_broker_free) } /* }}} */ -/* {{{ proto string enchant_broker_get_error(resource broker) - Returns the last error of the broker */ +/* {{{ Returns the last error of the broker */ PHP_FUNCTION(enchant_broker_get_error) { zval *broker; @@ -346,8 +339,7 @@ PHP_FUNCTION(enchant_broker_get_error) } /* }}} */ -/* {{{ proto bool enchant_broker_set_dict_path(resource broker, int dict_type, string value) - Set the directory path for a given backend, works with ispell and myspell */ +/* {{{ Set the directory path for a given backend, works with ispell and myspell */ PHP_FUNCTION(enchant_broker_set_dict_path) { zval *broker; @@ -388,8 +380,7 @@ PHP_FUNCTION(enchant_broker_set_dict_path) /* }}} */ -/* {{{ proto string enchant_broker_get_dict_path(resource broker, int dict_type) - Get the directory path for a given backend, works with ispell and myspell */ +/* {{{ Get the directory path for a given backend, works with ispell and myspell */ PHP_FUNCTION(enchant_broker_get_dict_path) { zval *broker; @@ -429,8 +420,7 @@ PHP_FUNCTION(enchant_broker_get_dict_path) } /* }}} */ -/* {{{ proto array enchant_broker_list_dicts(resource broker) - Lists the dictionaries available for the given broker */ +/* {{{ Lists the dictionaries available for the given broker */ PHP_FUNCTION(enchant_broker_list_dicts) { zval *broker; @@ -447,8 +437,7 @@ PHP_FUNCTION(enchant_broker_list_dicts) } /* }}} */ -/* {{{ proto resource enchant_broker_request_dict(resource broker, string tag) - create a new dictionary using tag, the non-empty language tag you wish to request +/* {{{ create a new dictionary using tag, the non-empty language tag you wish to request a dictionary for ("en_US", "de_DE", ...) */ PHP_FUNCTION(enchant_broker_request_dict) { @@ -484,8 +473,7 @@ PHP_FUNCTION(enchant_broker_request_dict) } /* }}} */ -/* {{{ proto resource enchant_broker_request_pwl_dict(resource broker, string filename) - creates a dictionary using a PWL file. A PWL file is personal word file one word per line. It must exist before the call.*/ +/* {{{ creates a dictionary using a PWL file. A PWL file is personal word file one word per line. It must exist before the call.*/ PHP_FUNCTION(enchant_broker_request_pwl_dict) { zval *broker; @@ -519,8 +507,7 @@ PHP_FUNCTION(enchant_broker_request_pwl_dict) } /* }}} */ -/* {{{ proto resource enchant_broker_free_dict(resource dict) - Free the dictionary resource */ +/* {{{ Free the dictionary resource */ PHP_FUNCTION(enchant_broker_free_dict) { zval *dict; @@ -547,8 +534,7 @@ PHP_FUNCTION(enchant_broker_free_dict) } /* }}} */ -/* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag) - Whether a dictionary exists or not. Using non-empty tag */ +/* {{{ Whether a dictionary exists or not. Using non-empty tag */ PHP_FUNCTION(enchant_broker_dict_exists) { zval *broker; @@ -566,8 +552,7 @@ PHP_FUNCTION(enchant_broker_dict_exists) } /* }}} */ -/* {{{ proto bool enchant_broker_set_ordering(resource broker, string tag, string ordering) - Declares a preference of dictionaries to use for the language +/* {{{ Declares a preference of dictionaries to use for the language described/referred to by 'tag'. The ordering is a comma delimited list of provider names. As a special exception, the "*" tag can be used as a language tag to declare a default ordering for any @@ -593,8 +578,7 @@ PHP_FUNCTION(enchant_broker_set_ordering) } /* }}} */ -/* {{{ proto array enchant_broker_describe(resource broker) - Enumerates the Enchant providers and tells you some rudimentary information about them. The same info is provided through phpinfo() */ +/* {{{ Enumerates the Enchant providers and tells you some rudimentary information about them. The same info is provided through phpinfo() */ PHP_FUNCTION(enchant_broker_describe) { EnchantBrokerDescribeFn describetozval = enumerate_providers_fn; @@ -612,8 +596,7 @@ PHP_FUNCTION(enchant_broker_describe) } /* }}} */ -/* {{{ proto bool enchant_dict_quick_check(resource dict, string word [, array &suggestions]) - If the word is correctly spelled return true, otherwise return false, if suggestions variable +/* {{{ If the word is correctly spelled return true, otherwise return false, if suggestions variable is provided, fill it with spelling alternatives. */ PHP_FUNCTION(enchant_dict_quick_check) { @@ -659,8 +642,7 @@ PHP_FUNCTION(enchant_dict_quick_check) } /* }}} */ -/* {{{ proto bool enchant_dict_check(resource dict, string word) - If the word is correctly spelled return true, otherwise return false */ +/* {{{ If the word is correctly spelled return true, otherwise return false */ PHP_FUNCTION(enchant_dict_check) { zval *dict; @@ -678,8 +660,7 @@ PHP_FUNCTION(enchant_dict_check) } /* }}} */ -/* {{{ proto array enchant_dict_suggest(resource dict, string word) - Will return a list of values if any of those pre-conditions are not met.*/ +/* {{{ Will return a list of values if any of those pre-conditions are not met.*/ PHP_FUNCTION(enchant_dict_suggest) { zval *dict; @@ -709,8 +690,7 @@ PHP_FUNCTION(enchant_dict_suggest) } /* }}} */ -/* {{{ proto void enchant_dict_add(resource dict, string word) - add 'word' to personal word list */ +/* {{{ add 'word' to personal word list */ PHP_FUNCTION(enchant_dict_add) { zval *dict; @@ -728,8 +708,7 @@ PHP_FUNCTION(enchant_dict_add) } /* }}} */ -/* {{{ proto void enchant_dict_add_to_session(resource dict, string word) - add 'word' to this spell-checking session */ +/* {{{ add 'word' to this spell-checking session */ PHP_FUNCTION(enchant_dict_add_to_session) { zval *dict; @@ -747,8 +726,7 @@ PHP_FUNCTION(enchant_dict_add_to_session) } /* }}} */ -/* {{{ proto bool enchant_dict_is_added(resource dict, string word) - whether or not 'word' exists in this spelling-session */ +/* {{{ whether or not 'word' exists in this spelling-session */ PHP_FUNCTION(enchant_dict_is_added) { zval *dict; @@ -766,8 +744,7 @@ PHP_FUNCTION(enchant_dict_is_added) } /* }}} */ -/* {{{ proto void enchant_dict_store_replacement(resource dict, string mis, string cor) - add a correction for 'mis' using 'cor'. +/* {{{ add a correction for 'mis' using 'cor'. Notes that you replaced @mis with @cor, so it's possibly more likely that future occurrences of @mis will be replaced with @cor. So it might bump @cor up in the suggestion list.*/ @@ -789,8 +766,7 @@ PHP_FUNCTION(enchant_dict_store_replacement) } /* }}} */ -/* {{{ proto string enchant_dict_get_error(resource dict) - Returns the last error of the current spelling-session */ +/* {{{ Returns the last error of the current spelling-session */ PHP_FUNCTION(enchant_dict_get_error) { zval *dict; @@ -812,8 +788,7 @@ PHP_FUNCTION(enchant_dict_get_error) } /* }}} */ -/* {{{ proto array enchant_dict_describe(resource dict) - Describes an individual dictionary 'dict' */ +/* {{{ Describes an individual dictionary 'dict' */ PHP_FUNCTION(enchant_dict_describe) { zval *dict; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index c1c6f45b94..ef0869e6ab 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -64,8 +64,7 @@ typedef unsigned char uchar; #define MAX_IFD_NESTING_LEVEL 150 -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(exif) { php_info_print_table_start(); @@ -103,8 +102,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif) ZEND_TSRMLS_CACHE_DEFINE() #endif -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ ZEND_INI_MH(OnUpdateEncode) { @@ -146,8 +144,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(exif) { #if defined(COMPILE_DL_EXIF) && defined(ZTS) @@ -163,8 +160,7 @@ static PHP_GINIT_FUNCTION(exif) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION(exif) - */ +/* {{{ PHP_MINIT_FUNCTION(exif) */ PHP_MINIT_FUNCTION(exif) { REGISTER_INI_ENTRIES(); @@ -177,8 +173,7 @@ PHP_MINIT_FUNCTION(exif) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(exif) { UNREGISTER_INI_ENTRIES(); @@ -198,8 +193,7 @@ static const zend_module_dep exif_module_deps[] = { }; /* }}} */ -/* {{{ exif_module_entry - */ +/* {{{ exif_module_entry */ zend_module_entry exif_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, exif_module_deps, @@ -236,8 +230,7 @@ static size_t php_strnlen(char* str, size_t maxlen) { } /* }}} */ -/* {{{ error messages -*/ +/* {{{ error messages */ static const char * EXIF_ERROR_FILEEOF = "Unexpected end of file reached"; static const char * EXIF_ERROR_CORRUPT = "File structure corrupted"; static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of file reached"; @@ -506,8 +499,7 @@ static char *exif_get_tagformat(int format) /* }}} */ -/* {{{ TabTable[] - */ +/* {{{ TabTable[] */ typedef const struct { unsigned short Tag; char *Desc; @@ -1752,8 +1744,7 @@ static size_t exif_convert_any_to_int(void *value, int format, int motorola_inte } /* }}} */ -/* {{{ struct image_info_value, image_info_list -*/ +/* {{{ struct image_info_value, image_info_list */ #ifndef WORD #define WORD unsigned short #endif @@ -2023,8 +2014,7 @@ static void exif_error_docref(const char *docref EXIFERR_DC, image_info_type *Im } /* }}} */ -/* {{{ jpeg_sof_info - */ +/* {{{ jpeg_sof_info */ typedef struct { int bits_per_sample; size_t width; @@ -2752,8 +2742,7 @@ static char * exif_get_markername(int marker) #endif /* }}} */ -/* {{{ proto string exif_tagname(int index) - Get headername for index or false if not defined */ +/* {{{ Get headername for index or false if not defined */ PHP_FUNCTION(exif_tagname) { zend_long tag; @@ -4341,8 +4330,7 @@ static bool exif_discard_imageinfo(image_info_type *ImageInfo) } /* }}} */ -/* {{{ exif_read_from_impl - */ +/* {{{ exif_read_from_impl */ static bool exif_read_from_impl(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all) { bool ret; @@ -4404,8 +4392,7 @@ static bool exif_read_from_impl(image_info_type *ImageInfo, php_stream *stream, } /* }}} */ -/* {{{ exif_read_from_stream - */ +/* {{{ exif_read_from_stream */ static bool exif_read_from_stream(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all) { bool ret; @@ -4425,8 +4412,7 @@ static bool exif_read_from_stream(image_info_type *ImageInfo, php_stream *stream } /* }}} */ -/* {{{ exif_read_from_file - */ +/* {{{ exif_read_from_file */ static bool exif_read_from_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all) { bool ret; @@ -4450,8 +4436,7 @@ static bool exif_read_from_file(image_info_type *ImageInfo, char *FileName, int } /* }}} */ -/* {{{ proto array exif_read_data(mixed stream [, string sections_needed [, bool sub_arrays[, bool read_thumbnail]]]) - Reads header data from an image and optionally reads the internal thumbnails */ +/* {{{ Reads header data from an image and optionally reads the internal thumbnails */ PHP_FUNCTION(exif_read_data) { zend_string *z_sections_needed = NULL; @@ -4654,8 +4639,7 @@ PHP_FUNCTION(exif_read_data) } /* }}} */ -/* {{{ proto string exif_thumbnail(string filename [, &width, &height [, &imagetype]]) - Reads the embedded thumbnail */ +/* {{{ Reads the embedded thumbnail */ PHP_FUNCTION(exif_thumbnail) { bool ret; @@ -4738,8 +4722,7 @@ PHP_FUNCTION(exif_thumbnail) } /* }}} */ -/* {{{ proto int exif_imagetype(string imagefile) - Get the type of an image */ +/* {{{ Get the type of an image */ PHP_FUNCTION(exif_imagetype) { char *imagefile; diff --git a/ext/ext_skel.php b/ext/ext_skel.php index e456714882..8a3cf76e29 100755 --- a/ext/ext_skel.php +++ b/ext/ext_skel.php @@ -18,16 +18,14 @@ /* $Id$ */ -/* {{{ error - */ +/* {{{ error */ function error($message) { printf('Error: %s%s', $message, PHP_EOL); exit; } /* }}} */ -/* {{{ print_help - */ +/* {{{ print_help */ function print_help() { if (PHP_OS_FAMILY != 'Windows') { $file_prefix = './'; @@ -118,8 +116,7 @@ HELP; } /* }}} */ -/* {{{ task - */ +/* {{{ task */ function task($label, $callback) { printf('%s... ', $label); @@ -129,8 +126,7 @@ function task($label, $callback) { } /* }}} */ -/* {{{ print_success - */ +/* {{{ print_success */ function print_success() { global $options; @@ -154,8 +150,7 @@ function print_success() { } /* }}} */ -/* {{{ process_args - */ +/* {{{ process_args */ function process_args($argv, $argc) { $options = [ 'unix' => true, @@ -237,8 +232,7 @@ function process_args($argv, $argc) { } /* }}} */ -/* {{{ process_source_tags - */ +/* {{{ process_source_tags */ function process_source_tags($file, $short_name) { global $options; @@ -294,8 +288,7 @@ HEADER; } /* }}} */ -/* {{{ copy_config_scripts - */ +/* {{{ copy_config_scripts */ function copy_config_scripts() { global $options; @@ -323,8 +316,7 @@ function copy_config_scripts() { } /* }}} */ -/* {{{ copy_sources - */ +/* {{{ copy_sources */ function copy_sources() { global $options; @@ -345,8 +337,7 @@ function copy_sources() { } /* }}} */ -/* {{{ copy_tests - */ +/* {{{ copy_tests */ function copy_tests() { global $options; diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index c06597283b..60e4679f29 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -4861,8 +4861,7 @@ static int zend_ffi_preload(char *preload) /* {{{ */ } /* }}} */ -/* {{{ ZEND_MINIT_FUNCTION - */ +/* {{{ ZEND_MINIT_FUNCTION */ ZEND_MINIT_FUNCTION(ffi) { zend_class_entry ce; @@ -5033,8 +5032,7 @@ ZEND_MINIT_FUNCTION(ffi) } /* }}} */ -/* {{{ ZEND_RSHUTDOWN_FUNCTION - */ +/* {{{ ZEND_RSHUTDOWN_FUNCTION */ ZEND_RSHUTDOWN_FUNCTION(ffi) { if (FFI_G(callbacks)) { @@ -5054,8 +5052,7 @@ ZEND_RSHUTDOWN_FUNCTION(ffi) } /* }}} */ -/* {{{ ZEND_MINFO_FUNCTION - */ +/* {{{ ZEND_MINFO_FUNCTION */ ZEND_MINFO_FUNCTION(ffi) { php_info_print_table_start(); @@ -5130,8 +5127,7 @@ const struct { {"__gnuc_va_list", &zend_ffi_type_ptr}, }; -/* {{{ ZEND_GINIT_FUNCTION - */ +/* {{{ ZEND_GINIT_FUNCTION */ static ZEND_GINIT_FUNCTION(ffi) { size_t i; @@ -5147,8 +5143,7 @@ static ZEND_GINIT_FUNCTION(ffi) } /* }}} */ -/* {{{ ZEND_GINIT_FUNCTION - */ +/* {{{ ZEND_GINIT_FUNCTION */ static ZEND_GSHUTDOWN_FUNCTION(ffi) { if (ffi_globals->scopes) { @@ -5159,8 +5154,7 @@ static ZEND_GSHUTDOWN_FUNCTION(ffi) } /* }}} */ -/* {{{ ffi_module_entry - */ +/* {{{ ffi_module_entry */ zend_module_entry ffi_module_entry = { STANDARD_MODULE_HEADER, "FFI", /* Extension name */ diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 6fbae85f4e..014c37441a 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -76,8 +76,7 @@ static inline finfo_object *php_finfo_fetch_object(zend_object *obj) { } \ } -/* {{{ finfo_objects_free - */ +/* {{{ finfo_objects_free */ static void finfo_objects_free(zend_object *object) { finfo_object *intern = php_finfo_fetch_object(object); @@ -91,8 +90,7 @@ static void finfo_objects_free(zend_object *object) } /* }}} */ -/* {{{ finfo_objects_new - */ +/* {{{ finfo_objects_new */ PHP_FILEINFO_API zend_object *finfo_objects_new(zend_class_entry *class_type) { finfo_object *intern; @@ -129,8 +127,7 @@ void finfo_resource_destructor(zend_resource *rsrc) /* {{{ */ } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(finfo) { zend_class_entry _finfo_class_entry; @@ -169,8 +166,7 @@ PHP_MINIT_FUNCTION(finfo) } /* }}} */ -/* {{{ fileinfo_module_entry - */ +/* {{{ fileinfo_module_entry */ zend_module_entry fileinfo_module_entry = { STANDARD_MODULE_HEADER, "fileinfo", @@ -189,8 +185,7 @@ zend_module_entry fileinfo_module_entry = { ZEND_GET_MODULE(fileinfo) #endif -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(fileinfo) { char magic_ver[5]; @@ -205,8 +200,7 @@ PHP_MINFO_FUNCTION(fileinfo) } /* }}} */ -/* {{{ proto resource finfo_open([int options [, string arg]]) - Create a new fileinfo resource. */ +/* {{{ Create a new fileinfo resource. */ PHP_FUNCTION(finfo_open) { zend_long options = MAGIC_NONE; @@ -297,8 +291,7 @@ PHP_FUNCTION(finfo_open) } /* }}} */ -/* {{{ proto resource finfo_close(resource finfo) - Close fileinfo resource. */ +/* {{{ Close fileinfo resource. */ PHP_FUNCTION(finfo_close) { php_fileinfo *finfo; @@ -318,8 +311,7 @@ PHP_FUNCTION(finfo_close) } /* }}} */ -/* {{{ proto bool finfo_set_flags(resource finfo, int options) - Set libmagic configuration options. */ +/* {{{ Set libmagic configuration options. */ PHP_FUNCTION(finfo_set_flags) { zend_long options; @@ -518,24 +510,21 @@ clean: } /* }}} */ -/* {{{ proto string finfo_file(resource finfo, char *file_name [, int options [, resource context]]) - Return information about a file. */ +/* {{{ Return information about a file. */ PHP_FUNCTION(finfo_file) { _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_FILE, 0); } /* }}} */ -/* {{{ proto string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - Return information about a string buffer. */ +/* {{{ Return information about a string buffer. */ PHP_FUNCTION(finfo_buffer) { _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_BUFFER, 0); } /* }}} */ -/* {{{ proto string mime_content_type(string filename|resource stream) - Return content-type for file */ +/* {{{ Return content-type for file */ PHP_FUNCTION(mime_content_type) { _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1, 1); diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 0e01c30097..d049c34c4f 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -78,8 +78,7 @@ static const filter_list_entry filter_list[] = { static unsigned int php_sapi_filter(int arg, const char *var, char **val, size_t val_len, size_t *new_val_len); static unsigned int php_sapi_filter_init(void); -/* {{{ filter_module_entry - */ +/* {{{ filter_module_entry */ zend_module_entry filter_module_entry = { STANDARD_MODULE_HEADER, "filter", @@ -117,8 +116,7 @@ static PHP_INI_MH(UpdateDefaultFilter) /* {{{ */ } /* }}} */ -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ static PHP_INI_MH(OnUpdateFlags) { if (!new_value) { @@ -154,8 +152,7 @@ ZEND_TSRMLS_CACHE_UPDATE(); #define PARSE_REQUEST 99 -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(filter) { ZEND_INIT_MODULE_GLOBALS(filter, php_filter_init_globals, NULL); @@ -237,8 +234,7 @@ PHP_MINIT_FUNCTION(filter) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(filter) { UNREGISTER_INI_ENTRIES(); @@ -247,8 +243,7 @@ PHP_MSHUTDOWN_FUNCTION(filter) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ #define VAR_ARRAY_COPY_DTOR(a) \ if (!Z_ISUNDEF(IF_G(a))) { \ zval_ptr_dtor(&IF_G(a)); \ @@ -269,8 +264,7 @@ PHP_RSHUTDOWN_FUNCTION(filter) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(filter) { php_info_print_table_start(); @@ -506,9 +500,7 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */ } /* }}} */ -/* {{{ proto mixed filter_has_var(constant type, string variable_name) - * Returns true if the variable with the name 'name' exists in source. - */ +/* {{{ Returns true if the variable with the name 'name' exists in source. */ PHP_FUNCTION(filter_has_var) { zend_long arg; @@ -649,9 +641,7 @@ static void php_filter_array_handler(zval *input, zval *op, zval *return_value, } /* }}} */ -/* {{{ proto mixed filter_input(constant type, string variable_name [, int filter [, mixed options]]) - * Returns the filtered variable 'name'* from source `type`. - */ +/* {{{ Returns the filtered variable 'name'* from source `type`. */ PHP_FUNCTION(filter_input) { zend_long fetch_from, filter = FILTER_DEFAULT; @@ -705,9 +695,7 @@ PHP_FUNCTION(filter_input) } /* }}} */ -/* {{{ proto mixed filter_var(mixed variable [, int filter [, mixed options]]) - * Returns the filtered version of the variable. - */ +/* {{{ Returns the filtered version of the variable. */ PHP_FUNCTION(filter_var) { zend_long filter = FILTER_DEFAULT; @@ -727,9 +715,7 @@ PHP_FUNCTION(filter_var) } /* }}} */ -/* {{{ proto mixed filter_input_array(constant type, [, mixed options [, bool add_empty]]]) - * Returns an array with all arguments defined in 'definition'. - */ +/* {{{ Returns an array with all arguments defined in 'definition'. */ PHP_FUNCTION(filter_input_array) { zend_long fetch_from; @@ -773,9 +759,7 @@ PHP_FUNCTION(filter_input_array) } /* }}} */ -/* {{{ proto mixed filter_var_array(array data, [, mixed options [, bool add_empty]]]) - * Returns an array with all arguments defined in 'definition'. - */ +/* {{{ Returns an array with all arguments defined in 'definition'. */ PHP_FUNCTION(filter_var_array) { zval *array_input = NULL, *op = NULL; @@ -793,8 +777,7 @@ PHP_FUNCTION(filter_var_array) } /* }}} */ -/* {{{ proto filter_list() - * Returns a list of all supported filters */ +/* {{{ Returns a list of all supported filters */ PHP_FUNCTION(filter_list) { int i, size = sizeof(filter_list) / sizeof(filter_list_entry); @@ -810,8 +793,7 @@ PHP_FUNCTION(filter_list) } /* }}} */ -/* {{{ proto filter_id(string filtername) - * Returns the filter ID belonging to a named filter */ +/* {{{ Returns the filter ID belonging to a named filter */ PHP_FUNCTION(filter_id) { int i; diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 5d41f063f8..3defd3d506 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -109,8 +109,7 @@ union ipbox { unsigned char c[8]; }; -/* {{{ ftp_open - */ +/* {{{ ftp_open */ ftpbuf_t* ftp_open(const char *host, short port, zend_long timeout_sec) { @@ -158,8 +157,7 @@ bail: } /* }}} */ -/* {{{ ftp_close - */ +/* {{{ ftp_close */ ftpbuf_t* ftp_close(ftpbuf_t *ftp) { @@ -186,8 +184,7 @@ ftp_close(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_gc - */ +/* {{{ ftp_gc */ void ftp_gc(ftpbuf_t *ftp) { @@ -205,8 +202,7 @@ ftp_gc(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_quit - */ +/* {{{ ftp_quit */ int ftp_quit(ftpbuf_t *ftp) { @@ -230,8 +226,7 @@ ftp_quit(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_login - */ +/* {{{ ftp_login */ int ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pass, const size_t pass_len) { @@ -379,8 +374,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa } /* }}} */ -/* {{{ ftp_reinit - */ +/* {{{ ftp_reinit */ int ftp_reinit(ftpbuf_t *ftp) { @@ -403,8 +397,7 @@ ftp_reinit(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_syst - */ +/* {{{ ftp_syst */ const char* ftp_syst(ftpbuf_t *ftp) { @@ -439,8 +432,7 @@ ftp_syst(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_pwd - */ +/* {{{ ftp_pwd */ const char* ftp_pwd(ftpbuf_t *ftp) { @@ -473,8 +465,7 @@ ftp_pwd(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_exec - */ +/* {{{ ftp_exec */ int ftp_exec(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) { @@ -492,8 +483,7 @@ ftp_exec(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) } /* }}} */ -/* {{{ ftp_raw - */ +/* {{{ ftp_raw */ void ftp_raw(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, zval *return_value) { @@ -513,8 +503,7 @@ ftp_raw(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, zval *return_value } /* }}} */ -/* {{{ ftp_chdir - */ +/* {{{ ftp_chdir */ int ftp_chdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) { @@ -537,8 +526,7 @@ ftp_chdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) } /* }}} */ -/* {{{ ftp_cdup - */ +/* {{{ ftp_cdup */ int ftp_cdup(ftpbuf_t *ftp) { @@ -561,8 +549,7 @@ ftp_cdup(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_mkdir - */ +/* {{{ ftp_mkdir */ zend_string* ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) { @@ -593,8 +580,7 @@ ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) } /* }}} */ -/* {{{ ftp_rmdir - */ +/* {{{ ftp_rmdir */ int ftp_rmdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) { @@ -611,8 +597,7 @@ ftp_rmdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) } /* }}} */ -/* {{{ ftp_chmod - */ +/* {{{ ftp_chmod */ int ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len) { @@ -644,8 +629,7 @@ ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filenam } /* }}} */ -/* {{{ ftp_alloc - */ +/* {{{ ftp_alloc */ int ftp_alloc(ftpbuf_t *ftp, const zend_long size, zend_string **response) { @@ -682,8 +666,7 @@ ftp_alloc(ftpbuf_t *ftp, const zend_long size, zend_string **response) } /* }}} */ -/* {{{ ftp_nlist - */ +/* {{{ ftp_nlist */ char** ftp_nlist(ftpbuf_t *ftp, const char *path, const size_t path_len) { @@ -691,8 +674,7 @@ ftp_nlist(ftpbuf_t *ftp, const char *path, const size_t path_len) } /* }}} */ -/* {{{ ftp_list - */ +/* {{{ ftp_list */ char** ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive) { @@ -700,8 +682,7 @@ ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive) } /* }}} */ -/* {{{ ftp_mlsd - */ +/* {{{ ftp_mlsd */ char** ftp_mlsd(ftpbuf_t *ftp, const char *path, const size_t path_len) { @@ -709,8 +690,7 @@ ftp_mlsd(ftpbuf_t *ftp, const char *path, const size_t path_len) } /* }}} */ -/* {{{ ftp_mlsd_parse_line - */ +/* {{{ ftp_mlsd_parse_line */ int ftp_mlsd_parse_line(HashTable *ht, const char *input) { @@ -754,8 +734,7 @@ ftp_mlsd_parse_line(HashTable *ht, const char *input) { } /* }}} */ -/* {{{ ftp_type - */ +/* {{{ ftp_type */ int ftp_type(ftpbuf_t *ftp, ftptype_t type) { @@ -786,8 +765,7 @@ ftp_type(ftpbuf_t *ftp, ftptype_t type) } /* }}} */ -/* {{{ ftp_pasv - */ +/* {{{ ftp_pasv */ int ftp_pasv(ftpbuf_t *ftp, int pasv) { @@ -880,8 +858,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv) } /* }}} */ -/* {{{ ftp_get - */ +/* {{{ ftp_get */ int ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos) { @@ -976,8 +953,7 @@ bail: } /* }}} */ -/* {{{ ftp_put - */ +/* {{{ ftp_put */ int ftp_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos) { @@ -1059,8 +1035,7 @@ bail: /* }}} */ -/* {{{ ftp_append - */ +/* {{{ ftp_append */ int ftp_append(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type) { @@ -1126,8 +1101,7 @@ bail: } /* }}} */ -/* {{{ ftp_size - */ +/* {{{ ftp_size */ zend_long ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len) { @@ -1150,8 +1124,7 @@ ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len) } /* }}} */ -/* {{{ ftp_mdtm - */ +/* {{{ ftp_mdtm */ time_t ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len) { @@ -1198,8 +1171,7 @@ ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len) } /* }}} */ -/* {{{ ftp_delete - */ +/* {{{ ftp_delete */ int ftp_delete(ftpbuf_t *ftp, const char *path, const size_t path_len) { @@ -1217,8 +1189,7 @@ ftp_delete(ftpbuf_t *ftp, const char *path, const size_t path_len) } /* }}} */ -/* {{{ ftp_rename - */ +/* {{{ ftp_rename */ int ftp_rename(ftpbuf_t *ftp, const char *src, const size_t src_len, const char *dest, const size_t dest_len) { @@ -1241,8 +1212,7 @@ ftp_rename(ftpbuf_t *ftp, const char *src, const size_t src_len, const char *des } /* }}} */ -/* {{{ ftp_site - */ +/* {{{ ftp_site */ int ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) { @@ -1262,8 +1232,7 @@ ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) /* static functions */ -/* {{{ ftp_putcmd - */ +/* {{{ ftp_putcmd */ int ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *args, const size_t args_len) { @@ -1303,8 +1272,7 @@ ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *arg } /* }}} */ -/* {{{ ftp_readline - */ +/* {{{ ftp_readline */ int ftp_readline(ftpbuf_t *ftp) { @@ -1355,8 +1323,7 @@ ftp_readline(ftpbuf_t *ftp) } /* }}} */ -/* {{{ ftp_getresp - */ +/* {{{ ftp_getresp */ int ftp_getresp(ftpbuf_t *ftp) { @@ -1451,8 +1418,7 @@ int single_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t size) { #endif } -/* {{{ my_send - */ +/* {{{ my_send */ int my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) { @@ -1489,8 +1455,7 @@ my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) } /* }}} */ -/* {{{ my_recv - */ +/* {{{ my_recv */ int my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) { @@ -1570,8 +1535,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) } /* }}} */ -/* {{{ data_available - */ +/* {{{ data_available */ int data_available(ftpbuf_t *ftp, php_socket_t s) { @@ -1594,8 +1558,7 @@ data_available(ftpbuf_t *ftp, php_socket_t s) return 1; } /* }}} */ -/* {{{ data_writeable - */ +/* {{{ data_writeable */ int data_writeable(ftpbuf_t *ftp, php_socket_t s) { @@ -1619,8 +1582,7 @@ data_writeable(ftpbuf_t *ftp, php_socket_t s) } /* }}} */ -/* {{{ my_accept - */ +/* {{{ my_accept */ int my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrlen) { @@ -1644,8 +1606,7 @@ my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrl } /* }}} */ -/* {{{ ftp_getdata - */ +/* {{{ ftp_getdata */ databuf_t* ftp_getdata(ftpbuf_t *ftp) { @@ -1775,8 +1736,7 @@ bail: } /* }}} */ -/* {{{ data_accept - */ +/* {{{ data_accept */ databuf_t* data_accept(databuf_t *data, ftpbuf_t *ftp) { @@ -1888,8 +1848,7 @@ data_accepted: } /* }}} */ -/* {{{ ftp_ssl_shutdown - */ +/* {{{ ftp_ssl_shutdown */ #ifdef HAVE_FTP_SSL static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) { /* In TLS 1.3 it's common to receive session tickets after the handshake has completed. We need to train @@ -1946,8 +1905,7 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) { #endif /* }}} */ -/* {{{ data_close - */ +/* {{{ data_close */ databuf_t* data_close(ftpbuf_t *ftp, databuf_t *data) { @@ -1982,8 +1940,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data) } /* }}} */ -/* {{{ ftp_genlist - */ +/* {{{ ftp_genlist */ char** ftp_genlist(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *path, const size_t path_len) { @@ -2087,8 +2044,7 @@ bail: } /* }}} */ -/* {{{ ftp_nb_get - */ +/* {{{ ftp_nb_get */ int ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos) { @@ -2145,8 +2101,7 @@ bail: } /* }}} */ -/* {{{ ftp_nb_continue_read - */ +/* {{{ ftp_nb_continue_read */ int ftp_nb_continue_read(ftpbuf_t *ftp) { @@ -2208,8 +2163,7 @@ bail: } /* }}} */ -/* {{{ ftp_nb_put - */ +/* {{{ ftp_nb_put */ int ftp_nb_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos) { @@ -2262,8 +2216,7 @@ bail: /* }}} */ -/* {{{ ftp_nb_continue_write - */ +/* {{{ ftp_nb_continue_write */ int ftp_nb_continue_write(ftpbuf_t *ftp) { diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index a5e5f50485..2da4769aa5 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -112,8 +112,7 @@ PHP_MINFO_FUNCTION(ftp) } -/* {{{ proto resource ftp_connect(string host [, int port [, int timeout]]) - Opens a FTP stream */ +/* {{{ Opens a FTP stream */ PHP_FUNCTION(ftp_connect) { ftpbuf_t *ftp; @@ -149,8 +148,7 @@ PHP_FUNCTION(ftp_connect) /* }}} */ #ifdef HAVE_FTP_SSL -/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout]]) - Opens a FTP-SSL stream */ +/* {{{ Opens a FTP-SSL stream */ PHP_FUNCTION(ftp_ssl_connect) { ftpbuf_t *ftp; @@ -184,8 +182,7 @@ PHP_FUNCTION(ftp_ssl_connect) /* }}} */ #endif -/* {{{ proto bool ftp_login(resource stream, string username, string password) - Logs into the FTP server */ +/* {{{ Logs into the FTP server */ PHP_FUNCTION(ftp_login) { zval *z_ftp; @@ -211,8 +208,7 @@ PHP_FUNCTION(ftp_login) } /* }}} */ -/* {{{ proto string ftp_pwd(resource stream) - Returns the present working directory */ +/* {{{ Returns the present working directory */ PHP_FUNCTION(ftp_pwd) { zval *z_ftp; @@ -236,8 +232,7 @@ PHP_FUNCTION(ftp_pwd) } /* }}} */ -/* {{{ proto bool ftp_cdup(resource stream) - Changes to the parent directory */ +/* {{{ Changes to the parent directory */ PHP_FUNCTION(ftp_cdup) { zval *z_ftp; @@ -260,8 +255,7 @@ PHP_FUNCTION(ftp_cdup) } /* }}} */ -/* {{{ proto bool ftp_chdir(resource stream, string directory) - Changes directories */ +/* {{{ Changes directories */ PHP_FUNCTION(ftp_chdir) { zval *z_ftp; @@ -287,8 +281,7 @@ PHP_FUNCTION(ftp_chdir) } /* }}} */ -/* {{{ proto bool ftp_exec(resource stream, string command) - Requests execution of a program on the FTP server */ +/* {{{ Requests execution of a program on the FTP server */ PHP_FUNCTION(ftp_exec) { zval *z_ftp; @@ -314,8 +307,7 @@ PHP_FUNCTION(ftp_exec) } /* }}} */ -/* {{{ proto array ftp_raw(resource stream, string command) - Sends a literal command to the FTP server */ +/* {{{ Sends a literal command to the FTP server */ PHP_FUNCTION(ftp_raw) { zval *z_ftp; @@ -336,8 +328,7 @@ PHP_FUNCTION(ftp_raw) } /* }}} */ -/* {{{ proto string ftp_mkdir(resource stream, string directory) - Creates a directory and returns the absolute path for the new directory or false on error */ +/* {{{ Creates a directory and returns the absolute path for the new directory or false on error */ PHP_FUNCTION(ftp_mkdir) { zval *z_ftp; @@ -364,8 +355,7 @@ PHP_FUNCTION(ftp_mkdir) } /* }}} */ -/* {{{ proto bool ftp_rmdir(resource stream, string directory) - Removes a directory */ +/* {{{ Removes a directory */ PHP_FUNCTION(ftp_rmdir) { zval *z_ftp; @@ -391,8 +381,7 @@ PHP_FUNCTION(ftp_rmdir) } /* }}} */ -/* {{{ proto int ftp_chmod(resource stream, int mode, string filename) - Sets permissions on a file */ +/* {{{ Sets permissions on a file */ PHP_FUNCTION(ftp_chmod) { zval *z_ftp; @@ -418,8 +407,7 @@ PHP_FUNCTION(ftp_chmod) } /* }}} */ -/* {{{ proto bool ftp_alloc(resource stream, int size[, &response]) - Attempt to allocate space on the remote FTP server */ +/* {{{ Attempt to allocate space on the remote FTP server */ PHP_FUNCTION(ftp_alloc) { zval *z_ftp, *zresponse = NULL; @@ -449,8 +437,7 @@ PHP_FUNCTION(ftp_alloc) } /* }}} */ -/* {{{ proto array ftp_nlist(resource stream, string directory) - Returns an array of filenames in the given directory */ +/* {{{ Returns an array of filenames in the given directory */ PHP_FUNCTION(ftp_nlist) { zval *z_ftp; @@ -479,8 +466,7 @@ PHP_FUNCTION(ftp_nlist) } /* }}} */ -/* {{{ proto array ftp_rawlist(resource stream, string directory [, bool recursive]) - Returns a detailed listing of a directory as an array of output lines */ +/* {{{ Returns a detailed listing of a directory as an array of output lines */ PHP_FUNCTION(ftp_rawlist) { zval *z_ftp; @@ -510,8 +496,7 @@ PHP_FUNCTION(ftp_rawlist) } /* }}} */ -/* {{{ proto array ftp_mlsd(resource stream, string directory) - Returns a detailed listing of a directory as an array of parsed output lines */ +/* {{{ Returns a detailed listing of a directory as an array of parsed output lines */ PHP_FUNCTION(ftp_mlsd) { zval *z_ftp; @@ -547,8 +532,7 @@ PHP_FUNCTION(ftp_mlsd) } /* }}} */ -/* {{{ proto string ftp_systype(resource stream) - Returns the system type identifier */ +/* {{{ Returns the system type identifier */ PHP_FUNCTION(ftp_systype) { zval *z_ftp; @@ -572,8 +556,7 @@ PHP_FUNCTION(ftp_systype) } /* }}} */ -/* {{{ proto bool ftp_fget(resource stream, resource fp, string remote_file, [, int mode [, int resumepos]]) - Retrieves a file from the FTP server and writes it to an open file */ +/* {{{ Retrieves a file from the FTP server and writes it to an open file */ PHP_FUNCTION(ftp_fget) { zval *z_ftp, *z_file; @@ -618,8 +601,7 @@ PHP_FUNCTION(ftp_fget) } /* }}} */ -/* {{{ proto int ftp_nb_fget(resource stream, resource fp, string remote_file [, int mode [, int resumepos]]) - Retrieves a file from the FTP server asynchronly and writes it to an open file */ +/* {{{ Retrieves a file from the FTP server asynchronly and writes it to an open file */ PHP_FUNCTION(ftp_nb_fget) { zval *z_ftp, *z_file; @@ -668,8 +650,7 @@ PHP_FUNCTION(ftp_nb_fget) } /* }}} */ -/* {{{ proto bool ftp_pasv(resource stream, bool pasv) - Turns passive mode on or off */ +/* {{{ Turns passive mode on or off */ PHP_FUNCTION(ftp_pasv) { zval *z_ftp; @@ -692,8 +673,7 @@ PHP_FUNCTION(ftp_pasv) } /* }}} */ -/* {{{ proto bool ftp_get(resource stream, string local_file, string remote_file [, int mode [, int resume_pos]]) - Retrieves a file from the FTP server and writes it to a local file */ +/* {{{ Retrieves a file from the FTP server and writes it to a local file */ PHP_FUNCTION(ftp_get) { zval *z_ftp; @@ -757,8 +737,7 @@ PHP_FUNCTION(ftp_get) } /* }}} */ -/* {{{ proto int ftp_nb_get(resource stream, string local_file, string remote_file, [, int mode [, int resume_pos]]) - Retrieves a file from the FTP server nbhronly and writes it to a local file */ +/* {{{ Retrieves a file from the FTP server nbhronly and writes it to a local file */ PHP_FUNCTION(ftp_nb_get) { zval *z_ftp; @@ -830,8 +809,7 @@ PHP_FUNCTION(ftp_nb_get) } /* }}} */ -/* {{{ proto int ftp_nb_continue(resource stream) - Continues retrieving/sending a file nbronously */ +/* {{{ Continues retrieving/sending a file nbronously */ PHP_FUNCTION(ftp_nb_continue) { zval *z_ftp; @@ -870,8 +848,7 @@ PHP_FUNCTION(ftp_nb_continue) } /* }}} */ -/* {{{ proto bool ftp_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]]) - Stores a file from an open file to the FTP server */ +/* {{{ Stores a file from an open file to the FTP server */ PHP_FUNCTION(ftp_fput) { zval *z_ftp, *z_file; @@ -919,8 +896,7 @@ PHP_FUNCTION(ftp_fput) } /* }}} */ -/* {{{ proto int ftp_nb_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]]) - Stores a file from an open file to the FTP server nbronly */ +/* {{{ Stores a file from an open file to the FTP server nbronly */ PHP_FUNCTION(ftp_nb_fput) { zval *z_ftp, *z_file; @@ -974,8 +950,7 @@ PHP_FUNCTION(ftp_nb_fput) /* }}} */ -/* {{{ proto bool ftp_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]]) - Stores a file on the FTP server */ +/* {{{ Stores a file on the FTP server */ PHP_FUNCTION(ftp_put) { zval *z_ftp; @@ -1028,8 +1003,7 @@ PHP_FUNCTION(ftp_put) } /* }}} */ -/* {{{ proto bool ftp_append(resource stream, string remote_file, string local_file [, int mode]) - Append content of a file a another file on the FTP server */ +/* {{{ Append content of a file a another file on the FTP server */ PHP_FUNCTION(ftp_append) { zval *z_ftp; @@ -1064,8 +1038,7 @@ PHP_FUNCTION(ftp_append) } /* }}} */ -/* {{{ proto int ftp_nb_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]]) - Stores a file on the FTP server */ +/* {{{ Stores a file on the FTP server */ PHP_FUNCTION(ftp_nb_put) { zval *z_ftp; @@ -1126,8 +1099,7 @@ PHP_FUNCTION(ftp_nb_put) } /* }}} */ -/* {{{ proto int ftp_size(resource stream, string filename) - Returns the size of the file, or -1 on error */ +/* {{{ Returns the size of the file, or -1 on error */ PHP_FUNCTION(ftp_size) { zval *z_ftp; @@ -1148,8 +1120,7 @@ PHP_FUNCTION(ftp_size) } /* }}} */ -/* {{{ proto int ftp_mdtm(resource stream, string filename) - Returns the last modification time of the file, or -1 on error */ +/* {{{ Returns the last modification time of the file, or -1 on error */ PHP_FUNCTION(ftp_mdtm) { zval *z_ftp; @@ -1170,8 +1141,7 @@ PHP_FUNCTION(ftp_mdtm) } /* }}} */ -/* {{{ proto bool ftp_rename(resource stream, string src, string dest) - Renames the given file to a new path */ +/* {{{ Renames the given file to a new path */ PHP_FUNCTION(ftp_rename) { zval *z_ftp; @@ -1197,8 +1167,7 @@ PHP_FUNCTION(ftp_rename) } /* }}} */ -/* {{{ proto bool ftp_delete(resource stream, string file) - Deletes a file */ +/* {{{ Deletes a file */ PHP_FUNCTION(ftp_delete) { zval *z_ftp; @@ -1224,8 +1193,7 @@ PHP_FUNCTION(ftp_delete) } /* }}} */ -/* {{{ proto bool ftp_site(resource stream, string cmd) - Sends a SITE command to the server */ +/* {{{ Sends a SITE command to the server */ PHP_FUNCTION(ftp_site) { zval *z_ftp; @@ -1251,8 +1219,7 @@ PHP_FUNCTION(ftp_site) } /* }}} */ -/* {{{ proto bool ftp_close(resource stream) - Closes the FTP stream */ +/* {{{ Closes the FTP stream */ PHP_FUNCTION(ftp_close) { zval *z_ftp; @@ -1272,8 +1239,7 @@ PHP_FUNCTION(ftp_close) } /* }}} */ -/* {{{ proto bool ftp_set_option(resource stream, int option, mixed value) - Sets an FTP option */ +/* {{{ Sets an FTP option */ PHP_FUNCTION(ftp_set_option) { zval *z_ftp, *z_value; @@ -1328,8 +1294,7 @@ PHP_FUNCTION(ftp_set_option) } /* }}} */ -/* {{{ proto mixed ftp_get_option(resource stream, int option) - Gets an FTP option */ +/* {{{ Gets an FTP option */ PHP_FUNCTION(ftp_get_option) { zval *z_ftp; diff --git a/ext/gd/gd.c b/ext/gd/gd.c index d915398c7b..7d415137bd 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -266,8 +266,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ php_free_gd_font - */ +/* {{{ php_free_gd_font */ static void php_free_gd_font(zend_resource *rsrc) { gdFontPtr fp = (gdFontPtr) rsrc->ptr; @@ -280,8 +279,7 @@ static void php_free_gd_font(zend_resource *rsrc) } /* }}} */ -/* {{{ php_gd_error_method - */ +/* {{{ php_gd_error_method */ void php_gd_error_method(int type, const char *format, va_list args) { switch (type) { @@ -302,8 +300,7 @@ void php_gd_error_method(int type, const char *format, va_list args) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(gd) { le_gd_font = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number); @@ -444,8 +441,7 @@ PHP_MINIT_FUNCTION(gd) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(gd) { #if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED) @@ -456,8 +452,7 @@ PHP_MSHUTDOWN_FUNCTION(gd) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(gd) { #ifdef HAVE_GD_FREETYPE @@ -473,8 +468,7 @@ PHP_RSHUTDOWN_FUNCTION(gd) # define PHP_GD_VERSION_STRING GD_VERSION_STRING #endif -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(gd) { php_info_print_table_start(); @@ -557,8 +551,7 @@ PHP_MINFO_FUNCTION(gd) } /* }}} */ -/* {{{ proto array gd_info() - */ +/* {{{ */ PHP_FUNCTION(gd_info) { if (zend_parse_parameters_none() == FAILURE) { @@ -619,8 +612,7 @@ PHP_FUNCTION(gd_info) #define FLIPWORD(a) (((a & 0xff000000) >> 24) | ((a & 0x00ff0000) >> 8) | ((a & 0x0000ff00) << 8) | ((a & 0x000000ff) << 24)) -/* {{{ proto int imageloadfont(string filename) - Load a new font */ +/* {{{ Load a new font */ PHP_FUNCTION(imageloadfont) { zval *ind; @@ -723,8 +715,7 @@ PHP_FUNCTION(imageloadfont) } /* }}} */ -/* {{{ proto bool imagesetstyle(resource im, array styles) - Set the line drawing styles for use with imageline and IMG_COLOR_STYLED. */ +/* {{{ Set the line drawing styles for use with imageline and IMG_COLOR_STYLED. */ PHP_FUNCTION(imagesetstyle) { zval *IM, *styles, *item; @@ -760,8 +751,7 @@ PHP_FUNCTION(imagesetstyle) } /* }}} */ -/* {{{ proto resource imagecreatetruecolor(int x_size, int y_size) - Create a new true color image */ +/* {{{ Create a new true color image */ PHP_FUNCTION(imagecreatetruecolor) { zend_long x_size, y_size; @@ -791,8 +781,7 @@ PHP_FUNCTION(imagecreatetruecolor) } /* }}} */ -/* {{{ proto bool imageistruecolor(resource im) - return true if the image uses truecolor */ +/* {{{ return true if the image uses truecolor */ PHP_FUNCTION(imageistruecolor) { zval *IM; @@ -808,8 +797,7 @@ PHP_FUNCTION(imageistruecolor) } /* }}} */ -/* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted) - Convert a true color image to a palette based image with a number of colors, optionally using dithering. */ +/* {{{ Convert a true color image to a palette based image with a number of colors, optionally using dithering. */ PHP_FUNCTION(imagetruecolortopalette) { zval *IM; @@ -837,8 +825,7 @@ PHP_FUNCTION(imagetruecolortopalette) } /* }}} */ -/* {{{ proto void imagepalettetotruecolor(resource im) - Convert a palette based image to a true color image. */ +/* {{{ Convert a palette based image to a true color image. */ PHP_FUNCTION(imagepalettetotruecolor) { zval *IM; @@ -858,8 +845,7 @@ PHP_FUNCTION(imagepalettetotruecolor) } /* }}} */ -/* {{{ proto bool imagecolormatch(resource im1, resource im2) - Makes the colors of the palette version of an image more closely match the true color version */ +/* {{{ Makes the colors of the palette version of an image more closely match the true color version */ PHP_FUNCTION(imagecolormatch) { zval *IM1, *IM2; @@ -897,8 +883,7 @@ PHP_FUNCTION(imagecolormatch) } /* }}} */ -/* {{{ proto bool imagesetthickness(resource im, int thickness) - Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */ +/* {{{ Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */ PHP_FUNCTION(imagesetthickness) { zval *IM; @@ -917,8 +902,7 @@ PHP_FUNCTION(imagesetthickness) } /* }}} */ -/* {{{ proto bool imagefilledellipse(resource im, int cx, int cy, int w, int h, int color) - Draw an ellipse */ +/* {{{ Draw an ellipse */ PHP_FUNCTION(imagefilledellipse) { zval *IM; @@ -936,8 +920,7 @@ PHP_FUNCTION(imagefilledellipse) } /* }}} */ -/* {{{ proto bool imagefilledarc(resource im, int cx, int cy, int w, int h, int s, int e, int col, int style) - Draw a filled partial ellipse */ +/* {{{ Draw a filled partial ellipse */ PHP_FUNCTION(imagefilledarc) { zval *IM; @@ -967,8 +950,7 @@ PHP_FUNCTION(imagefilledarc) } /* }}} */ -/* {{{ proto bool imagealphablending(resource im, bool on) - Turn alpha blending mode on or off for the given image */ +/* {{{ Turn alpha blending mode on or off for the given image */ PHP_FUNCTION(imagealphablending) { zval *IM; @@ -987,8 +969,7 @@ PHP_FUNCTION(imagealphablending) } /* }}} */ -/* {{{ proto bool imagesavealpha(resource im, bool on) - Include alpha channel to a saved image */ +/* {{{ Include alpha channel to a saved image */ PHP_FUNCTION(imagesavealpha) { zval *IM; @@ -1007,8 +988,7 @@ PHP_FUNCTION(imagesavealpha) } /* }}} */ -/* {{{ proto bool imagelayereffect(resource im, int effect) - Set the alpha blending flag to use the bundled libgd layering effects */ +/* {{{ Set the alpha blending flag to use the bundled libgd layering effects */ PHP_FUNCTION(imagelayereffect) { zval *IM; @@ -1033,8 +1013,7 @@ PHP_FUNCTION(imagelayereffect) RETURN_THROWS(); \ } -/* {{{ proto int imagecolorallocatealpha(resource im, int red, int green, int blue, int alpha) - Allocate a color with an alpha level. Works for true color and palette based images */ +/* {{{ Allocate a color with an alpha level. Works for true color and palette based images */ PHP_FUNCTION(imagecolorallocatealpha) { zval *IM; @@ -1061,8 +1040,7 @@ PHP_FUNCTION(imagecolorallocatealpha) } /* }}} */ -/* {{{ proto int imagecolorresolvealpha(resource im, int red, int green, int blue, int alpha) - Resolve/Allocate a colour with an alpha level. Works for true colour and palette based images */ +/* {{{ Resolve/Allocate a colour with an alpha level. Works for true colour and palette based images */ PHP_FUNCTION(imagecolorresolvealpha) { zval *IM; @@ -1084,8 +1062,7 @@ PHP_FUNCTION(imagecolorresolvealpha) } /* }}} */ -/* {{{ proto int imagecolorclosestalpha(resource im, int red, int green, int blue, int alpha) - Find the closest matching colour with alpha transparency */ +/* {{{ Find the closest matching colour with alpha transparency */ PHP_FUNCTION(imagecolorclosestalpha) { zval *IM; @@ -1107,8 +1084,7 @@ PHP_FUNCTION(imagecolorclosestalpha) } /* }}} */ -/* {{{ proto int imagecolorexactalpha(resource im, int red, int green, int blue, int alpha) - Find exact match for colour with transparency */ +/* {{{ Find exact match for colour with transparency */ PHP_FUNCTION(imagecolorexactalpha) { zval *IM; @@ -1130,8 +1106,7 @@ PHP_FUNCTION(imagecolorexactalpha) } /* }}} */ -/* {{{ proto bool imagecopyresampled(resource dst_im, resource src_im, int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h) - Copy and resize part of an image using resampling to help ensure clarity */ +/* {{{ Copy and resize part of an image using resampling to help ensure clarity */ PHP_FUNCTION(imagecopyresampled) { zval *SIM, *DIM; @@ -1162,8 +1137,7 @@ PHP_FUNCTION(imagecopyresampled) /* }}} */ #ifdef PHP_WIN32 -/* {{{ proto resource imagegrabwindow(int window_handle [, int client_area]) - Grab a window or its client area using a windows handle (HWND property in COM instance) */ +/* {{{ Grab a window or its client area using a windows handle (HWND property in COM instance) */ PHP_FUNCTION(imagegrabwindow) { HWND window; @@ -1232,8 +1206,7 @@ PHP_FUNCTION(imagegrabwindow) } /* }}} */ -/* {{{ proto resource imagegrabscreen() - Grab a screenshot */ +/* {{{ Grab a screenshot */ PHP_FUNCTION(imagegrabscreen) { HWND window = GetDesktopWindow(); @@ -1290,8 +1263,7 @@ PHP_FUNCTION(imagegrabscreen) /* }}} */ #endif /* PHP_WIN32 */ -/* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor [, int ignoretransparent]) - Rotate an image using a custom angle */ +/* {{{ Rotate an image using a custom angle */ PHP_FUNCTION(imagerotate) { zval *SIM; @@ -1315,8 +1287,7 @@ PHP_FUNCTION(imagerotate) } /* }}} */ -/* {{{ proto bool imagesettile(resource image, resource tile) - Set the tile image to $tile when filling $image with the "IMG_COLOR_TILED" color */ +/* {{{ Set the tile image to $tile when filling $image with the "IMG_COLOR_TILED" color */ PHP_FUNCTION(imagesettile) { zval *IM, *TILE; @@ -1335,8 +1306,7 @@ PHP_FUNCTION(imagesettile) } /* }}} */ -/* {{{ proto bool imagesetbrush(resource image, resource brush) - Set the brush image to $brush when filling $image with the "IMG_COLOR_BRUSHED" color */ +/* {{{ Set the brush image to $brush when filling $image with the "IMG_COLOR_BRUSHED" color */ PHP_FUNCTION(imagesetbrush) { zval *IM, *TILE; @@ -1355,8 +1325,7 @@ PHP_FUNCTION(imagesetbrush) } /* }}} */ -/* {{{ proto resource imagecreate(int x_size, int y_size) - Create a new image */ +/* {{{ Create a new image */ PHP_FUNCTION(imagecreate) { zend_long x_size, y_size; @@ -1386,8 +1355,7 @@ PHP_FUNCTION(imagecreate) } /* }}} */ -/* {{{ proto int imagetypes(void) - Return the types of images supported in a bitfield - 1=GIF, 2=JPEG, 4=PNG, 8=WBMP, 16=XPM */ +/* {{{ Return the types of images supported in a bitfield - 1=GIF, 2=JPEG, 4=PNG, 8=WBMP, 16=XPM */ PHP_FUNCTION(imagetypes) { int ret = 0; @@ -1420,8 +1388,7 @@ PHP_FUNCTION(imagetypes) } /* }}} */ -/* {{{ _php_ctx_getmbi - */ +/* {{{ _php_ctx_getmbi */ static int _php_ctx_getmbi(gdIOCtx *ctx) { @@ -1439,8 +1406,7 @@ static int _php_ctx_getmbi(gdIOCtx *ctx) } /* }}} */ -/* {{{ _php_image_type - */ +/* {{{ _php_image_type */ static const char php_sig_gd2[3] = {'g', 'd', '2'}; static int _php_image_type (char data[12]) @@ -1480,8 +1446,7 @@ static int _php_image_type (char data[12]) } /* }}} */ -/* {{{ _php_image_create_from_string - */ +/* {{{ _php_image_create_from_string */ gdImagePtr _php_image_create_from_string(zend_string *data, char *tn, gdImagePtr (*ioctx_func_p)()) { gdImagePtr im; @@ -1506,8 +1471,7 @@ gdImagePtr _php_image_create_from_string(zend_string *data, char *tn, gdImagePtr } /* }}} */ -/* {{{ proto resource imagecreatefromstring(string image) - Create a new image from the image stream in the string */ +/* {{{ Create a new image from the image stream in the string */ PHP_FUNCTION(imagecreatefromstring) { zend_string *data; @@ -1586,8 +1550,7 @@ PHP_FUNCTION(imagecreatefromstring) } /* }}} */ -/* {{{ _php_image_create_from - */ +/* {{{ _php_image_create_from */ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)()) { char *file; @@ -1712,8 +1675,7 @@ out_err: } /* }}} */ -/* {{{ proto resource imagecreatefromgif(string filename) - Create a new image from GIF file or URL */ +/* {{{ Create a new image from GIF file or URL */ PHP_FUNCTION(imagecreatefromgif) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif, gdImageCreateFromGifCtx); @@ -1721,8 +1683,7 @@ PHP_FUNCTION(imagecreatefromgif) /* }}} */ #ifdef HAVE_GD_JPG -/* {{{ proto resource imagecreatefromjpeg(string filename) - Create a new image from JPEG file or URL */ +/* {{{ Create a new image from JPEG file or URL */ PHP_FUNCTION(imagecreatefromjpeg) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageCreateFromJpeg, gdImageCreateFromJpegCtx); @@ -1731,8 +1692,7 @@ PHP_FUNCTION(imagecreatefromjpeg) #endif /* HAVE_GD_JPG */ #ifdef HAVE_GD_PNG -/* {{{ proto resource imagecreatefrompng(string filename) - Create a new image from PNG file or URL */ +/* {{{ Create a new image from PNG file or URL */ PHP_FUNCTION(imagecreatefrompng) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImageCreateFromPng, gdImageCreateFromPngCtx); @@ -1741,8 +1701,7 @@ PHP_FUNCTION(imagecreatefrompng) #endif /* HAVE_GD_PNG */ #ifdef HAVE_GD_WEBP -/* {{{ proto resource imagecreatefromwebp(string filename) - Create a new image from WEBP file or URL */ +/* {{{ Create a new image from WEBP file or URL */ PHP_FUNCTION(imagecreatefromwebp) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageCreateFromWebp, gdImageCreateFromWebpCtx); @@ -1750,8 +1709,7 @@ PHP_FUNCTION(imagecreatefromwebp) /* }}} */ #endif /* HAVE_GD_WEBP */ -/* {{{ proto resource imagecreatefromxbm(string filename) - Create a new image from XBM file or URL */ +/* {{{ Create a new image from XBM file or URL */ PHP_FUNCTION(imagecreatefromxbm) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM", gdImageCreateFromXbm, NULL); @@ -1759,8 +1717,7 @@ PHP_FUNCTION(imagecreatefromxbm) /* }}} */ #ifdef HAVE_GD_XPM -/* {{{ proto resource imagecreatefromxpm(string filename) - Create a new image from XPM file or URL */ +/* {{{ Create a new image from XPM file or URL */ PHP_FUNCTION(imagecreatefromxpm) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XPM, "XPM", gdImageCreateFromXpm, NULL); @@ -1768,32 +1725,28 @@ PHP_FUNCTION(imagecreatefromxpm) /* }}} */ #endif -/* {{{ proto resource imagecreatefromwbmp(string filename) - Create a new image from WBMP file or URL */ +/* {{{ Create a new image from WBMP file or URL */ PHP_FUNCTION(imagecreatefromwbmp) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP", gdImageCreateFromWBMP, gdImageCreateFromWBMPCtx); } /* }}} */ -/* {{{ proto resource imagecreatefromgd(string filename) - Create a new image from GD file or URL */ +/* {{{ Create a new image from GD file or URL */ PHP_FUNCTION(imagecreatefromgd) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD, "GD", gdImageCreateFromGd, gdImageCreateFromGdCtx); } /* }}} */ -/* {{{ proto resource imagecreatefromgd2(string filename) - Create a new image from GD2 file or URL */ +/* {{{ Create a new image from GD2 file or URL */ PHP_FUNCTION(imagecreatefromgd2) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2, "GD2", gdImageCreateFromGd2, gdImageCreateFromGd2Ctx); } /* }}} */ -/* {{{ proto resource imagecreatefromgd2part(string filename, int srcX, int srcY, int width, int height) - Create a new image from a given part of GD2 file or URL */ +/* {{{ Create a new image from a given part of GD2 file or URL */ PHP_FUNCTION(imagecreatefromgd2part) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2PART, "GD2", gdImageCreateFromGd2Part, gdImageCreateFromGd2PartCtx); @@ -1801,8 +1754,7 @@ PHP_FUNCTION(imagecreatefromgd2part) /* }}} */ #ifdef HAVE_GD_BMP -/* {{{ proto resource imagecreatefrombmp(string filename) - Create a new image from BMP file or URL */ +/* {{{ Create a new image from BMP file or URL */ PHP_FUNCTION(imagecreatefrombmp) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_BMP, "BMP", gdImageCreateFromBmp, gdImageCreateFromBmpCtx); @@ -1811,8 +1763,7 @@ PHP_FUNCTION(imagecreatefrombmp) #endif #ifdef HAVE_GD_TGA -/* {{{ proto resource imagecreatefromtga(string filename) - Create a new image from TGA file or URL */ +/* {{{ Create a new image from TGA file or URL */ PHP_FUNCTION(imagecreatefromtga) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_TGA, "TGA", gdImageCreateFromTga, gdImageCreateFromTgaCtx); @@ -1820,8 +1771,7 @@ PHP_FUNCTION(imagecreatefromtga) /* }}} */ #endif -/* {{{ _php_image_output - */ +/* {{{ _php_image_output */ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()) { zval *imgind; @@ -1916,16 +1866,14 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char } /* }}} */ -/* {{{ proto int imagexbm(int im, string filename [, int foreground]) - Output XBM image to browser or file */ +/* {{{ Output XBM image to browser or file */ PHP_FUNCTION(imagexbm) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM", gdImageXbmCtx); } /* }}} */ -/* {{{ proto bool imagegif(resource im [, mixed to]) - Output GIF image to browser or file */ +/* {{{ Output GIF image to browser or file */ PHP_FUNCTION(imagegif) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx); @@ -1933,8 +1881,7 @@ PHP_FUNCTION(imagegif) /* }}} */ #ifdef HAVE_GD_PNG -/* {{{ proto bool imagepng(resource im [, mixed to]) - Output PNG image to browser or file */ +/* {{{ Output PNG image to browser or file */ PHP_FUNCTION(imagepng) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImagePngCtxEx); @@ -1944,8 +1891,7 @@ PHP_FUNCTION(imagepng) #ifdef HAVE_GD_WEBP -/* {{{ proto bool imagewebp(resource im [, mixed to[, int quality]] ) - Output WEBP image to browser or file */ +/* {{{ Output WEBP image to browser or file */ PHP_FUNCTION(imagewebp) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx); @@ -1955,8 +1901,7 @@ PHP_FUNCTION(imagewebp) #ifdef HAVE_GD_JPG -/* {{{ proto bool imagejpeg(resource im [, mixed to [, int quality]]) - Output JPEG image to browser or file */ +/* {{{ Output JPEG image to browser or file */ PHP_FUNCTION(imagejpeg) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageJpegCtx); @@ -1964,24 +1909,21 @@ PHP_FUNCTION(imagejpeg) /* }}} */ #endif /* HAVE_GD_JPG */ -/* {{{ proto bool imagewbmp(resource im [, mixed to [, int foreground]]) - Output WBMP image to browser or file */ +/* {{{ Output WBMP image to browser or file */ PHP_FUNCTION(imagewbmp) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP", gdImageWBMPCtx); } /* }}} */ -/* {{{ proto bool imagegd(resource im [, mixed to]) - Output GD image to browser or file */ +/* {{{ Output GD image to browser or file */ PHP_FUNCTION(imagegd) { _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD, "GD", gdImageGd); } /* }}} */ -/* {{{ proto bool imagegd2(resource im [, mixed to [, int chunk_size [, int type]]]) - Output GD2 image to browser or file */ +/* {{{ Output GD2 image to browser or file */ PHP_FUNCTION(imagegd2) { _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2, "GD2", gdImageGd2); @@ -1989,8 +1931,7 @@ PHP_FUNCTION(imagegd2) /* }}} */ #ifdef HAVE_GD_BMP -/* {{{ proto bool imagebmp(resource im [, mixed to [, bool compressed]]) - Output BMP image to browser or file */ +/* {{{ Output BMP image to browser or file */ PHP_FUNCTION(imagebmp) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_BMP, "BMP", gdImageBmpCtx); @@ -1998,8 +1939,7 @@ PHP_FUNCTION(imagebmp) /* }}} */ #endif -/* {{{ proto bool imagedestroy(resource im) - Destroy an image - No effect as of PHP 8.0 */ +/* {{{ Destroy an image - No effect as of PHP 8.0 */ PHP_FUNCTION(imagedestroy) { /* This function used to free the resource, as resources are no longer used, it does nothing */ @@ -2013,8 +1953,7 @@ PHP_FUNCTION(imagedestroy) } /* }}} */ -/* {{{ proto int imagecolorallocate(resource im, int red, int green, int blue) - Allocate a color for an image */ +/* {{{ Allocate a color for an image */ PHP_FUNCTION(imagecolorallocate) { zval *IM; @@ -2040,8 +1979,7 @@ PHP_FUNCTION(imagecolorallocate) } /* }}} */ -/* {{{ proto void imagepalettecopy(resource dst, resource src) - Copy the palette from the src image onto the dst image */ +/* {{{ Copy the palette from the src image onto the dst image */ PHP_FUNCTION(imagepalettecopy) { zval *dstim, *srcim; @@ -2058,8 +1996,7 @@ PHP_FUNCTION(imagepalettecopy) } /* }}} */ -/* {{{ proto int imagecolorat(resource im, int x, int y) - Get the index of the color of a pixel */ +/* {{{ Get the index of the color of a pixel */ PHP_FUNCTION(imagecolorat) { zval *IM; @@ -2092,8 +2029,7 @@ PHP_FUNCTION(imagecolorat) } /* }}} */ -/* {{{ proto int imagecolorclosest(resource im, int red, int green, int blue) - Get the index of the closest color to the specified color */ +/* {{{ Get the index of the closest color to the specified color */ PHP_FUNCTION(imagecolorclosest) { zval *IM; @@ -2114,8 +2050,7 @@ PHP_FUNCTION(imagecolorclosest) } /* }}} */ -/* {{{ proto int imagecolorclosesthwb(resource im, int red, int green, int blue) - Get the index of the color which has the hue, white and blackness nearest to the given color */ +/* {{{ Get the index of the color which has the hue, white and blackness nearest to the given color */ PHP_FUNCTION(imagecolorclosesthwb) { zval *IM; @@ -2136,8 +2071,7 @@ PHP_FUNCTION(imagecolorclosesthwb) } /* }}} */ -/* {{{ proto bool imagecolordeallocate(resource im, int index) - De-allocate a color for an image */ +/* {{{ De-allocate a color for an image */ PHP_FUNCTION(imagecolordeallocate) { zval *IM; @@ -2168,8 +2102,7 @@ PHP_FUNCTION(imagecolordeallocate) } /* }}} */ -/* {{{ proto int imagecolorresolve(resource im, int red, int green, int blue) - Get the index of the specified color or its closest possible alternative */ +/* {{{ Get the index of the specified color or its closest possible alternative */ PHP_FUNCTION(imagecolorresolve) { zval *IM; @@ -2190,8 +2123,7 @@ PHP_FUNCTION(imagecolorresolve) } /* }}} */ -/* {{{ proto int imagecolorexact(resource im, int red, int green, int blue) - Get the index of the specified color */ +/* {{{ Get the index of the specified color */ PHP_FUNCTION(imagecolorexact) { zval *IM; @@ -2212,8 +2144,7 @@ PHP_FUNCTION(imagecolorexact) } /* }}} */ -/* {{{ proto bool imagecolorset(resource im, int col, int red, int green, int blue) - Set the color for the specified palette index */ +/* {{{ Set the color for the specified palette index */ PHP_FUNCTION(imagecolorset) { zval *IM; @@ -2244,8 +2175,7 @@ PHP_FUNCTION(imagecolorset) } /* }}} */ -/* {{{ proto array imagecolorsforindex(resource im, int col) - Get the colors for an index */ +/* {{{ Get the colors for an index */ PHP_FUNCTION(imagecolorsforindex) { zval *IM; @@ -2275,8 +2205,7 @@ PHP_FUNCTION(imagecolorsforindex) } /* }}} */ -/* {{{ proto bool imagegammacorrect(resource im, float inputgamma, float outputgamma) - Apply a gamma correction to a GD image */ +/* {{{ Apply a gamma correction to a GD image */ PHP_FUNCTION(imagegammacorrect) { zval *IM; @@ -2331,8 +2260,7 @@ PHP_FUNCTION(imagegammacorrect) } /* }}} */ -/* {{{ proto bool imagesetpixel(resource im, int x, int y, int col) - Set a single pixel */ +/* {{{ Set a single pixel */ PHP_FUNCTION(imagesetpixel) { zval *IM; @@ -2353,8 +2281,7 @@ PHP_FUNCTION(imagesetpixel) } /* }}} */ -/* {{{ proto bool imageline(resource im, int x1, int y1, int x2, int y2, int col) - Draw a line */ +/* {{{ Draw a line */ PHP_FUNCTION(imageline) { zval *IM; @@ -2376,8 +2303,7 @@ PHP_FUNCTION(imageline) } /* }}} */ -/* {{{ proto bool imagedashedline(resource im, int x1, int y1, int x2, int y2, int col) - Draw a dashed line */ +/* {{{ Draw a dashed line */ PHP_FUNCTION(imagedashedline) { zval *IM; @@ -2395,8 +2321,7 @@ PHP_FUNCTION(imagedashedline) } /* }}} */ -/* {{{ proto bool imagerectangle(resource im, int x1, int y1, int x2, int y2, int col) - Draw a rectangle */ +/* {{{ Draw a rectangle */ PHP_FUNCTION(imagerectangle) { zval *IM; @@ -2414,8 +2339,7 @@ PHP_FUNCTION(imagerectangle) } /* }}} */ -/* {{{ proto bool imagefilledrectangle(resource im, int x1, int y1, int x2, int y2, int col) - Draw a filled rectangle */ +/* {{{ Draw a filled rectangle */ PHP_FUNCTION(imagefilledrectangle) { zval *IM; @@ -2432,8 +2356,7 @@ PHP_FUNCTION(imagefilledrectangle) } /* }}} */ -/* {{{ proto bool imagearc(resource im, int cx, int cy, int w, int h, int s, int e, int col) - Draw a partial ellipse */ +/* {{{ Draw a partial ellipse */ PHP_FUNCTION(imagearc) { zval *IM; @@ -2462,8 +2385,7 @@ PHP_FUNCTION(imagearc) } /* }}} */ -/* {{{ proto bool imageellipse(resource im, int cx, int cy, int w, int h, int color) - Draw an ellipse */ +/* {{{ Draw an ellipse */ PHP_FUNCTION(imageellipse) { zval *IM; @@ -2481,8 +2403,7 @@ PHP_FUNCTION(imageellipse) } /* }}} */ -/* {{{ proto bool imagefilltoborder(resource im, int x, int y, int border, int col) - Flood fill to specific color */ +/* {{{ Flood fill to specific color */ PHP_FUNCTION(imagefilltoborder) { zval *IM; @@ -2500,8 +2421,7 @@ PHP_FUNCTION(imagefilltoborder) } /* }}} */ -/* {{{ proto bool imagefill(resource im, int x, int y, int col) - Flood fill */ +/* {{{ Flood fill */ PHP_FUNCTION(imagefill) { zval *IM; @@ -2519,8 +2439,7 @@ PHP_FUNCTION(imagefill) } /* }}} */ -/* {{{ proto int imagecolorstotal(resource im) - Find out the number of colors in an image's palette */ +/* {{{ Find out the number of colors in an image's palette */ PHP_FUNCTION(imagecolorstotal) { zval *IM; @@ -2536,8 +2455,7 @@ PHP_FUNCTION(imagecolorstotal) } /* }}} */ -/* {{{ proto int imagecolortransparent(resource im [, int col]) - Define a color as transparent */ +/* {{{ Define a color as transparent */ PHP_FUNCTION(imagecolortransparent) { zval *IM; @@ -2559,8 +2477,7 @@ PHP_FUNCTION(imagecolortransparent) } /* }}} */ -/* {{{ proto int imageinterlace(resource im [, int interlace]) - Enable or disable interlace */ +/* {{{ Enable or disable interlace */ PHP_FUNCTION(imageinterlace) { zval *IM; @@ -2657,32 +2574,28 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled) } /* }}} */ -/* {{{ proto bool imagepolygon(resource im, array point, int num_points, int col) - Draw a polygon */ +/* {{{ Draw a polygon */ PHP_FUNCTION(imagepolygon) { php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool imageopenpolygon(resource im, array point, int num_points, int col) - Draw a polygon */ +/* {{{ Draw a polygon */ PHP_FUNCTION(imageopenpolygon) { php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1); } /* }}} */ -/* {{{ proto bool imagefilledpolygon(resource im, array point, int num_points, int col) - Draw a filled polygon */ +/* {{{ Draw a filled polygon */ PHP_FUNCTION(imagefilledpolygon) { php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ php_find_gd_font - */ +/* {{{ php_find_gd_font */ static gdFontPtr php_find_gd_font(int size) { gdFontPtr font; @@ -2740,16 +2653,14 @@ static void php_imagefontsize(INTERNAL_FUNCTION_PARAMETERS, int arg) } /* }}} */ -/* {{{ proto int imagefontwidth(int font) - Get font width */ +/* {{{ Get font width */ PHP_FUNCTION(imagefontwidth) { php_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int imagefontheight(int font) - Get font height */ +/* {{{ Get font height */ PHP_FUNCTION(imagefontheight) { php_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -2849,40 +2760,35 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) } /* }}} */ -/* {{{ proto bool imagechar(resource im, int font, int x, int y, string c, int col) - Draw a character */ +/* {{{ Draw a character */ PHP_FUNCTION(imagechar) { php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool imagecharup(resource im, int font, int x, int y, string c, int col) - Draw a character rotated 90 degrees counter-clockwise */ +/* {{{ Draw a character rotated 90 degrees counter-clockwise */ PHP_FUNCTION(imagecharup) { php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool imagestring(resource im, int font, int x, int y, string str, int col) - Draw a string horizontally */ +/* {{{ Draw a string horizontally */ PHP_FUNCTION(imagestring) { php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ -/* {{{ proto bool imagestringup(resource im, int font, int x, int y, string str, int col) - Draw a string vertically - rotated 90 degrees counter-clockwise */ +/* {{{ Draw a string vertically - rotated 90 degrees counter-clockwise */ PHP_FUNCTION(imagestringup) { php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); } /* }}} */ -/* {{{ proto bool imagecopy(resource dst_im, resource src_im, int dst_x, int dst_y, int src_x, int src_y, int src_w, int src_h) - Copy part of an image */ +/* {{{ Copy part of an image */ PHP_FUNCTION(imagecopy) { zval *SIM, *DIM; @@ -2909,8 +2815,7 @@ PHP_FUNCTION(imagecopy) } /* }}} */ -/* {{{ proto bool imagecopymerge(resource dst_im, resource src_im, int dst_x, int dst_y, int src_x, int src_y, int src_w, int src_h, int pct) - Merge one part of an image with another */ +/* {{{ Merge one part of an image with another */ PHP_FUNCTION(imagecopymerge) { zval *SIM, *DIM; @@ -2938,8 +2843,7 @@ PHP_FUNCTION(imagecopymerge) } /* }}} */ -/* {{{ proto bool imagecopymergegray(resource dst_im, resource src_im, int dst_x, int dst_y, int src_x, int src_y, int src_w, int src_h, int pct) - Merge one part of an image with another */ +/* {{{ Merge one part of an image with another */ PHP_FUNCTION(imagecopymergegray) { zval *SIM, *DIM; @@ -2967,8 +2871,7 @@ PHP_FUNCTION(imagecopymergegray) } /* }}} */ -/* {{{ proto bool imagecopyresized(resource dst_im, resource src_im, int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h) - Copy and resize part of an image */ +/* {{{ Copy and resize part of an image */ PHP_FUNCTION(imagecopyresized) { zval *SIM, *DIM; @@ -3017,8 +2920,7 @@ PHP_FUNCTION(imagecopyresized) } /* }}} */ -/* {{{ proto int imagesx(resource im) - Get image width */ +/* {{{ Get image width */ PHP_FUNCTION(imagesx) { zval *IM; @@ -3034,8 +2936,7 @@ PHP_FUNCTION(imagesx) } /* }}} */ -/* {{{ proto int imagesy(resource im) - Get image height */ +/* {{{ Get image height */ PHP_FUNCTION(imagesy) { zval *IM; @@ -3051,8 +2952,7 @@ PHP_FUNCTION(imagesy) } /* }}} */ -/* {{{ proto bool imagesetclip(resource im, int x1, int y1, int x2, int y2) - Set the clipping rectangle. */ +/* {{{ Set the clipping rectangle. */ PHP_FUNCTION(imagesetclip) { zval *im_zval; @@ -3070,8 +2970,7 @@ PHP_FUNCTION(imagesetclip) } /* }}} */ -/* {{{ proto array imagegetclip(resource im) - Get the clipping rectangle. */ +/* {{{ Get the clipping rectangle. */ PHP_FUNCTION(imagegetclip) { zval *im_zval; @@ -3098,40 +2997,35 @@ PHP_FUNCTION(imagegetclip) #define TTFTEXT_BBOX 1 #ifdef HAVE_GD_FREETYPE -/* {{{ proto array imageftbbox(float size, float angle, string font_file, string text [, array extrainfo]) - Give the bounding box of a text using fonts via freetype2 */ +/* {{{ Give the bounding box of a text using fonts via freetype2 */ PHP_FUNCTION(imageftbbox) { php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX, 1); } /* }}} */ -/* {{{ proto array imagefttext(resource im, float size, float angle, int x, int y, int col, string font_file, string text [, array extrainfo]) - Write text to the image using fonts via freetype2 */ +/* {{{ Write text to the image using fonts via freetype2 */ PHP_FUNCTION(imagefttext) { php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW, 1); } /* }}} */ -/* {{{ proto array imagettfbbox(float size, float angle, string font_file, string text) - Give the bounding box of a text using TrueType fonts */ +/* {{{ Give the bounding box of a text using TrueType fonts */ PHP_FUNCTION(imagettfbbox) { php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX, 0); } /* }}} */ -/* {{{ proto array imagettftext(resource im, float size, float angle, int x, int y, int col, string font_file, string text) - Write text to the image using a TrueType font */ +/* {{{ Write text to the image using a TrueType font */ PHP_FUNCTION(imagettftext) { php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW, 0); } /* }}} */ -/* {{{ php_imagettftext_common - */ +/* {{{ php_imagettftext_common */ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended) { zval *IM, *EXT = NULL; @@ -3434,8 +3328,7 @@ static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS) } } -/* {{{ proto bool imagefilter(resource src_im, int filtertype[, int arg1 [, int arg2 [, int arg3 [, int arg4 ]]]] ) - Applies Filter an image using a custom angle */ +/* {{{ Applies Filter an image using a custom angle */ PHP_FUNCTION(imagefilter) { zval *tmp; @@ -3471,8 +3364,7 @@ PHP_FUNCTION(imagefilter) } /* }}} */ -/* {{{ proto resource imageconvolution(resource src_im, array matrix3x3, double div, double offset) - Apply a 3x3 convolution matrix, using coefficient div and offset */ +/* {{{ Apply a 3x3 convolution matrix, using coefficient div and offset */ PHP_FUNCTION(imageconvolution) { zval *SIM, *hash_matrix; @@ -3522,8 +3414,7 @@ PHP_FUNCTION(imageconvolution) /* }}} */ /* End section: Filters */ -/* {{{ proto bool imageflip(resource im, int mode) - Flip an image (in place) horizontally, vertically or both directions. */ +/* {{{ Flip an image (in place) horizontally, vertically or both directions. */ PHP_FUNCTION(imageflip) { zval *IM; @@ -3558,8 +3449,7 @@ PHP_FUNCTION(imageflip) } /* }}} */ -/* {{{ proto bool imageantialias(resource im, bool on) - Should antialiased functions used or not*/ +/* {{{ Should antialiased functions used or not*/ PHP_FUNCTION(imageantialias) { zval *IM; @@ -3579,8 +3469,7 @@ PHP_FUNCTION(imageantialias) } /* }}} */ -/* {{{ proto resource imagecrop(resource im, array rect) - Crop an image using the given coordinates and size, x, y, width and height. */ +/* {{{ Crop an image using the given coordinates and size, x, y, width and height. */ PHP_FUNCTION(imagecrop) { zval *IM; @@ -3634,8 +3523,7 @@ PHP_FUNCTION(imagecrop) } /* }}} */ -/* {{{ proto resource imagecropauto(resource im [, int mode = GD_CROP_DEFAULT [, float threshold [, int color]]]) - Crop an image automatically using one of the available modes. */ +/* {{{ Crop an image automatically using one of the available modes. */ PHP_FUNCTION(imagecropauto) { zval *IM; @@ -3681,8 +3569,7 @@ PHP_FUNCTION(imagecropauto) } /* }}} */ -/* {{{ proto resource imagescale(resource im, int new_width[, int new_height[, int method]]) - Scale an image using the given new width and height. */ +/* {{{ Scale an image using the given new width and height. */ PHP_FUNCTION(imagescale) { zval *IM; @@ -3736,8 +3623,7 @@ PHP_FUNCTION(imagescale) } /* }}} */ -/* {{{ proto resource imageaffine(resource src, array affine[, array clip]) - Return an image containing the affine tramsformed src image, using an optional clipping area */ +/* {{{ Return an image containing the affine tramsformed src image, using an optional clipping area */ PHP_FUNCTION(imageaffine) { zval *IM; @@ -3825,8 +3711,7 @@ PHP_FUNCTION(imageaffine) } /* }}} */ -/* {{{ proto array imageaffinematrixget(int type[, array options]) - Return an image containing the affine tramsformed src image, using an optional clipping area */ +/* {{{ Return an image containing the affine tramsformed src image, using an optional clipping area */ PHP_FUNCTION(imageaffinematrixget) { double affine[6]; @@ -3907,8 +3792,7 @@ PHP_FUNCTION(imageaffinematrixget) } } /* }}} */ -/* {{{ proto array imageaffineconcat(array m1, array m2) - Concat two matrices (as in doing many ops in one go) */ +/* {{{ Concat two matrices (as in doing many ops in one go) */ PHP_FUNCTION(imageaffinematrixconcat) { double m1[6]; @@ -3980,8 +3864,7 @@ PHP_FUNCTION(imageaffinematrixconcat) } } /* }}} */ -/* {{{ proto resource imagegetinterpolation(resource im) - Get the default interpolation method. */ +/* {{{ Get the default interpolation method. */ PHP_FUNCTION(imagegetinterpolation) { zval *IM; @@ -4000,8 +3883,7 @@ PHP_FUNCTION(imagegetinterpolation) } /* }}} */ -/* {{{ proto resource imagesetinterpolation(resource im [, int method]]) - Set the default interpolation method, passing -1 or 0 sets it to the libgd default (bilinear). */ +/* {{{ Set the default interpolation method, passing -1 or 0 sets it to the libgd default (bilinear). */ PHP_FUNCTION(imagesetinterpolation) { zval *IM; @@ -4021,8 +3903,7 @@ PHP_FUNCTION(imagesetinterpolation) } /* }}} */ -/* {{{ proto array imageresolution(resource im [, res_x, [res_y]]) - Get or set the resolution of the image in DPI. */ +/* {{{ Get or set the resolution of the image in DPI. */ PHP_FUNCTION(imageresolution) { zval *IM; diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 66d67e6229..63131d3360 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -68,8 +68,7 @@ PHP_MINFO_FUNCTION(php_gettext) php_info_print_table_end(); } -/* {{{ proto string textdomain(string domain) - Set the textdomain to "domain". Returns the current domain */ +/* {{{ Set the textdomain to "domain". Returns the current domain */ PHP_FUNCTION(textdomain) { char *domain = NULL, *domain_name, *retval; @@ -93,8 +92,7 @@ PHP_FUNCTION(textdomain) } /* }}} */ -/* {{{ proto string gettext(string msgid) - Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */ +/* {{{ Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */ PHP_FUNCTION(gettext) { char *msgstr; @@ -115,8 +113,7 @@ PHP_FUNCTION(gettext) } /* }}} */ -/* {{{ proto string dgettext(string domain_name, string msgid) - Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist */ +/* {{{ Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist */ PHP_FUNCTION(dgettext) { char *msgstr; @@ -139,8 +136,7 @@ PHP_FUNCTION(dgettext) } /* }}} */ -/* {{{ proto string dcgettext(string domain_name, string msgid, int category) - Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist */ +/* {{{ Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist */ PHP_FUNCTION(dcgettext) { char *msgstr; @@ -164,8 +160,7 @@ PHP_FUNCTION(dcgettext) } /* }}} */ -/* {{{ proto string bindtextdomain(string domain_name, string dir) - Bind to the text domain domain_name, looking for translations in dir. Returns the current domain */ +/* {{{ Bind to the text domain domain_name, looking for translations in dir. Returns the current domain */ PHP_FUNCTION(bindtextdomain) { char *domain, *dir; @@ -198,8 +193,7 @@ PHP_FUNCTION(bindtextdomain) /* }}} */ #ifdef HAVE_NGETTEXT -/* {{{ proto string ngettext(string MSGID1, string MSGID2, int N) - Plural version of gettext() */ +/* {{{ Plural version of gettext() */ PHP_FUNCTION(ngettext) { char *msgid1, *msgid2, *msgstr; @@ -222,8 +216,7 @@ PHP_FUNCTION(ngettext) #endif #ifdef HAVE_DNGETTEXT -/* {{{ proto string dngettext(string domain, string msgid1, string msgid2, int count) - Plural version of dgettext() */ +/* {{{ Plural version of dgettext() */ PHP_FUNCTION(dngettext) { char *domain, *msgid1, *msgid2, *msgstr = NULL; @@ -248,8 +241,7 @@ PHP_FUNCTION(dngettext) #endif #ifdef HAVE_DCNGETTEXT -/* {{{ proto string dcngettext(string domain, string msgid1, string msgid2, int n, int category) - Plural version of dcgettext() */ +/* {{{ Plural version of dcgettext() */ PHP_FUNCTION(dcngettext) { char *domain, *msgid1, *msgid2, *msgstr = NULL; @@ -277,8 +269,7 @@ PHP_FUNCTION(dcngettext) #ifdef HAVE_BIND_TEXTDOMAIN_CODESET -/* {{{ proto string bind_textdomain_codeset(string domain, string codeset) - Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */ +/* {{{ Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */ PHP_FUNCTION(bind_textdomain_codeset) { char *domain, *codeset, *retval = NULL; diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 5dabeaddff..ceaf49b8bc 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -38,8 +38,7 @@ ZEND_DECLARE_MODULE_GLOBALS(gmp) static ZEND_GINIT_FUNCTION(gmp); -/* {{{ gmp_module_entry - */ +/* {{{ gmp_module_entry */ zend_module_entry gmp_module_entry = { STANDARD_MODULE_HEADER, "gmp", @@ -508,8 +507,7 @@ exit: } /* }}} */ -/* {{{ ZEND_GINIT_FUNCTION - */ +/* {{{ ZEND_GINIT_FUNCTION */ static ZEND_GINIT_FUNCTION(gmp) { #if defined(COMPILE_DL_GMP) && defined(ZTS) @@ -519,8 +517,7 @@ static ZEND_GINIT_FUNCTION(gmp) } /* }}} */ -/* {{{ ZEND_MINIT_FUNCTION - */ +/* {{{ ZEND_MINIT_FUNCTION */ ZEND_MINIT_FUNCTION(gmp) { zend_class_entry tmp_ce; @@ -557,8 +554,7 @@ ZEND_MINIT_FUNCTION(gmp) } /* }}} */ -/* {{{ ZEND_RSHUTDOWN_FUNCTION - */ +/* {{{ ZEND_RSHUTDOWN_FUNCTION */ ZEND_MODULE_DEACTIVATE_D(gmp) { if (GMPG(rand_initialized)) { @@ -570,8 +566,7 @@ ZEND_MODULE_DEACTIVATE_D(gmp) } /* }}} */ -/* {{{ ZEND_MINFO_FUNCTION - */ +/* {{{ ZEND_MINFO_FUNCTION */ ZEND_MODULE_INFO_D(gmp) { php_info_print_table_start(); @@ -787,8 +782,7 @@ static inline void gmp_zval_binary_ui_op2(zval *return_value, zval *a_arg, zval } /* }}} */ -/* {{{ _gmp_binary_ui_op - */ +/* {{{ _gmp_binary_ui_op */ static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op_t gmp_op, gmp_binary_ui_op_t gmp_ui_op, int check_b_zero) { zval *a_arg, *b_arg; @@ -803,8 +797,7 @@ static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op /* Unary operations */ -/* {{{ gmp_zval_unary_op - */ +/* {{{ gmp_zval_unary_op */ static inline void gmp_zval_unary_op(zval *return_value, zval *a_arg, gmp_unary_op_t gmp_op) { mpz_ptr gmpnum_a, gmpnum_result; @@ -819,8 +812,7 @@ static inline void gmp_zval_unary_op(zval *return_value, zval *a_arg, gmp_unary_ } /* }}} */ -/* {{{ gmp_zval_unary_ui_op - */ +/* {{{ gmp_zval_unary_ui_op */ static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_unary_ui_op_t gmp_op) { mpz_ptr gmpnum_result; @@ -830,8 +822,7 @@ static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_una } /* }}} */ -/* {{{ _gmp_unary_op - */ +/* {{{ _gmp_unary_op */ static inline void _gmp_unary_op(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_op_t gmp_op) { zval *a_arg; @@ -844,8 +835,7 @@ static inline void _gmp_unary_op(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_op_t gm } /* }}} */ -/* {{{ _gmp_unary_opl - */ +/* {{{ _gmp_unary_opl */ static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t gmp_op) { zval *a_arg; @@ -862,8 +852,7 @@ static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t } /* }}} */ -/* {{{ proto GMP gmp_init(mixed number [, int base]) - Initializes GMP number */ +/* {{{ Initializes GMP number */ ZEND_FUNCTION(gmp_init) { zval *number_arg; @@ -929,8 +918,7 @@ int gmp_import_export_validate(zend_long size, zend_long options, int *order, in return SUCCESS; } -/* {{{ proto GMP gmp_import(string data [, int word_size = 1, int options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN]) - Imports a GMP number from a binary string */ +/* {{{ Imports a GMP number from a binary string */ ZEND_FUNCTION(gmp_import) { char *data; @@ -960,8 +948,7 @@ ZEND_FUNCTION(gmp_import) } /* }}} */ -/* {{{ proto string gmp_export(GMP gmpnumber [, int word_size = 1, int options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN]) - Exports a GMP number to a binary string */ +/* {{{ Exports a GMP number to a binary string */ ZEND_FUNCTION(gmp_export) { zval *gmpnumber_arg; @@ -998,8 +985,7 @@ ZEND_FUNCTION(gmp_export) } /* }}} */ -/* {{{ proto int gmp_intval(mixed gmpnumber) - Gets signed long value of GMP number */ +/* {{{ Gets signed long value of GMP number */ ZEND_FUNCTION(gmp_intval) { zval *gmpnumber_arg; @@ -1016,8 +1002,7 @@ ZEND_FUNCTION(gmp_intval) } /* }}} */ -/* {{{ proto string gmp_strval(mixed gmpnumber [, int base]) - Gets string representation of GMP number */ +/* {{{ Gets string representation of GMP number */ ZEND_FUNCTION(gmp_strval) { zval *gmpnumber_arg; @@ -1044,32 +1029,28 @@ ZEND_FUNCTION(gmp_strval) } /* }}} */ -/* {{{ proto GMP gmp_add(mixed a, mixed b) - Add a and b */ +/* {{{ Add a and b */ ZEND_FUNCTION(gmp_add) { gmp_binary_ui_op(mpz_add, mpz_add_ui); } /* }}} */ -/* {{{ proto GMP gmp_sub(mixed a, mixed b) - Subtract b from a */ +/* {{{ Subtract b from a */ ZEND_FUNCTION(gmp_sub) { gmp_binary_ui_op(mpz_sub, mpz_sub_ui); } /* }}} */ -/* {{{ proto GMP gmp_mul(mixed a, mixed b) - Multiply a and b */ +/* {{{ Multiply a and b */ ZEND_FUNCTION(gmp_mul) { gmp_binary_ui_op(mpz_mul, mpz_mul_ui); } /* }}} */ -/* {{{ proto array gmp_div_qr(mixed a, mixed b [, int round]) - Divide a by b, returns quotient and reminder */ +/* {{{ Divide a by b, returns quotient and reminder */ ZEND_FUNCTION(gmp_div_qr) { zval *a_arg, *b_arg; @@ -1096,8 +1077,7 @@ ZEND_FUNCTION(gmp_div_qr) } /* }}} */ -/* {{{ proto GMP gmp_div_r(mixed a, mixed b [, int round]) - Divide a by b, returns reminder only */ +/* {{{ Divide a by b, returns reminder only */ ZEND_FUNCTION(gmp_div_r) { zval *a_arg, *b_arg; @@ -1124,8 +1104,7 @@ ZEND_FUNCTION(gmp_div_r) } /* }}} */ -/* {{{ proto GMP gmp_div_q(mixed a, mixed b [, int round]) - Divide a by b, returns quotient only */ +/* {{{ Divide a by b, returns quotient only */ ZEND_FUNCTION(gmp_div_q) { zval *a_arg, *b_arg; @@ -1153,40 +1132,35 @@ ZEND_FUNCTION(gmp_div_q) } /* }}} */ -/* {{{ proto GMP gmp_mod(mixed a, mixed b) - Computes a modulo b */ +/* {{{ Computes a modulo b */ ZEND_FUNCTION(gmp_mod) { gmp_binary_ui_op_no_zero(mpz_mod, gmp_mpz_mod_ui); } /* }}} */ -/* {{{ proto GMP gmp_divexact(mixed a, mixed b) - Divide a by b using exact division algorithm */ +/* {{{ Divide a by b using exact division algorithm */ ZEND_FUNCTION(gmp_divexact) { gmp_binary_ui_op_no_zero(mpz_divexact, NULL); } /* }}} */ -/* {{{ proto GMP gmp_neg(mixed a) - Negates a number */ +/* {{{ Negates a number */ ZEND_FUNCTION(gmp_neg) { gmp_unary_op(mpz_neg); } /* }}} */ -/* {{{ proto GMP gmp_abs(mixed a) - Calculates absolute value */ +/* {{{ Calculates absolute value */ ZEND_FUNCTION(gmp_abs) { gmp_unary_op(mpz_abs); } /* }}} */ -/* {{{ proto GMP gmp_fact(int a) - Calculates factorial function */ +/* {{{ Calculates factorial function */ ZEND_FUNCTION(gmp_fact) { zval *a_arg; @@ -1221,8 +1195,7 @@ ZEND_FUNCTION(gmp_fact) } /* }}} */ -/* {{{ proto GMP gmp_binomial(mixed n, int k) - * Calculates binomial coefficient */ +/* {{{ Calculates binomial coefficient */ ZEND_FUNCTION(gmp_binomial) { zval *n_arg; @@ -1251,8 +1224,7 @@ ZEND_FUNCTION(gmp_binomial) } /* }}} */ -/* {{{ proto GMP gmp_pow(mixed base, int exp) - Raise base to power exp */ +/* {{{ Raise base to power exp */ ZEND_FUNCTION(gmp_pow) { zval *base_arg; @@ -1282,8 +1254,7 @@ ZEND_FUNCTION(gmp_pow) } /* }}} */ -/* {{{ proto GMP gmp_powm(mixed base, mixed exp, mixed mod) - Raise base to power exp and take result modulo mod */ +/* {{{ Raise base to power exp and take result modulo mod */ ZEND_FUNCTION(gmp_powm) { zval *base_arg, *exp_arg, *mod_arg; @@ -1332,8 +1303,7 @@ ZEND_FUNCTION(gmp_powm) } /* }}} */ -/* {{{ proto GMP gmp_sqrt(mixed a) - Takes integer part of square root of a */ +/* {{{ Takes integer part of square root of a */ ZEND_FUNCTION(gmp_sqrt) { zval *a_arg; @@ -1358,8 +1328,7 @@ ZEND_FUNCTION(gmp_sqrt) } /* }}} */ -/* {{{ proto array gmp_sqrtrem(mixed a) - Square root with remainder */ +/* {{{ Square root with remainder */ ZEND_FUNCTION(gmp_sqrtrem) { zval *a_arg; @@ -1391,8 +1360,7 @@ ZEND_FUNCTION(gmp_sqrtrem) } /* }}} */ -/* {{{ proto GMP gmp_root(mixed a, int nth) - Takes integer part of nth root */ +/* {{{ Takes integer part of nth root */ ZEND_FUNCTION(gmp_root) { zval *a_arg; @@ -1423,8 +1391,7 @@ ZEND_FUNCTION(gmp_root) } /* }}} */ -/* {{{ proto GMP gmp_rootrem(mixed a, int nth) - Calculates integer part of nth root and remainder */ +/* {{{ Calculates integer part of nth root and remainder */ ZEND_FUNCTION(gmp_rootrem) { zval *a_arg; @@ -1471,8 +1438,7 @@ ZEND_FUNCTION(gmp_rootrem) } /* }}} */ -/* {{{ proto bool gmp_perfect_square(mixed a) - Checks if a is an exact square */ +/* {{{ Checks if a is an exact square */ ZEND_FUNCTION(gmp_perfect_square) { zval *a_arg; @@ -1490,8 +1456,7 @@ ZEND_FUNCTION(gmp_perfect_square) } /* }}} */ -/* {{{ proto bool gmp_perfect_power(mixed a) - Checks if a is a perfect power */ +/* {{{ Checks if a is a perfect power */ ZEND_FUNCTION(gmp_perfect_power) { zval *a_arg; @@ -1509,8 +1474,7 @@ ZEND_FUNCTION(gmp_perfect_power) } /* }}} */ -/* {{{ proto int gmp_prob_prime(mixed a[, int reps]) - Checks if a is "probably prime" */ +/* {{{ Checks if a is "probably prime" */ ZEND_FUNCTION(gmp_prob_prime) { zval *gmpnumber_arg; @@ -1529,24 +1493,21 @@ ZEND_FUNCTION(gmp_prob_prime) } /* }}} */ -/* {{{ proto GMP gmp_gcd(mixed a, mixed b) - Computes greatest common denominator (gcd) of a and b */ +/* {{{ Computes greatest common denominator (gcd) of a and b */ ZEND_FUNCTION(gmp_gcd) { gmp_binary_ui_op(mpz_gcd, gmp_mpz_gcd_ui); } /* }}} */ -/* {{{ proto GMP gmp_lcm(mixed a, mixed b) - Computes least common multiple (lcm) of a and b */ +/* {{{ Computes least common multiple (lcm) of a and b */ ZEND_FUNCTION(gmp_lcm) { gmp_binary_ui_op(mpz_lcm, mpz_lcm_ui); } /* }}} */ -/* {{{ proto array gmp_gcdext(mixed a, mixed b) - Computes G, S, and T, such that AS + BT = G = `gcd' (A, B) */ +/* {{{ Computes G, S, and T, such that AS + BT = G = `gcd' (A, B) */ ZEND_FUNCTION(gmp_gcdext) { zval *a_arg, *b_arg; @@ -1576,8 +1537,7 @@ ZEND_FUNCTION(gmp_gcdext) } /* }}} */ -/* {{{ proto GMP gmp_invert(mixed a, mixed b) - Computes the inverse of a modulo b */ +/* {{{ Computes the inverse of a modulo b */ ZEND_FUNCTION(gmp_invert) { zval *a_arg, *b_arg; @@ -1603,8 +1563,7 @@ ZEND_FUNCTION(gmp_invert) } /* }}} */ -/* {{{ proto int gmp_jacobi(mixed a, mixed b) - Computes Jacobi symbol */ +/* {{{ Computes Jacobi symbol */ ZEND_FUNCTION(gmp_jacobi) { zval *a_arg, *b_arg; @@ -1625,8 +1584,7 @@ ZEND_FUNCTION(gmp_jacobi) } /* }}} */ -/* {{{ proto int gmp_legendre(mixed a, mixed b) - Computes Legendre symbol */ +/* {{{ Computes Legendre symbol */ ZEND_FUNCTION(gmp_legendre) { zval *a_arg, *b_arg; @@ -1647,8 +1605,7 @@ ZEND_FUNCTION(gmp_legendre) } /* }}} */ -/* {{{ proto int gmp_kronecker(mixed a, mixed b) - Computes the Kronecker symbol */ +/* {{{ Computes the Kronecker symbol */ ZEND_FUNCTION(gmp_kronecker) { zval *a_arg, *b_arg; @@ -1691,8 +1648,7 @@ ZEND_FUNCTION(gmp_kronecker) } /* }}} */ -/* {{{ proto int gmp_cmp(mixed a, mixed b) - Compares two numbers */ +/* {{{ Compares two numbers */ ZEND_FUNCTION(gmp_cmp) { zval *a_arg, *b_arg; @@ -1705,8 +1661,7 @@ ZEND_FUNCTION(gmp_cmp) } /* }}} */ -/* {{{ proto int gmp_sign(mixed a) - Gets the sign of the number */ +/* {{{ Gets the sign of the number */ ZEND_FUNCTION(gmp_sign) { /* Can't use gmp_unary_opl here, because mpz_sgn is a macro */ @@ -1737,8 +1692,7 @@ static void gmp_init_random(void) } } -/* {{{ proto GMP gmp_random_seed(mixed seed) - Seed the RNG */ +/* {{{ Seed the RNG */ ZEND_FUNCTION(gmp_random_seed) { zval *seed; @@ -1765,8 +1719,7 @@ ZEND_FUNCTION(gmp_random_seed) } /* }}} */ -/* {{{ proto GMP gmp_random_bits(int bits) - Gets a random number in the range 0 to (2 ** n) - 1 */ +/* {{{ Gets a random number in the range 0 to (2 ** n) - 1 */ ZEND_FUNCTION(gmp_random_bits) { zend_long bits; @@ -1788,8 +1741,7 @@ ZEND_FUNCTION(gmp_random_bits) } /* }}} */ -/* {{{ proto GMP gmp_random_range(mixed min, mixed max) - Gets a random number in the range min to max */ +/* {{{ Gets a random number in the range min to max */ ZEND_FUNCTION(gmp_random_range) { zval *min_arg, *max_arg; @@ -1856,48 +1808,42 @@ ZEND_FUNCTION(gmp_random_range) } /* }}} */ -/* {{{ proto GMP gmp_and(mixed a, mixed b) - Calculates logical AND of a and b */ +/* {{{ Calculates logical AND of a and b */ ZEND_FUNCTION(gmp_and) { gmp_binary_op(mpz_and); } /* }}} */ -/* {{{ proto GMP gmp_or(mixed a, mixed b) - Calculates logical OR of a and b */ +/* {{{ Calculates logical OR of a and b */ ZEND_FUNCTION(gmp_or) { gmp_binary_op(mpz_ior); } /* }}} */ -/* {{{ proto GMP gmp_com(mixed a) - Calculates one's complement of a */ +/* {{{ Calculates one's complement of a */ ZEND_FUNCTION(gmp_com) { gmp_unary_op(mpz_com); } /* }}} */ -/* {{{ proto GMP gmp_nextprime(mixed a) - Finds next prime of a */ +/* {{{ Finds next prime of a */ ZEND_FUNCTION(gmp_nextprime) { gmp_unary_op(mpz_nextprime); } /* }}} */ -/* {{{ proto GMP gmp_xor(mixed a, mixed b) - Calculates logical exclusive OR of a and b */ +/* {{{ Calculates logical exclusive OR of a and b */ ZEND_FUNCTION(gmp_xor) { gmp_binary_op(mpz_xor); } /* }}} */ -/* {{{ proto void gmp_setbit(GMP a, int index[, bool set_clear]) - Sets or clear bit in a */ +/* {{{ Sets or clear bit in a */ ZEND_FUNCTION(gmp_setbit) { zval *a_arg; @@ -1928,8 +1874,7 @@ ZEND_FUNCTION(gmp_setbit) } /* }}} */ -/* {{{ proto void gmp_clrbit(GMP a, int index) - Clears bit in a */ +/* {{{ Clears bit in a */ ZEND_FUNCTION(gmp_clrbit) { zval *a_arg; @@ -1950,8 +1895,7 @@ ZEND_FUNCTION(gmp_clrbit) } /* }}} */ -/* {{{ proto bool gmp_testbit(mixed a, int index) - Tests if bit is set in a */ +/* {{{ Tests if bit is set in a */ ZEND_FUNCTION(gmp_testbit) { zval *a_arg; @@ -1974,16 +1918,14 @@ ZEND_FUNCTION(gmp_testbit) } /* }}} */ -/* {{{ proto int gmp_popcount(mixed a) - Calculates the population count of a */ +/* {{{ Calculates the population count of a */ ZEND_FUNCTION(gmp_popcount) { gmp_unary_opl(mpz_popcount); } /* }}} */ -/* {{{ proto int gmp_hamdist(mixed a, mixed b) - Calculates hamming distance between a and b */ +/* {{{ Calculates hamming distance between a and b */ ZEND_FUNCTION(gmp_hamdist) { zval *a_arg, *b_arg; @@ -2004,8 +1946,7 @@ ZEND_FUNCTION(gmp_hamdist) } /* }}} */ -/* {{{ proto int gmp_scan0(mixed a, int start) - Finds first zero bit */ +/* {{{ Finds first zero bit */ ZEND_FUNCTION(gmp_scan0) { zval *a_arg; @@ -2029,8 +1970,7 @@ ZEND_FUNCTION(gmp_scan0) } /* }}} */ -/* {{{ proto int gmp_scan1(mixed a, int start) - Finds first non-zero bit */ +/* {{{ Finds first non-zero bit */ ZEND_FUNCTION(gmp_scan1) { zval *a_arg; diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 469d91e34b..40746ea003 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -416,8 +416,7 @@ static void php_hash_do_hash(INTERNAL_FUNCTION_PARAMETERS, int isfilename, zend_ } /* }}} */ -/* {{{ proto string hash(string algo, string data[, bool raw_output = false]) -Generate a hash of a given input string +/* {{{ Generate a hash of a given input string Returns lowercase hexits by default */ PHP_FUNCTION(hash) { @@ -425,8 +424,7 @@ PHP_FUNCTION(hash) } /* }}} */ -/* {{{ proto string hash_file(string algo, string filename[, bool raw_output = false]) -Generate a hash of a given file +/* {{{ Generate a hash of a given file Returns lowercase hexits by default */ PHP_FUNCTION(hash_file) { @@ -554,8 +552,7 @@ static void php_hash_do_hash_hmac(INTERNAL_FUNCTION_PARAMETERS, int isfilename, } /* }}} */ -/* {{{ proto string hash_hmac(string algo, string data, string key[, bool raw_output = false]) -Generate a hash of a given input string with a key using HMAC +/* {{{ Generate a hash of a given input string with a key using HMAC Returns lowercase hexits by default */ PHP_FUNCTION(hash_hmac) { @@ -563,8 +560,7 @@ PHP_FUNCTION(hash_hmac) } /* }}} */ -/* {{{ proto string hash_hmac_file(string algo, string filename, string key[, bool raw_output = false]) -Generate a hash of a given file with a key using HMAC +/* {{{ Generate a hash of a given file with a key using HMAC Returns lowercase hexits by default */ PHP_FUNCTION(hash_hmac_file) { @@ -572,8 +568,7 @@ PHP_FUNCTION(hash_hmac_file) } /* }}} */ -/* {{{ proto HashContext hash_init(string algo[, int options, string key]) -Initialize a hashing context */ +/* {{{ Initialize a hashing context */ PHP_FUNCTION(hash_init) { zend_string *algo, *key = NULL; @@ -649,8 +644,7 @@ PHP_FUNCTION(hash_init) } \ } -/* {{{ proto bool hash_update(HashContext context, string data) -Pump data into the hashing algorithm */ +/* {{{ Pump data into the hashing algorithm */ PHP_FUNCTION(hash_update) { zval *zhash; @@ -669,8 +663,7 @@ PHP_FUNCTION(hash_update) } /* }}} */ -/* {{{ proto int hash_update_stream(HashContext context, resource handle[, int length]) -Pump data into the hashing algorithm from an open stream */ +/* {{{ Pump data into the hashing algorithm from an open stream */ PHP_FUNCTION(hash_update_stream) { zval *zhash, *zstream; @@ -707,8 +700,7 @@ PHP_FUNCTION(hash_update_stream) } /* }}} */ -/* {{{ proto bool hash_update_file(HashContext context, string filename[, resource context]) -Pump data into the hashing algorithm from a file */ +/* {{{ Pump data into the hashing algorithm from a file */ PHP_FUNCTION(hash_update_file) { zval *zhash, *zcontext = NULL; @@ -742,8 +734,7 @@ PHP_FUNCTION(hash_update_file) } /* }}} */ -/* {{{ proto string hash_final(HashContext context[, bool raw_output=false]) -Output resulting digest */ +/* {{{ Output resulting digest */ PHP_FUNCTION(hash_final) { zval *zhash; @@ -801,8 +792,7 @@ PHP_FUNCTION(hash_final) } /* }}} */ -/* {{{ proto HashContext hash_copy(HashContext context) -Copy hash object */ +/* {{{ Copy hash object */ PHP_FUNCTION(hash_copy) { zval *zhash; @@ -822,8 +812,7 @@ PHP_FUNCTION(hash_copy) } /* }}} */ -/* {{{ proto array hash_algos(void) -Return a list of registered hashing algorithms */ +/* {{{ Return a list of registered hashing algorithms */ PHP_FUNCTION(hash_algos) { zend_string *str; @@ -839,8 +828,7 @@ PHP_FUNCTION(hash_algos) } /* }}} */ -/* {{{ proto array hash_hmac_algos(void) -Return a list of registered hashing algorithms suitable for hash_hmac() */ +/* {{{ Return a list of registered hashing algorithms suitable for hash_hmac() */ PHP_FUNCTION(hash_hmac_algos) { zend_string *str; @@ -859,8 +847,7 @@ PHP_FUNCTION(hash_hmac_algos) } /* }}} */ -/* {{{ proto string hash_hkdf(string algo, string ikm [, int length = 0, string info = '', string salt = '']) -RFC5869 HMAC-based key derivation function */ +/* {{{ RFC5869 HMAC-based key derivation function */ PHP_FUNCTION(hash_hkdf) { zend_string *returnval, *ikm, *algo, *info = NULL, *salt = NULL; @@ -952,8 +939,7 @@ PHP_FUNCTION(hash_hkdf) RETURN_STR(returnval); } -/* {{{ proto string hash_pbkdf2(string algo, string password, string salt, int iterations [, int length = 0, bool raw_output = false]) -Generate a PBKDF2 hash of the given password and salt +/* {{{ Generate a PBKDF2 hash of the given password and salt Returns lowercase hexits by default */ PHP_FUNCTION(hash_pbkdf2) { @@ -1077,8 +1063,7 @@ PHP_FUNCTION(hash_pbkdf2) } /* }}} */ -/* {{{ proto bool hash_equals(string known_string, string user_string) - Compares two strings using the same time whether they're equal or not. +/* {{{ Compares two strings using the same time whether they're equal or not. A difference in length will leak */ PHP_FUNCTION(hash_equals) { @@ -1118,7 +1103,7 @@ PHP_FUNCTION(hash_equals) } /* }}} */ -/* {{{ proto HashContext::__construct() */ +/* {{{ */ PHP_METHOD(HashContext, __construct) { /* Normally unreachable as private/final */ zend_throw_exception(zend_ce_error, "Illegal call to private/final constructor", 0); @@ -1175,8 +1160,7 @@ static void mhash_init(INIT_FUNC_ARGS) /* TODO: this cause #69823 zend_register_internal_module(&mhash_module_entry); */ } -/* {{{ proto string mhash(int hash, string data [, string key]) - Hash data with hash */ +/* {{{ Hash data with hash */ PHP_FUNCTION(mhash) { zval *z_algorithm; @@ -1206,8 +1190,7 @@ PHP_FUNCTION(mhash) } /* }}} */ -/* {{{ proto string mhash_get_hash_name(int hash) - Gets the name of hash */ +/* {{{ Gets the name of hash */ PHP_FUNCTION(mhash_get_hash_name) { zend_long algorithm; @@ -1226,8 +1209,7 @@ PHP_FUNCTION(mhash_get_hash_name) } /* }}} */ -/* {{{ proto int mhash_count(void) - Gets the number of available hashes */ +/* {{{ Gets the number of available hashes */ PHP_FUNCTION(mhash_count) { if (zend_parse_parameters_none() == FAILURE) { @@ -1237,8 +1219,7 @@ PHP_FUNCTION(mhash_count) } /* }}} */ -/* {{{ proto int mhash_get_block_size(int hash) - Gets the block size of hash */ +/* {{{ Gets the block size of hash */ PHP_FUNCTION(mhash_get_block_size) { zend_long algorithm; @@ -1262,8 +1243,7 @@ PHP_FUNCTION(mhash_get_block_size) #define SALT_SIZE 8 -/* {{{ proto string mhash_keygen_s2k(int hash, string input_password, string salt, int bytes) - Generates a key using hash functions */ +/* {{{ Generates a key using hash functions */ PHP_FUNCTION(mhash_keygen_s2k) { zend_long algorithm, l_bytes; @@ -1417,8 +1397,7 @@ static zend_object *php_hashcontext_clone(zend_object *zobj) { Currently HASH_HMAC contexts cannot be serialized, because serializing them would require serializing the HMAC key in plaintext. */ -/* {{{ proto array HashContext::__serialize() - Serialize the object */ +/* {{{ Serialize the object */ PHP_METHOD(HashContext, __serialize) { zval *object = ZEND_THIS; @@ -1466,9 +1445,7 @@ serialize_failure: } /* }}} */ -/* {{{ proto void HashContext::__unserialize(array serialized) - * unserialize the object - */ +/* {{{ unserialize the object */ PHP_METHOD(HashContext, __unserialize) { zval *object = ZEND_THIS; @@ -1536,8 +1513,7 @@ PHP_METHOD(HashContext, __unserialize) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(hash) { zend_class_entry ce; @@ -1622,8 +1598,7 @@ PHP_MINIT_FUNCTION(hash) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(hash) { zend_hash_destroy(&php_hash_hashtable); @@ -1632,8 +1607,7 @@ PHP_MSHUTDOWN_FUNCTION(hash) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(hash) { char buffer[2048]; @@ -1660,8 +1634,7 @@ PHP_MINFO_FUNCTION(hash) } /* }}} */ -/* {{{ hash_module_entry - */ +/* {{{ hash_module_entry */ zend_module_entry hash_module_entry = { STANDARD_MODULE_HEADER, PHP_HASH_EXTNAME, diff --git a/ext/hash/hash_haval.c b/ext/hash/hash_haval.c index 34210a8992..84ff242bd9 100644 --- a/ext/hash/hash_haval.c +++ b/ext/hash/hash_haval.c @@ -135,8 +135,7 @@ static void Decode(uint32_t *output, const unsigned char *input, unsigned int le #define ROTR(x,n) (((x) >> (n)) | ((x) << (32 - (n)))) -/* {{{ PHP_3HAVALTransform - */ +/* {{{ PHP_3HAVALTransform */ static void PHP_3HAVALTransform(uint32_t state[8], const unsigned char block[128]) { uint32_t E[8]; @@ -169,8 +168,7 @@ static void PHP_3HAVALTransform(uint32_t state[8], const unsigned char block[128 } /* }}} */ -/* {{{ PHP_4HAVALTransform - */ +/* {{{ PHP_4HAVALTransform */ static void PHP_4HAVALTransform(uint32_t state[8], const unsigned char block[128]) { uint32_t E[8]; @@ -206,8 +204,7 @@ static void PHP_4HAVALTransform(uint32_t state[8], const unsigned char block[128 } /* }}} */ -/* {{{ PHP_5HAVALTransform - */ +/* {{{ PHP_5HAVALTransform */ static void PHP_5HAVALTransform(uint32_t state[8], const unsigned char block[128]) { uint32_t E[8]; @@ -280,8 +277,7 @@ PHP_HASH_HAVAL_INIT(5,192) PHP_HASH_HAVAL_INIT(5,224) PHP_HASH_HAVAL_INIT(5,256) -/* {{{ PHP_HAVALUpdate - */ +/* {{{ PHP_HAVALUpdate */ PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *input, size_t inputLen) { unsigned int i, index, partLen; @@ -318,8 +314,7 @@ PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *i #define PHP_HASH_HAVAL_VERSION 0x01 -/* {{{ PHP_HAVAL128Final - */ +/* {{{ PHP_HAVAL128Final */ PHP_HASH_API void PHP_HAVAL128Final(unsigned char *digest, PHP_HAVAL_CTX * context) { unsigned char bits[10]; @@ -372,8 +367,7 @@ PHP_HASH_API void PHP_HAVAL128Final(unsigned char *digest, PHP_HAVAL_CTX * conte } /* }}} */ -/* {{{ PHP_HAVAL160Final - */ +/* {{{ PHP_HAVAL160Final */ PHP_HASH_API void PHP_HAVAL160Final(unsigned char *digest, PHP_HAVAL_CTX * context) { unsigned char bits[10]; @@ -426,8 +420,7 @@ PHP_HASH_API void PHP_HAVAL160Final(unsigned char *digest, PHP_HAVAL_CTX * conte } /* }}} */ -/* {{{ PHP_HAVAL192Final - */ +/* {{{ PHP_HAVAL192Final */ PHP_HASH_API void PHP_HAVAL192Final(unsigned char *digest, PHP_HAVAL_CTX * context) { unsigned char bits[10]; @@ -466,8 +459,7 @@ PHP_HASH_API void PHP_HAVAL192Final(unsigned char *digest, PHP_HAVAL_CTX * conte } /* }}} */ -/* {{{ PHP_HAVAL224Final - */ +/* {{{ PHP_HAVAL224Final */ PHP_HASH_API void PHP_HAVAL224Final(unsigned char *digest, PHP_HAVAL_CTX * context) { unsigned char bits[10]; @@ -507,8 +499,7 @@ PHP_HASH_API void PHP_HAVAL224Final(unsigned char *digest, PHP_HAVAL_CTX * conte } /* }}} */ -/* {{{ PHP_HAVAL256Final - */ +/* {{{ PHP_HAVAL256Final */ PHP_HASH_API void PHP_HAVAL256Final(unsigned char *digest, PHP_HAVAL_CTX * context) { unsigned char bits[10]; diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index ee23559a63..2fbf285f18 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -59,8 +59,7 @@ ZEND_DECLARE_MODULE_GLOBALS(iconv) static PHP_GINIT_FUNCTION(iconv); -/* {{{ iconv_module_entry - */ +/* {{{ iconv_module_entry */ zend_module_entry iconv_module_entry = { STANDARD_MODULE_HEADER, "iconv", @@ -182,8 +181,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding) } -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("iconv.input_encoding", "", PHP_INI_ALL, OnUpdateInputEncoding, input_encoding, zend_iconv_globals, iconv_globals) STD_PHP_INI_ENTRY("iconv.output_encoding", "", PHP_INI_ALL, OnUpdateOutputEncoding, output_encoding, zend_iconv_globals, iconv_globals) @@ -434,8 +432,7 @@ static int _php_check_ignore(const char *charset) #endif /* }}} */ -/* {{{ php_iconv_string() - */ +/* {{{ php_iconv_string() */ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, zend_string **out, const char *out_charset, const char *in_charset) { iconv_t cd; @@ -1822,8 +1819,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset, } /* }}} */ -/* {{{ proto int iconv_strlen(string str [, string charset]) - Returns the character count of str */ +/* {{{ Returns the character count of str */ PHP_FUNCTION(iconv_strlen) { const char *charset = NULL; @@ -1856,8 +1852,7 @@ PHP_FUNCTION(iconv_strlen) } /* }}} */ -/* {{{ proto string iconv_substr(string str, int offset, [int length, string charset]) - Returns specified part of a string */ +/* {{{ Returns specified part of a string */ PHP_FUNCTION(iconv_substr) { const char *charset = NULL; @@ -1898,8 +1893,7 @@ PHP_FUNCTION(iconv_substr) } /* }}} */ -/* {{{ proto int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - Finds position of first occurrence of needle within part of haystack beginning with offset */ +/* {{{ Finds position of first occurrence of needle within part of haystack beginning with offset */ PHP_FUNCTION(iconv_strpos) { const char *charset = NULL; @@ -1955,8 +1949,7 @@ PHP_FUNCTION(iconv_strpos) } /* }}} */ -/* {{{ proto int iconv_strrpos(string haystack, string needle [, string charset]) - Finds position of last occurrence of needle within part of haystack beginning with offset */ +/* {{{ Finds position of last occurrence of needle within part of haystack beginning with offset */ PHP_FUNCTION(iconv_strrpos) { const char *charset = NULL; @@ -1997,8 +1990,7 @@ PHP_FUNCTION(iconv_strrpos) } /* }}} */ -/* {{{ proto string iconv_mime_encode(string field_name, string field_value [, array preference]) - Composes a mime header field with field_name and field_value in a specified scheme */ +/* {{{ Composes a mime header field with field_name and field_value in a specified scheme */ PHP_FUNCTION(iconv_mime_encode) { zend_string *field_name = NULL; @@ -2100,8 +2092,7 @@ PHP_FUNCTION(iconv_mime_encode) } /* }}} */ -/* {{{ proto string iconv_mime_decode(string encoded_string [, int mode, string charset]) - Decodes a mime header field */ +/* {{{ Decodes a mime header field */ PHP_FUNCTION(iconv_mime_decode) { zend_string *encoded_str; @@ -2142,8 +2133,7 @@ PHP_FUNCTION(iconv_mime_decode) } /* }}} */ -/* {{{ proto array iconv_mime_decode_headers(string headers [, int mode, string charset]) - Decodes multiple mime header fields */ +/* {{{ Decodes multiple mime header fields */ PHP_FUNCTION(iconv_mime_decode_headers) { zend_string *encoded_str; @@ -2242,8 +2232,7 @@ PHP_FUNCTION(iconv_mime_decode_headers) } /* }}} */ -/* {{{ proto string iconv(string in_charset, string out_charset, string str) - Returns str converted to the out_charset character set */ +/* {{{ Returns str converted to the out_charset character set */ PHP_FUNCTION(iconv) { char *in_charset, *out_charset; @@ -2275,8 +2264,7 @@ PHP_FUNCTION(iconv) } /* }}} */ -/* {{{ proto bool iconv_set_encoding(string type, string charset) - Sets internal encoding and output encoding for ob_iconv_handler() */ +/* {{{ Sets internal encoding and output encoding for ob_iconv_handler() */ PHP_FUNCTION(iconv_set_encoding) { char *type; @@ -2314,8 +2302,7 @@ PHP_FUNCTION(iconv_set_encoding) } /* }}} */ -/* {{{ proto mixed iconv_get_encoding([string type]) - Get internal encoding and output encoding for ob_iconv_handler() */ +/* {{{ Get internal encoding and output encoding for ob_iconv_handler() */ PHP_FUNCTION(iconv_get_encoding) { char *type = "all"; diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index ccdf34047d..667587ab77 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -104,16 +104,14 @@ static const zend_module_dep imap_deps[] = { /* }}} */ -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) PHP_INI_END() /* }}} */ -/* {{{ imap_module_entry - */ +/* {{{ imap_module_entry */ zend_module_entry imap_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, imap_deps, @@ -149,8 +147,7 @@ static int le_imap; RETURN_FALSE; \ } \ -/* {{{ mail_close_it - */ +/* {{{ mail_close_it */ static void mail_close_it(zend_resource *rsrc) { pils *imap_le_struct = (pils *)rsrc->ptr; @@ -173,8 +170,7 @@ static void mail_close_it(zend_resource *rsrc) } /* }}} */ -/* {{{ add_assoc_object - */ +/* {{{ add_assoc_object */ static zval *add_assoc_object(zval *arg, char *key, zval *tmp) { HashTable *symtable; @@ -188,8 +184,7 @@ static zval *add_assoc_object(zval *arg, char *key, zval *tmp) } /* }}} */ -/* {{{ add_next_index_object - */ +/* {{{ add_next_index_object */ static inline zval *add_next_index_object(zval *arg, zval *tmp) { HashTable *symtable; @@ -349,8 +344,7 @@ void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist) /* }}} */ #endif -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(imap) { #if defined(COMPILE_DL_IMAP) && defined(ZTS) @@ -382,8 +376,7 @@ static PHP_GINIT_FUNCTION(imap) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(imap) { unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; @@ -618,8 +611,7 @@ PHP_MINIT_FUNCTION(imap) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(imap) { IMAPG(imap_errorstack) = NIL; @@ -629,8 +621,7 @@ PHP_RINIT_FUNCTION(imap) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(imap) { ERRORLIST *ecur = NIL; @@ -687,8 +678,7 @@ PHP_RSHUTDOWN_FUNCTION(imap) # endif #endif -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(imap) { php_info_print_table_start(); @@ -705,8 +695,7 @@ PHP_MINFO_FUNCTION(imap) } /* }}} */ -/* {{{ imap_do_open - */ +/* {{{ imap_do_open */ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) { zend_string *mailbox, *user, *passwd; @@ -816,16 +805,14 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } /* }}} */ -/* {{{ proto resource imap_open(string mailbox, string user, string password [, int options [, int n_retries]]) - Open an IMAP stream to a mailbox */ +/* {{{ Open an IMAP stream to a mailbox */ PHP_FUNCTION(imap_open) { php_imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool imap_reopen(resource stream_id, string mailbox [, int options [, int n_retries]]) - Reopen an IMAP stream to a new mailbox */ +/* {{{ Reopen an IMAP stream to a new mailbox */ PHP_FUNCTION(imap_reopen) { zval *streamind; @@ -871,8 +858,7 @@ PHP_FUNCTION(imap_reopen) } /* }}} */ -/* {{{ proto bool imap_append(resource stream_id, string folder, string message [, string options [, string internal_date]]) - Append a new message to a specified mailbox */ +/* {{{ Append a new message to a specified mailbox */ PHP_FUNCTION(imap_append) { zval *streamind; @@ -921,8 +907,7 @@ PHP_FUNCTION(imap_append) } /* }}} */ -/* {{{ proto int imap_num_msg(resource stream_id) - Gives the number of messages in the current mailbox */ +/* {{{ Gives the number of messages in the current mailbox */ PHP_FUNCTION(imap_num_msg) { zval *streamind; @@ -940,8 +925,7 @@ PHP_FUNCTION(imap_num_msg) } /* }}} */ -/* {{{ proto bool imap_ping(resource stream_id) - Check if the IMAP stream is still active */ +/* {{{ Check if the IMAP stream is still active */ PHP_FUNCTION(imap_ping) { zval *streamind; @@ -959,8 +943,7 @@ PHP_FUNCTION(imap_ping) } /* }}} */ -/* {{{ proto int imap_num_recent(resource stream_id) - Gives the number of recent messages in current mailbox */ +/* {{{ Gives the number of recent messages in current mailbox */ PHP_FUNCTION(imap_num_recent) { zval *streamind; @@ -979,8 +962,7 @@ PHP_FUNCTION(imap_num_recent) /* }}} */ #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) -/* {{{ proto array imap_get_quota(resource stream_id, string qroot) - Returns the quota set to the mailbox account qroot */ +/* {{{ Returns the quota set to the mailbox account qroot */ PHP_FUNCTION(imap_get_quota) { zval *streamind; @@ -1008,8 +990,7 @@ PHP_FUNCTION(imap_get_quota) } /* }}} */ -/* {{{ proto array imap_get_quotaroot(resource stream_id, string mbox) - Returns the quota set to the mailbox account mbox */ +/* {{{ Returns the quota set to the mailbox account mbox */ PHP_FUNCTION(imap_get_quotaroot) { zval *streamind; @@ -1037,8 +1018,7 @@ PHP_FUNCTION(imap_get_quotaroot) } /* }}} */ -/* {{{ proto bool imap_set_quota(resource stream_id, string qroot, int mailbox_size) - Will set the quota for qroot mailbox */ +/* {{{ Will set the quota for qroot mailbox */ PHP_FUNCTION(imap_set_quota) { zval *streamind; @@ -1063,8 +1043,7 @@ PHP_FUNCTION(imap_set_quota) } /* }}} */ -/* {{{ proto bool imap_setacl(resource stream_id, string mailbox, string id, string rights) - Sets the ACL for a given mailbox */ +/* {{{ Sets the ACL for a given mailbox */ PHP_FUNCTION(imap_setacl) { zval *streamind; @@ -1083,8 +1062,7 @@ PHP_FUNCTION(imap_setacl) } /* }}} */ -/* {{{ proto array imap_getacl(resource stream_id, string mailbox) - Gets the ACL for a given mailbox */ +/* {{{ Gets the ACL for a given mailbox */ PHP_FUNCTION(imap_getacl) { zval *streamind; @@ -1117,8 +1095,7 @@ PHP_FUNCTION(imap_getacl) /* }}} */ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ -/* {{{ proto bool imap_expunge(resource stream_id) - Permanently delete all messages marked for deletion */ +/* {{{ Permanently delete all messages marked for deletion */ PHP_FUNCTION(imap_expunge) { zval *streamind; @@ -1138,8 +1115,7 @@ PHP_FUNCTION(imap_expunge) } /* }}} */ -/* {{{ proto bool imap_gc(resource stream_id, int flags) - This function garbage collects (purges) the cache of entries of a specific type. */ +/* {{{ This function garbage collects (purges) the cache of entries of a specific type. */ PHP_FUNCTION(imap_gc) { zval *streamind; @@ -1165,8 +1141,7 @@ PHP_FUNCTION(imap_gc) } /* }}} */ -/* {{{ proto bool imap_close(resource stream_id [, int options]) - Close an IMAP stream */ +/* {{{ Close an IMAP stream */ PHP_FUNCTION(imap_close) { zval *streamind; @@ -1205,8 +1180,7 @@ PHP_FUNCTION(imap_close) } /* }}} */ -/* {{{ proto array imap_headers(resource stream_id) - Returns headers for all messages in a mailbox */ +/* {{{ Returns headers for all messages in a mailbox */ PHP_FUNCTION(imap_headers) { zval *streamind; @@ -1257,8 +1231,7 @@ PHP_FUNCTION(imap_headers) } /* }}} */ -/* {{{ proto string imap_body(resource stream_id, int msg_no [, int options]) - Read the message body */ +/* {{{ Read the message body */ PHP_FUNCTION(imap_body) { zval *streamind; @@ -1303,8 +1276,7 @@ PHP_FUNCTION(imap_body) } /* }}} */ -/* {{{ proto bool imap_mail_copy(resource stream_id, string msglist, string mailbox [, int options]) - Copy specified message to a mailbox */ +/* {{{ Copy specified message to a mailbox */ PHP_FUNCTION(imap_mail_copy) { zval *streamind; @@ -1329,8 +1301,7 @@ PHP_FUNCTION(imap_mail_copy) } /* }}} */ -/* {{{ proto bool imap_mail_move(resource stream_id, string sequence, string mailbox [, int options]) - Move specified message to a mailbox */ +/* {{{ Move specified message to a mailbox */ PHP_FUNCTION(imap_mail_move) { zval *streamind; @@ -1355,8 +1326,7 @@ PHP_FUNCTION(imap_mail_move) } /* }}} */ -/* {{{ proto bool imap_createmailbox(resource stream_id, string mailbox) - Create a new mailbox */ +/* {{{ Create a new mailbox */ PHP_FUNCTION(imap_createmailbox) { zval *streamind; @@ -1379,8 +1349,7 @@ PHP_FUNCTION(imap_createmailbox) } /* }}} */ -/* {{{ proto bool imap_renamemailbox(resource stream_id, string old_name, string new_name) - Rename a mailbox */ +/* {{{ Rename a mailbox */ PHP_FUNCTION(imap_renamemailbox) { zval *streamind; @@ -1403,8 +1372,7 @@ PHP_FUNCTION(imap_renamemailbox) } /* }}} */ -/* {{{ proto bool imap_deletemailbox(resource stream_id, string mailbox) - Delete a mailbox */ +/* {{{ Delete a mailbox */ PHP_FUNCTION(imap_deletemailbox) { zval *streamind; @@ -1427,8 +1395,7 @@ PHP_FUNCTION(imap_deletemailbox) } /* }}} */ -/* {{{ proto array imap_list(resource stream_id, string ref, string pattern) - Read the list of mailboxes */ +/* {{{ Read the list of mailboxes */ PHP_FUNCTION(imap_list) { zval *streamind; @@ -1465,8 +1432,7 @@ PHP_FUNCTION(imap_list) /* }}} */ -/* {{{ proto array imap_getmailboxes(resource stream_id, string ref, string pattern) - Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */ +/* {{{ Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */ /* Author: CJH */ PHP_FUNCTION(imap_getmailboxes) { @@ -1516,8 +1482,7 @@ PHP_FUNCTION(imap_getmailboxes) } /* }}} */ -/* {{{ proto array imap_listscan(resource stream_id, string ref, string pattern, string content) - Read list of mailboxes containing a certain string */ +/* {{{ Read list of mailboxes containing a certain string */ PHP_FUNCTION(imap_listscan) { zval *streamind; @@ -1551,8 +1516,7 @@ PHP_FUNCTION(imap_listscan) /* }}} */ -/* {{{ proto object imap_check(resource stream_id) - Get mailbox properties */ +/* {{{ Get mailbox properties */ PHP_FUNCTION(imap_check) { zval *streamind; @@ -1585,8 +1549,7 @@ PHP_FUNCTION(imap_check) } /* }}} */ -/* {{{ proto bool imap_delete(resource stream_id, int msg_no [, int options]) - Mark a message for deletion */ +/* {{{ Mark a message for deletion */ PHP_FUNCTION(imap_delete) { zval *streamind, *sequence; @@ -1611,8 +1574,7 @@ PHP_FUNCTION(imap_delete) } /* }}} */ -/* {{{ proto bool imap_undelete(resource stream_id, int msg_no [, int flags]) - Remove the delete flag from a message */ +/* {{{ Remove the delete flag from a message */ PHP_FUNCTION(imap_undelete) { zval *streamind, *sequence; @@ -1637,8 +1599,7 @@ PHP_FUNCTION(imap_undelete) } /* }}} */ -/* {{{ proto object imap_headerinfo(resource stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]]) - Read the headers of the message */ +/* {{{ Read the headers of the message */ PHP_FUNCTION(imap_headerinfo) { zval *streamind; @@ -1722,8 +1683,7 @@ PHP_FUNCTION(imap_headerinfo) } /* }}} */ -/* {{{ proto object imap_rfc822_parse_headers(string headers [, string default_host]) - Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */ +/* {{{ Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */ PHP_FUNCTION(imap_rfc822_parse_headers) { zend_string *headers, *defaulthost = NULL; @@ -1748,8 +1708,7 @@ PHP_FUNCTION(imap_rfc822_parse_headers) /* }}} */ /* KMLANG */ -/* {{{ proto array imap_lsub(resource stream_id, string ref, string pattern) - Return a list of subscribed mailboxes */ +/* {{{ Return a list of subscribed mailboxes */ PHP_FUNCTION(imap_lsub) { zval *streamind; @@ -1785,8 +1744,7 @@ PHP_FUNCTION(imap_lsub) } /* }}} */ -/* {{{ proto array imap_getsubscribed(resource stream_id, string ref, string pattern) - Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */ +/* {{{ Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */ /* Author: CJH */ PHP_FUNCTION(imap_getsubscribed) { @@ -1836,8 +1794,7 @@ PHP_FUNCTION(imap_getsubscribed) } /* }}} */ -/* {{{ proto bool imap_subscribe(resource stream_id, string mailbox) - Subscribe to a mailbox */ +/* {{{ Subscribe to a mailbox */ PHP_FUNCTION(imap_subscribe) { zval *streamind; @@ -1860,8 +1817,7 @@ PHP_FUNCTION(imap_subscribe) } /* }}} */ -/* {{{ proto bool imap_unsubscribe(resource stream_id, string mailbox) - Unsubscribe from a mailbox */ +/* {{{ Unsubscribe from a mailbox */ PHP_FUNCTION(imap_unsubscribe) { zval *streamind; @@ -1884,8 +1840,7 @@ PHP_FUNCTION(imap_unsubscribe) } /* }}} */ -/* {{{ proto object imap_fetchstructure(resource stream_id, int msg_no [, int options]) - Read the full structure of a message */ +/* {{{ Read the full structure of a message */ PHP_FUNCTION(imap_fetchstructure) { zval *streamind; @@ -1934,8 +1889,7 @@ PHP_FUNCTION(imap_fetchstructure) } /* }}} */ -/* {{{ proto string imap_fetchbody(resource stream_id, int msg_no, string section [, int options]) - Get a specific body section */ +/* {{{ Get a specific body section */ PHP_FUNCTION(imap_fetchbody) { zval *streamind; @@ -1976,8 +1930,7 @@ PHP_FUNCTION(imap_fetchbody) /* }}} */ -/* {{{ proto string imap_fetchmime(resource stream_id, int msg_no, string section [, int options]) - Get a specific body section's MIME headers */ +/* {{{ Get a specific body section's MIME headers */ PHP_FUNCTION(imap_fetchmime) { zval *streamind; @@ -2017,8 +1970,7 @@ PHP_FUNCTION(imap_fetchmime) /* }}} */ -/* {{{ proto bool imap_savebody(resource stream_id, string|resource file, int msg_no[, string section = ""[, int options = 0]]) - Save a specific body section to a file */ +/* {{{ Save a specific body section to a file */ PHP_FUNCTION(imap_savebody) { zval *stream, *out; @@ -2074,8 +2026,7 @@ PHP_FUNCTION(imap_savebody) } /* }}} */ -/* {{{ proto string imap_base64(string text) - Decode BASE64 encoded text */ +/* {{{ Decode BASE64 encoded text */ PHP_FUNCTION(imap_base64) { zend_string *text; @@ -2097,8 +2048,7 @@ PHP_FUNCTION(imap_base64) } /* }}} */ -/* {{{ proto string imap_qprint(string text) - Convert a quoted-printable string to an 8-bit string */ +/* {{{ Convert a quoted-printable string to an 8-bit string */ PHP_FUNCTION(imap_qprint) { zend_string *text; @@ -2120,8 +2070,7 @@ PHP_FUNCTION(imap_qprint) } /* }}} */ -/* {{{ proto string imap_8bit(string text) - Convert an 8-bit string to a quoted-printable string */ +/* {{{ Convert an 8-bit string to a quoted-printable string */ PHP_FUNCTION(imap_8bit) { zend_string *text; @@ -2143,8 +2092,7 @@ PHP_FUNCTION(imap_8bit) } /* }}} */ -/* {{{ proto string imap_binary(string text) - Convert an 8bit string to a base64 string */ +/* {{{ Convert an 8bit string to a base64 string */ PHP_FUNCTION(imap_binary) { zend_string *text; @@ -2166,8 +2114,7 @@ PHP_FUNCTION(imap_binary) } /* }}} */ -/* {{{ proto object imap_mailboxmsginfo(resource stream_id) - Returns info about the current mailbox */ +/* {{{ Returns info about the current mailbox */ PHP_FUNCTION(imap_mailboxmsginfo) { zval *streamind; @@ -2212,8 +2159,7 @@ PHP_FUNCTION(imap_mailboxmsginfo) } /* }}} */ -/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal) - Returns a properly formatted email address given the mailbox, host, and personal info */ +/* {{{ Returns a properly formatted email address given the mailbox, host, and personal info */ PHP_FUNCTION(imap_rfc822_write_address) { zend_string *mailbox, *host, *personal; @@ -2251,8 +2197,7 @@ PHP_FUNCTION(imap_rfc822_write_address) } /* }}} */ -/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host) - Parses an address string */ +/* {{{ Parses an address string */ PHP_FUNCTION(imap_rfc822_parse_adrlist) { zval tovals; @@ -2297,8 +2242,7 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist) } /* }}} */ -/* {{{ proto string imap_utf8(string mime_encoded_text) - Convert a mime-encoded text to UTF-8 */ +/* {{{ Convert a mime-encoded text to UTF-8 */ PHP_FUNCTION(imap_utf8) { zend_string *str; @@ -2350,8 +2294,7 @@ PHP_FUNCTION(imap_utf8) (c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4) /* }}} */ -/* {{{ proto string imap_utf7_decode(string buf) - Decode a modified UTF-7 string */ +/* {{{ Decode a modified UTF-7 string */ PHP_FUNCTION(imap_utf7_decode) { /* author: Andrew Skalski <askalski@chek.com> */ @@ -2489,8 +2432,7 @@ PHP_FUNCTION(imap_utf7_decode) } /* }}} */ -/* {{{ proto string imap_utf7_encode(string buf) - Encode a string in modified UTF-7 */ +/* {{{ Encode a string in modified UTF-7 */ PHP_FUNCTION(imap_utf7_encode) { /* author: Andrew Skalski <askalski@chek.com> */ @@ -2633,16 +2575,14 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ } /* }}} */ -/* {{{ proto string imap_utf8_to_mutf7(string in) - Encode a UTF-8 string to modified UTF-7 */ +/* {{{ Encode a UTF-8 string to modified UTF-7 */ PHP_FUNCTION(imap_utf8_to_mutf7) { php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string imap_mutf7_to_utf8(string in) - Decode a modified UTF-7 string to UTF-8 */ +/* {{{ Decode a modified UTF-7 string to UTF-8 */ PHP_FUNCTION(imap_mutf7_to_utf8) { php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -2650,8 +2590,7 @@ PHP_FUNCTION(imap_mutf7_to_utf8) /* }}} */ #endif -/* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, string flag [, int options]) - Sets flags on messages */ +/* {{{ Sets flags on messages */ PHP_FUNCTION(imap_setflag_full) { zval *streamind; @@ -2672,8 +2611,7 @@ PHP_FUNCTION(imap_setflag_full) } /* }}} */ -/* {{{ proto bool imap_clearflag_full(resource stream_id, string sequence, string flag [, int options]) - Clears flags on messages */ +/* {{{ Clears flags on messages */ PHP_FUNCTION(imap_clearflag_full) { zval *streamind; @@ -2695,8 +2633,7 @@ PHP_FUNCTION(imap_clearflag_full) } /* }}} */ -/* {{{ proto array imap_sort(resource stream_id, int criteria, int reverse [, int options [, string search_criteria [, string charset]]]) - Sort an array of message headers, optionally including only messages that meet specified criteria. */ +/* {{{ Sort an array of message headers, optionally including only messages that meet specified criteria. */ PHP_FUNCTION(imap_sort) { zval *streamind; @@ -2756,8 +2693,7 @@ PHP_FUNCTION(imap_sort) } /* }}} */ -/* {{{ proto string imap_fetchheader(resource stream_id, int msg_no [, int options]) - Get the full unfiltered header for a message */ +/* {{{ Get the full unfiltered header for a message */ PHP_FUNCTION(imap_fetchheader) { zval *streamind; @@ -2793,8 +2729,7 @@ PHP_FUNCTION(imap_fetchheader) } /* }}} */ -/* {{{ proto int imap_uid(resource stream_id, int msg_no) - Get the unique message id associated with a standard sequential message number */ +/* {{{ Get the unique message id associated with a standard sequential message number */ PHP_FUNCTION(imap_uid) { zval *streamind; @@ -2820,8 +2755,7 @@ PHP_FUNCTION(imap_uid) } /* }}} */ -/* {{{ proto int imap_msgno(resource stream_id, int unique_msg_id) - Get the sequence number associated with a UID */ +/* {{{ Get the sequence number associated with a UID */ PHP_FUNCTION(imap_msgno) { zval *streamind; @@ -2840,8 +2774,7 @@ PHP_FUNCTION(imap_msgno) } /* }}} */ -/* {{{ proto object imap_status(resource stream_id, string mailbox, int options) - Get status info from a mailbox */ +/* {{{ Get status info from a mailbox */ PHP_FUNCTION(imap_status) { zval *streamind; @@ -2882,8 +2815,7 @@ PHP_FUNCTION(imap_status) } /* }}} */ -/* {{{ proto object imap_bodystruct(resource stream_id, int msg_no, string section) - Read the structure of a specified body section of a specific message */ +/* {{{ Read the structure of a specified body section of a specific message */ PHP_FUNCTION(imap_bodystruct) { zval *streamind; @@ -2995,8 +2927,7 @@ PHP_FUNCTION(imap_bodystruct) /* }}} */ -/* {{{ proto array imap_fetch_overview(resource stream_id, string sequence [, int options]) - Read an overview of the information in the headers of the given message sequence */ +/* {{{ Read an overview of the information in the headers of the given message sequence */ PHP_FUNCTION(imap_fetch_overview) { zval *streamind; @@ -3081,8 +3012,7 @@ PHP_FUNCTION(imap_fetch_overview) } /* }}} */ -/* {{{ proto string imap_mail_compose(array envelope, array body) - Create a MIME message based on given envelope and body sections */ +/* {{{ Create a MIME message based on given envelope and body sections */ PHP_FUNCTION(imap_mail_compose) { zval *envelope, *body; @@ -3479,8 +3409,7 @@ done: } /* }}} */ -/* {{{ _php_imap_mail - */ +/* {{{ _php_imap_mail */ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath) { #ifdef PHP_WIN32 @@ -3639,8 +3568,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * } /* }}} */ -/* {{{ proto bool imap_mail(string to, string subject, string message [, string additional_headers [, string cc [, string bcc [, string rpath]]]]) - Send an email message */ +/* {{{ Send an email message */ PHP_FUNCTION(imap_mail) { zend_string *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL; @@ -3678,8 +3606,7 @@ PHP_FUNCTION(imap_mail) } /* }}} */ -/* {{{ proto array imap_search(resource stream_id, string criteria [, int options [, string charset]]) - Return a list of messages matching the given criteria */ +/* {{{ Return a list of messages matching the given criteria */ PHP_FUNCTION(imap_search) { zval *streamind; @@ -3727,8 +3654,7 @@ PHP_FUNCTION(imap_search) } /* }}} */ -/* {{{ proto array imap_alerts(void) - Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. */ +/* {{{ Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. */ /* Author: CJH */ PHP_FUNCTION(imap_alerts) { @@ -3754,8 +3680,7 @@ PHP_FUNCTION(imap_alerts) } /* }}} */ -/* {{{ proto array imap_errors(void) - Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called. */ +/* {{{ Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called. */ /* Author: CJH */ PHP_FUNCTION(imap_errors) { @@ -3781,8 +3706,7 @@ PHP_FUNCTION(imap_errors) } /* }}} */ -/* {{{ proto string imap_last_error(void) - Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */ +/* {{{ Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */ /* Author: CJH */ PHP_FUNCTION(imap_last_error) { @@ -3806,8 +3730,7 @@ PHP_FUNCTION(imap_last_error) } /* }}} */ -/* {{{ proto array imap_mime_header_decode(string str) - Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */ +/* {{{ Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */ PHP_FUNCTION(imap_mime_header_decode) { /* Author: Ted Parnefors <ted@mtv.se> */ @@ -3904,8 +3827,7 @@ PHP_FUNCTION(imap_mime_header_decode) /* Support Functions */ #ifdef HAVE_RFC822_OUTPUT_ADDRESS_LIST -/* {{{ _php_rfc822_soutr - */ +/* {{{ _php_rfc822_soutr */ static long _php_rfc822_soutr (void *stream, char *string) { smart_str *ret = (smart_str*)stream; @@ -3916,8 +3838,7 @@ static long _php_rfc822_soutr (void *stream, char *string) } /* }}} */ -/* {{{ _php_rfc822_write_address - */ +/* {{{ _php_rfc822_write_address */ static zend_string* _php_rfc822_write_address(ADDRESS *addresslist) { char address[MAILTMPLEN]; @@ -3967,8 +3888,7 @@ static int _php_rfc822_len(char *str) } /* }}} */ -/* {{{ _php_imap_get_address_size - */ +/* {{{ _php_imap_get_address_size */ static int _php_imap_address_size (ADDRESS *addresslist) { ADDRESS *tmp; @@ -3996,8 +3916,7 @@ static int _php_imap_address_size (ADDRESS *addresslist) /* }}} */ -/* {{{ _php_rfc822_write_address - */ +/* {{{ _php_rfc822_write_address */ static zend_string* _php_rfc822_write_address(ADDRESS *addresslist) { char address[SENDBUFLEN]; @@ -4012,8 +3931,7 @@ static zend_string* _php_rfc822_write_address(ADDRESS *addresslist) } /* }}} */ #endif -/* {{{ _php_imap_parse_address - */ +/* {{{ _php_imap_parse_address */ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress) { zend_string *fulladdress; @@ -4037,8 +3955,7 @@ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddres } /* }}} */ -/* {{{ _php_make_header_object - */ +/* {{{ _php_make_header_object */ static void _php_make_header_object(zval *myzvalue, ENVELOPE *en) { zval paddress; @@ -4122,8 +4039,7 @@ static void _php_make_header_object(zval *myzvalue, ENVELOPE *en) } /* }}} */ -/* {{{ _php_imap_add_body - */ +/* {{{ _php_imap_add_body */ void _php_imap_add_body(zval *arg, BODY *body) { zval parametres, param, dparametres, dparam; @@ -4236,8 +4152,7 @@ void _php_imap_add_body(zval *arg, BODY *body) /* }}} */ /* imap_thread, stealing this from header cclient -rjs3 */ -/* {{{ build_thread_tree_helper - */ +/* {{{ build_thread_tree_helper */ static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes, char *buf) { unsigned long thisNode = *numNodes; @@ -4267,8 +4182,7 @@ static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes } /* }}} */ -/* {{{ build_thread_tree - */ +/* {{{ build_thread_tree */ static int build_thread_tree(THREADNODE *top, zval **tree) { long numNodes = 0; @@ -4282,8 +4196,7 @@ static int build_thread_tree(THREADNODE *top, zval **tree) } /* }}} */ -/* {{{ proto array imap_thread(resource stream_id [, int options]) - Return threaded by REFERENCES tree */ +/* {{{ Return threaded by REFERENCES tree */ PHP_FUNCTION(imap_thread) { zval *streamind; @@ -4322,8 +4235,7 @@ PHP_FUNCTION(imap_thread) } /* }}} */ -/* {{{ proto mixed imap_timeout(int timeout_type [, int timeout]) - Set or fetch imap timeout */ +/* {{{ Set or fetch imap timeout */ PHP_FUNCTION(imap_timeout) { zend_long ttype, timeout=-1; @@ -4425,8 +4337,7 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA } /* }}} */ -/* {{{ Interfaces to C-client - */ +/* {{{ Interfaces to C-client */ PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number) { MESSAGELIST *cur = NIL; diff --git a/ext/intl/collator/collator_attr.c b/ext/intl/collator/collator_attr.c index d318d0f3ca..e023228687 100644 --- a/ext/intl/collator/collator_attr.c +++ b/ext/intl/collator/collator_attr.c @@ -23,11 +23,7 @@ #include <unicode/ustring.h> -/* {{{ proto int Collator::getAttribute( int $attr ) - * Get collation attribute value. }}} */ -/* {{{ proto int collator_get_attribute( Collator $coll, int $attr ) - * Get collation attribute value. - */ +/* {{{ Get collation attribute value. */ PHP_FUNCTION( collator_get_attribute ) { zend_long attribute, value; @@ -51,11 +47,7 @@ PHP_FUNCTION( collator_get_attribute ) } /* }}} */ -/* {{{ proto bool Collator::getAttribute( int $attr ) - * Get collation attribute value. }}} */ -/* {{{ proto bool collator_set_attribute( Collator $coll, int $attr, int $val ) - * Set collation attribute. - */ +/* {{{ Set collation attribute. */ PHP_FUNCTION( collator_set_attribute ) { zend_long attribute, value; @@ -80,11 +72,7 @@ PHP_FUNCTION( collator_set_attribute ) } /* }}} */ -/* {{{ proto int Collator::getStrength() - * Returns the current collation strength. }}} */ -/* {{{ proto int collator_get_strength(Collator coll) - * Returns the current collation strength. - */ +/* {{{ Returns the current collation strength. */ PHP_FUNCTION( collator_get_strength ) { COLLATOR_METHOD_INIT_VARS @@ -104,11 +92,7 @@ PHP_FUNCTION( collator_get_strength ) } /* }}} */ -/* {{{ proto bool Collator::setStrength(int strength) - * Set the collation strength. }}} */ -/* {{{ proto bool collator_set_strength(Collator coll, int strength) - * Set the collation strength. - */ +/* {{{ Set the collation strength. */ PHP_FUNCTION( collator_set_strength ) { zend_long strength; diff --git a/ext/intl/collator/collator_compare.c b/ext/intl/collator/collator_compare.c index a5d125652a..cdc0ea569f 100644 --- a/ext/intl/collator/collator_compare.c +++ b/ext/intl/collator/collator_compare.c @@ -21,11 +21,7 @@ #include "collator_class.h" #include "intl_convert.h" -/* {{{ proto int Collator::compare( string $str1, string $str2 ) - * Compare two strings. }}} */ -/* {{{ proto int collator_compare( Collator $coll, string $str1, string $str2 ) - * Compare two strings. - */ +/* {{{ Compare two strings. */ PHP_FUNCTION( collator_compare ) { char* str1 = NULL; diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c index e3cf17060a..4a57489990 100644 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c @@ -52,9 +52,7 @@ static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto Collator collator_create( string $locale ) - * Create collator. - */ +/* {{{ Create collator. */ PHP_FUNCTION( collator_create ) { object_init_ex( return_value, Collator_ce_ptr ); @@ -65,9 +63,7 @@ PHP_FUNCTION( collator_create ) } /* }}} */ -/* {{{ proto Collator::__construct( string $locale ) - * Collator object constructor. - */ +/* {{{ Collator object constructor. */ PHP_METHOD( Collator, __construct ) { zend_error_handling error_handling; diff --git a/ext/intl/collator/collator_error.c b/ext/intl/collator/collator_error.c index a32cb183b8..3ceb41e32d 100644 --- a/ext/intl/collator/collator_error.c +++ b/ext/intl/collator/collator_error.c @@ -20,11 +20,7 @@ #include "php_intl.h" #include "collator_class.h" -/* {{{ proto int Collator::getErrorCode( Collator $coll ) - * Get collator's last error code. }}} */ -/* {{{ proto int collator_get_error_code( Collator $coll ) - * Get collator's last error code. - */ +/* {{{ Get collator's last error code. */ PHP_FUNCTION( collator_get_error_code ) { COLLATOR_METHOD_INIT_VARS @@ -46,11 +42,7 @@ PHP_FUNCTION( collator_get_error_code ) } /* }}} */ -/* {{{ proto string Collator::getErrorMessage( Collator $coll ) - * Get text description for collator's last error code. }}} */ -/* {{{ proto string collator_get_error_message( Collator $coll ) - * Get text description for collator's last error code. - */ +/* {{{ Get text description for collator's last error code. */ PHP_FUNCTION( collator_get_error_message ) { zend_string* message = NULL; diff --git a/ext/intl/collator/collator_locale.c b/ext/intl/collator/collator_locale.c index 4a138f8a46..bf797f5e42 100644 --- a/ext/intl/collator/collator_locale.c +++ b/ext/intl/collator/collator_locale.c @@ -23,11 +23,7 @@ #include <zend_API.h> -/* {{{ proto string Collator::getLocale( int $type ) - * Gets the locale name of the collator. }}} */ -/* {{{ proto string collator_get_locale( Collator $coll, int $type ) - * Gets the locale name of the collator. - */ +/* {{{ Gets the locale name of the collator. */ PHP_FUNCTION( collator_get_locale ) { zend_long type = 0; diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index e7349247d5..92ca0dc132 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -326,11 +326,7 @@ static void collator_sort_internal( int renumber, INTERNAL_FUNCTION_PARAMETERS ) } /* }}} */ -/* {{{ proto bool Collator::sort( Collator $coll, array(string) $arr [, int $sort_flags] ) - * Sort array using specified collator. }}} */ -/* {{{ proto bool collator_sort( Collator $coll, array(string) $arr [, int $sort_flags] ) - * Sort array using specified collator. - */ +/* {{{ Sort array using specified collator. */ PHP_FUNCTION( collator_sort ) { collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); @@ -346,11 +342,9 @@ static void collator_sortkey_swap(collator_sort_key_index_t *p, collator_sort_ke } /* }}} */ -/* {{{ proto bool Collator::sortWithSortKeys( Collator $coll, array(string) $arr ) - * Equivalent to standard PHP sort using Collator. +/* {{{ Equivalent to standard PHP sort using Collator. * Uses ICU ucol_getSortKey for performance. }}} */ -/* {{{ proto bool collator_sort_with_sort_keys( Collator $coll, array(string) $arr ) - * Equivalent to standard PHP sort using Collator. +/* {{{ Equivalent to standard PHP sort using Collator. * Uses ICU ucol_getSortKey for performance. */ PHP_FUNCTION( collator_sort_with_sort_keys ) @@ -517,21 +511,14 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) } /* }}} */ -/* {{{ proto bool Collator::asort( Collator $coll, array(string) $arr ) - * Sort array using specified collator, maintaining index association. }}} */ -/* {{{ proto bool collator_asort( Collator $coll, array(string) $arr ) - * Sort array using specified collator, maintaining index association. - */ +/* {{{ Sort array using specified collator, maintaining index association. */ PHP_FUNCTION( collator_asort ) { collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto bool Collator::getSortKey( Collator $coll, string $str ) - * Get a sort key for a string from a Collator. }}} */ -/* {{{ proto bool collator_get_sort_key( Collator $coll, string $str ) - * Get a sort key for a string from a Collator. */ +/* {{{ Get a sort key for a string from a Collator. */ PHP_FUNCTION( collator_get_sort_key ) { char* str = NULL; diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index af239d6e2c..ff6ae05c4f 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -21,9 +21,7 @@ #include "intl_error.h" #include "common_error.h" -/* {{{ proto int intl_get_error_code() - * Get code of the last occurred error. - */ +/* {{{ Get code of the last occurred error. */ PHP_FUNCTION( intl_get_error_code ) { if (zend_parse_parameters_none() == FAILURE) { @@ -34,9 +32,7 @@ PHP_FUNCTION( intl_get_error_code ) } /* }}} */ -/* {{{ proto string intl_get_error_message() - * Get text description of the last occurred error. - */ +/* {{{ Get text description of the last occurred error. */ PHP_FUNCTION( intl_get_error_message ) { if (zend_parse_parameters_none() == FAILURE) { @@ -47,8 +43,7 @@ PHP_FUNCTION( intl_get_error_message ) } /* }}} */ -/* {{{ proto bool intl_is_failure() - * Check whether the given error code indicates a failure. +/* {{{ Check whether the given error code indicates a failure. * Returns true if it does, and false if the code * indicates success or a warning. */ @@ -67,8 +62,7 @@ PHP_FUNCTION( intl_is_failure ) } /* }}} */ -/* {{{ proto string intl_error_name() - * Return a string for a given error code. +/* {{{ Return a string for a given error code. * The string will be the same as the name of the error code constant. */ PHP_FUNCTION( intl_error_name ) diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c index 1d84aba453..e6acf4d4b7 100644 --- a/ext/intl/converter/converter.c +++ b/ext/intl/converter/converter.c @@ -103,9 +103,7 @@ static void php_converter_default_callback(zval *return_value, zval *zobj, zend_ } /* }}} */ -/* {{{ proto void UConverter::toUCallback(int $reason, - string $source, string $codeUnits, - int &$error) */ +/* {{{ */ PHP_METHOD(UConverter, toUCallback) { zend_long reason; zend_string *source, *codeUnits; @@ -120,9 +118,7 @@ PHP_METHOD(UConverter, toUCallback) { } /* }}} */ -/* {{{ proto void UConverter::fromUCallback(int $reason, - array $source, int $codePoint, - int &$error) */ +/* {{{ */ PHP_METHOD(UConverter, fromUCallback) { zend_long reason; zval *source, *error; @@ -418,14 +414,14 @@ static void php_converter_do_set_encoding(UConverter **pcnv, INTERNAL_FUNCTION_P } /* }}} */ -/* {{{ proto bool UConverter::setSourceEncoding(string encoding) */ +/* {{{ */ PHP_METHOD(UConverter, setSourceEncoding) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_set_encoding(&(objval->src), INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto bool UConverter::setDestinationEncoding(string encoding) */ +/* {{{ */ PHP_METHOD(UConverter, setDestinationEncoding) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_set_encoding(&(objval->dest), INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -456,14 +452,14 @@ static void php_converter_do_get_encoding(php_converter_object *objval, UConvert } /* }}} */ -/* {{{ proto string UConverter::getSourceEncoding() */ +/* {{{ */ PHP_METHOD(UConverter, getSourceEncoding) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_get_encoding(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto string UConverter::getDestinationEncoding() */ +/* {{{ */ PHP_METHOD(UConverter, getDestinationEncoding) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_get_encoding(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -493,14 +489,14 @@ static void php_converter_do_get_type(php_converter_object *objval, UConverter * } /* }}} */ -/* {{{ proto int UConverter::getSourceType() */ +/* {{{ */ PHP_METHOD(UConverter, getSourceType) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_get_type(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto int UConverter::getDestinationType() */ +/* {{{ */ PHP_METHOD(UConverter, getDestinationType) { php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_do_get_type(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -531,7 +527,7 @@ static void php_converter_resolve_callback(zval *zobj, } /* }}} */ -/* {{{ proto UConverter::__construct([string dest = 'utf-8',[string src = 'utf-8']]) */ +/* {{{ */ PHP_METHOD(UConverter, __construct) { php_converter_object *objval = CONV_GET(ZEND_THIS); char *src = "utf-8"; @@ -552,7 +548,7 @@ PHP_METHOD(UConverter, __construct) { } /* }}} */ -/* {{{ proto bool UConverter::setSubstChars(string $chars) */ +/* {{{ */ PHP_METHOD(UConverter, setSubstChars) { php_converter_object *objval = CONV_GET(ZEND_THIS); char *chars; @@ -592,7 +588,7 @@ PHP_METHOD(UConverter, setSubstChars) { } /* }}} */ -/* {{{ proto string UConverter::getSubstChars() */ +/* {{{ */ PHP_METHOD(UConverter, getSubstChars) { php_converter_object *objval = CONV_GET(ZEND_THIS); char chars[127]; @@ -679,7 +675,7 @@ static zend_string* php_converter_do_convert(UConverter *dest_cnv, } /* }}} */ -/* {{{ proto string UConverter::reasonText(int reason) */ +/* {{{ */ #define UCNV_REASON_CASE(v) case (UCNV_ ## v) : RETURN_STRINGL( "REASON_" #v , sizeof( "REASON_" #v ) - 1); PHP_METHOD(UConverter, reasonText) { zend_long reason; @@ -703,7 +699,7 @@ PHP_METHOD(UConverter, reasonText) { } /* }}} */ -/* {{{ proto string UConverter::convert(string str[, bool reverse]) */ +/* {{{ */ PHP_METHOD(UConverter, convert) { php_converter_object *objval = CONV_GET(ZEND_THIS); char *str; @@ -729,7 +725,7 @@ PHP_METHOD(UConverter, convert) { } /* }}} */ -/* {{{ proto string UConverter::transcode(string $str, string $toEncoding, string $fromEncoding[, Array $options = array()]) */ +/* {{{ */ PHP_METHOD(UConverter, transcode) { char *str, *src, *dest; size_t str_len, src_len, dest_len; @@ -786,7 +782,7 @@ PHP_METHOD(UConverter, transcode) { } /* }}} */ -/* {{{ proto int UConverter::getErrorCode() */ +/* {{{ */ PHP_METHOD(UConverter, getErrorCode) { php_converter_object *objval = CONV_GET(ZEND_THIS); @@ -798,7 +794,7 @@ PHP_METHOD(UConverter, getErrorCode) { } /* }}} */ -/* {{{ proto string UConverter::getErrorMessage() */ +/* {{{ */ PHP_METHOD(UConverter, getErrorMessage) { php_converter_object *objval = CONV_GET(ZEND_THIS); zend_string *message = intl_error_get_message(&(objval->error)); @@ -815,7 +811,7 @@ PHP_METHOD(UConverter, getErrorMessage) { } /* }}} */ -/* {{{ proto array UConverter::getAvailable() */ +/* {{{ */ PHP_METHOD(UConverter, getAvailable) { int32_t i, count = ucnv_countAvailable(); @@ -833,7 +829,7 @@ PHP_METHOD(UConverter, getAvailable) { } /* }}} */ -/* {{{ proto array UConverter::getAliases(string name) */ +/* {{{ */ PHP_METHOD(UConverter, getAliases) { char *name; size_t name_len; @@ -867,7 +863,7 @@ PHP_METHOD(UConverter, getAliases) { } /* }}} */ -/* {{{ proto array UConverter::getStandards() */ +/* {{{ */ PHP_METHOD(UConverter, getStandards) { uint16_t i, count; diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c index 10d9dde96e..a1915dbd30 100644 --- a/ext/intl/dateformat/dateformat.c +++ b/ext/intl/dateformat/dateformat.c @@ -66,11 +66,7 @@ void dateformat_register_constants( INIT_FUNC_ARGS ) } /* }}} */ -/* {{{ proto int IntlDateFormatter::getErrorCode() - * Get formatter's last error code. }}} */ -/* {{{ proto int datefmt_get_error_code( IntlDateFormatter $nf ) - * Get formatter's last error code. - */ +/* {{{ Get formatter's last error code. */ PHP_FUNCTION( datefmt_get_error_code ) { DATE_FORMAT_METHOD_INIT_VARS; @@ -89,11 +85,7 @@ PHP_FUNCTION( datefmt_get_error_code ) } /* }}} */ -/* {{{ proto string IntlDateFormatter::getErrorMessage( ) - * Get text description for formatter's last error code. }}} */ -/* {{{ proto string datefmt_get_error_message( IntlDateFormatter $coll ) - * Get text description for formatter's last error code. - */ +/* {{{ Get text description for formatter's last error code. */ PHP_FUNCTION( datefmt_get_error_message ) { zend_string *message = NULL; diff --git a/ext/intl/dateformat/dateformat_attr.c b/ext/intl/dateformat/dateformat_attr.c index 9c7b053b75..7f67afe5b3 100644 --- a/ext/intl/dateformat/dateformat_attr.c +++ b/ext/intl/dateformat/dateformat_attr.c @@ -23,11 +23,7 @@ #include <unicode/ustring.h> #include <unicode/udat.h> -/* {{{ proto unicode IntlDateFormatter::getDateType( ) - * Get formatter datetype. }}} */ -/* {{{ proto string datefmt_get_datetype( IntlDateFormatter $mf ) - * Get formatter datetype. - */ +/* {{{ Get formatter datetype. */ PHP_FUNCTION( datefmt_get_datetype ) { DATE_FORMAT_METHOD_INIT_VARS; @@ -47,11 +43,7 @@ PHP_FUNCTION( datefmt_get_datetype ) } /* }}} */ -/* {{{ proto unicode IntlDateFormatter::getTimeType( ) - * Get formatter timetype. }}} */ -/* {{{ proto string datefmt_get_timetype( IntlDateFormatter $mf ) - * Get formatter timetype. - */ +/* {{{ Get formatter timetype. */ PHP_FUNCTION( datefmt_get_timetype ) { DATE_FORMAT_METHOD_INIT_VARS; @@ -71,11 +63,7 @@ PHP_FUNCTION( datefmt_get_timetype ) } /* }}} */ -/* {{{ proto string IntlDateFormatter::getPattern( ) - * Get formatter pattern. }}} */ -/* {{{ proto string datefmt_get_pattern( IntlDateFormatter $mf ) - * Get formatter pattern. - */ +/* {{{ Get formatter pattern. */ PHP_FUNCTION( datefmt_get_pattern ) { UChar value_buf[64]; @@ -111,11 +99,7 @@ PHP_FUNCTION( datefmt_get_pattern ) } /* }}} */ -/* {{{ proto bool IntlDateFormatter::setPattern( string $pattern ) - * Set formatter pattern. }}} */ -/* {{{ proto bool datefmt_set_pattern( IntlDateFormatter $mf, string $pattern ) - * Set formatter pattern. - */ +/* {{{ Set formatter pattern. */ PHP_FUNCTION( datefmt_set_pattern ) { char* value = NULL; @@ -151,11 +135,7 @@ PHP_FUNCTION( datefmt_set_pattern ) } /* }}} */ -/* {{{ proto string IntlDateFormatter::getLocale() - * Get formatter locale. }}} */ -/* {{{ proto string datefmt_get_locale(IntlDateFormatter $mf) - * Get formatter locale. - */ +/* {{{ Get formatter locale. */ PHP_FUNCTION( datefmt_get_locale ) { char *loc; @@ -180,11 +160,7 @@ PHP_FUNCTION( datefmt_get_locale ) } /* }}} */ -/* {{{ proto string IntlDateFormatter::isLenient() - * Get formatter isLenient. }}} */ -/* {{{ proto string datefmt_isLenient(IntlDateFormatter $mf) - * Get formatter locale. - */ +/* {{{ Get formatter isLenient. */ PHP_FUNCTION( datefmt_is_lenient ) { @@ -205,11 +181,7 @@ PHP_FUNCTION( datefmt_is_lenient ) } /* }}} */ -/* {{{ proto void IntlDateFormatter::setLenient() - * Set formatter lenient. }}} */ -/* {{{ proto void datefmt_setLenient(IntlDateFormatter $mf) - * Set formatter lenient. - */ +/* {{{ Set formatter lenient. */ PHP_FUNCTION( datefmt_set_lenient ) { zend_bool isLenient = FALSE; diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp index adf4759e79..fdf61d8500 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.cpp +++ b/ext/intl/dateformat/dateformat_attrcpp.cpp @@ -34,11 +34,7 @@ static inline DateFormat *fetch_datefmt(IntlDateFormatter_object *dfo) { return (DateFormat *)dfo->datef_data.udatf; } -/* {{{ proto string IntlDateFormatter::getTimeZoneId() - * Get formatter timezone_id. }}} */ -/* {{{ proto string datefmt_get_timezone_id(IntlDateFormatter $mf) - * Get formatter timezone_id. - */ +/* {{{ Get formatter timezone_id. */ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id) { zend_string *u8str; @@ -59,11 +55,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id) RETVAL_STR(u8str); } -/* {{{ proto IntlTimeZone IntlDateFormatter::getTimeZone() - * Get formatter timezone. }}} */ -/* {{{ proto IntlTimeZone datefmt_get_timezone(IntlDateFormatter $mf) - * Get formatter timezone. - */ +/* {{{ Get formatter timezone. */ U_CFUNC PHP_FUNCTION(datefmt_get_timezone) { DATE_FORMAT_METHOD_INIT_VARS; @@ -87,8 +79,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone) timezone_object_construct(tz_clone, return_value, 1); } -/* {{{ proto boolean IntlDateFormatter::setTimeZone(mixed $timezone) - * Set formatter's timezone. */ +/* {{{ Set formatter's timezone. */ U_CFUNC PHP_FUNCTION(datefmt_set_timezone) { zval *timezone_zv; @@ -112,11 +103,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_timezone) fetch_datefmt(dfo)->adoptTimeZone(timezone); } -/* {{{ proto int IntlDateFormatter::getCalendar( ) - * Get formatter calendar type. }}} */ -/* {{{ proto int datefmt_get_calendar(IntlDateFormatter $mf) - * Get formatter calendar type. - */ +/* {{{ Get formatter calendar type. */ U_CFUNC PHP_FUNCTION(datefmt_get_calendar) { DATE_FORMAT_METHOD_INIT_VARS; @@ -137,11 +124,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar) } /* }}} */ -/* {{{ proto IntlCalendar IntlDateFormatter::getCalendarObject() - * Get formatter calendar. }}} */ -/* {{{ proto IntlCalendar datefmt_get_calendar_object(IntlDateFormatter $mf) - * Get formatter calendar. - */ +/* {{{ Get formatter calendar. */ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object) { DATE_FORMAT_METHOD_INIT_VARS; @@ -170,11 +153,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object) } /* }}} */ -/* {{{ proto bool IntlDateFormatter::setCalendar(mixed $calendar) - * Set formatter's calendar. }}} */ -/* {{{ proto bool datefmt_set_calendar(IntlDateFormatter $mf, mixed $calendar) - * Set formatter's calendar. - */ +/* {{{ Set formatter's calendar. */ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) { zval *calendar_zv; diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp index eddc248d09..a75719c0f4 100644 --- a/ext/intl/dateformat/dateformat_create.cpp +++ b/ext/intl/dateformat/dateformat_create.cpp @@ -179,11 +179,7 @@ error: } /* }}} */ -/* {{{ proto IntlDateFormatter IntlDateFormatter::create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern] ) - * Create formatter. }}} */ -/* {{{ proto IntlDateFormatter datefmt_create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern) - * Create formatter. - */ +/* {{{ Create formatter. */ U_CFUNC PHP_FUNCTION( datefmt_create ) { object_init_ex( return_value, IntlDateFormatter_ce_ptr ); @@ -194,9 +190,7 @@ U_CFUNC PHP_FUNCTION( datefmt_create ) } /* }}} */ -/* {{{ proto void IntlDateFormatter::__construct(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern]) - * IntlDateFormatter object constructor. - */ +/* {{{ IntlDateFormatter object constructor. */ U_CFUNC PHP_METHOD( IntlDateFormatter, __construct ) { zend_error_handling error_handling; diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c index 4b1b520844..82d25a1481 100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c @@ -27,9 +27,7 @@ #include "dateformat_class.h" #include "dateformat_data.h" -/* {{{ - * Internal function which calls the udat_format -*/ +/* {{{ * Internal function which calls the udat_format */ static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval *return_value) { UChar* formatted = NULL; @@ -54,9 +52,7 @@ static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval /* }}} */ -/* {{{ - * Internal function which fetches an element from the passed array for the key_name passed -*/ +/* {{{ * Internal function which fetches an element from the passed array for the key_name passed */ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo, HashTable* hash_arr, char* key_name, intl_error *err) { @@ -92,9 +88,7 @@ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo, } /* }}} */ -/* {{{ - * Internal function which sets UCalendar from the passed array and retrieves timestamp -*/ +/* {{{ * Internal function which sets UCalendar from the passed array and retrieves timestamp */ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo, HashTable *hash_arr) { @@ -143,10 +137,7 @@ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo, } -/* {{{ proto string IntlDateFormatter::format( [mixed]int $args or array $args ) - * Format the time value as a string. }}}*/ -/* {{{ proto string datefmt_format( [mixed]int $args or array $args ) - * Format the time value as a string. }}}*/ +/* {{{ Format the time value as a string. */ PHP_FUNCTION(datefmt_format) { UDate timestamp = 0; diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c index d63cce999d..17217a7923 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -75,9 +75,7 @@ static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_va } } -/* {{{ - * Internal function which calls the udat_parseCalendar -*/ +/* {{{ * Internal function which calls the udat_parseCalendar */ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* text_to_parse, size_t text_len, int32_t *parse_pos, zval *return_value) { UCalendar *parsed_calendar = NULL; @@ -118,10 +116,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex /* }}} */ -/* {{{ proto int IntlDateFormatter::parse( string $text_to_parse [, int $parse_pos] ) - * Parse the string $value starting at parse_pos to a Unix timestamp -int }}}*/ -/* {{{ proto int datefmt_parse( IntlDateFormatter $fmt, string $text_to_parse [, int $parse_pos] ) - * Parse the string $value starting at parse_pos to a Unix timestamp -int }}}*/ +/* {{{ Parse the string $value starting at parse_pos to a Unix timestamp -int */ PHP_FUNCTION(datefmt_parse) { char* text_to_parse = NULL; @@ -162,10 +157,7 @@ PHP_FUNCTION(datefmt_parse) } /* }}} */ -/* {{{ proto int IntlDateFormatter::localtime( string $text_to_parse[, int $parse_pos] ) - * Parse the string $value to a localtime array }}}*/ -/* {{{ proto int datefmt_localtime( IntlDateFormatter $fmt, string $text_to_parse[, int $parse_pos ]) - * Parse the string $value to a localtime array }}}*/ +/* {{{ Parse the string $value to a localtime array */ PHP_FUNCTION(datefmt_localtime) { char* text_to_parse = NULL; diff --git a/ext/intl/formatter/formatter_attr.c b/ext/intl/formatter/formatter_attr.c index d0f42e6890..44a2bb15ff 100644 --- a/ext/intl/formatter/formatter_attr.c +++ b/ext/intl/formatter/formatter_attr.c @@ -22,11 +22,7 @@ #include <unicode/ustring.h> -/* {{{ proto mixed NumberFormatter::getAttribute( int $attr ) - * Get formatter attribute value. }}} */ -/* {{{ proto mixed numfmt_get_attribute( NumberFormatter $nf, int $attr ) - * Get formatter attribute value. - */ +/* {{{ Get formatter attribute value. */ PHP_FUNCTION( numfmt_get_attribute ) { zend_long attribute, value; @@ -88,11 +84,7 @@ PHP_FUNCTION( numfmt_get_attribute ) } /* }}} */ -/* {{{ proto string NumberFormatter::getTextAttribute( int $attr ) - * Get formatter attribute value. }}} */ -/* {{{ proto string numfmt_get_text_attribute( NumberFormatter $nf, int $attr ) - * Get formatter attribute value. - */ +/* {{{ Get formatter attribute value. */ PHP_FUNCTION( numfmt_get_text_attribute ) { zend_long attribute; @@ -129,11 +121,7 @@ PHP_FUNCTION( numfmt_get_text_attribute ) } /* }}} */ -/* {{{ proto bool NumberFormatter::setAttribute( int $attr, mixed $value ) - * Get formatter attribute value. }}} */ -/* {{{ proto bool numfmt_set_attribute( NumberFormatter $nf, int $attr, mixed $value ) - * Get formatter attribute value. - */ +/* {{{ Get formatter attribute value. */ PHP_FUNCTION( numfmt_set_attribute ) { zend_long attribute; @@ -186,11 +174,7 @@ PHP_FUNCTION( numfmt_set_attribute ) } /* }}} */ -/* {{{ proto bool NumberFormatter::setTextAttribute( int $attr, string $value ) - * Get formatter attribute value. }}} */ -/* {{{ proto bool numfmt_set_text_attribute( NumberFormatter $nf, int $attr, string $value ) - * Get formatter attribute value. - */ +/* {{{ Get formatter attribute value. */ PHP_FUNCTION( numfmt_set_text_attribute ) { int32_t slength = 0; @@ -225,11 +209,7 @@ PHP_FUNCTION( numfmt_set_text_attribute ) } /* }}} */ -/* {{{ proto string NumberFormatter::getSymbol( int $attr ) - * Get formatter symbol value. }}} */ -/* {{{ proto string numfmt_get_symbol( NumberFormatter $nf, int $attr ) - * Get formatter symbol value. - */ +/* {{{ Get formatter symbol value. */ PHP_FUNCTION( numfmt_get_symbol ) { zend_long symbol; @@ -270,11 +250,7 @@ PHP_FUNCTION( numfmt_get_symbol ) } /* }}} */ -/* {{{ proto bool NumberFormatter::setSymbol( int $attr, string $symbol ) - * Set formatter symbol value. }}} */ -/* {{{ proto bool numfmt_set_symbol( NumberFormatter $nf, int $attr, string $symbol ) - * Set formatter symbol value. - */ +/* {{{ Set formatter symbol value. */ PHP_FUNCTION( numfmt_set_symbol ) { zend_long symbol; @@ -314,11 +290,7 @@ PHP_FUNCTION( numfmt_set_symbol ) } /* }}} */ -/* {{{ proto string NumberFormatter::getPattern( ) - * Get formatter pattern. }}} */ -/* {{{ proto string numfmt_get_pattern( NumberFormatter $nf ) - * Get formatter pattern. - */ +/* {{{ Get formatter pattern. */ PHP_FUNCTION( numfmt_get_pattern ) { UChar value_buf[64]; @@ -353,11 +325,7 @@ PHP_FUNCTION( numfmt_get_pattern ) } /* }}} */ -/* {{{ proto bool NumberFormatter::setPattern( string $pattern ) - * Set formatter pattern. }}} */ -/* {{{ proto bool numfmt_set_pattern( NumberFormatter $nf, string $pattern ) - * Set formatter pattern. - */ +/* {{{ Set formatter pattern. */ PHP_FUNCTION( numfmt_set_pattern ) { char* value = NULL; @@ -390,11 +358,7 @@ PHP_FUNCTION( numfmt_set_pattern ) } /* }}} */ -/* {{{ proto string NumberFormatter::getLocale([int type]) - * Get formatter locale. }}} */ -/* {{{ proto string numfmt_get_locale( NumberFormatter $nf[, int type] ) - * Get formatter locale. - */ +/* {{{ Get formatter locale. */ PHP_FUNCTION( numfmt_get_locale ) { zend_long type = ULOC_ACTUAL_LOCALE; diff --git a/ext/intl/formatter/formatter_format.c b/ext/intl/formatter/formatter_format.c index 4f87a981f2..7d2d593228 100644 --- a/ext/intl/formatter/formatter_format.c +++ b/ext/intl/formatter/formatter_format.c @@ -24,11 +24,7 @@ #include "formatter_format.h" #include "intl_convert.h" -/* {{{ proto mixed NumberFormatter::format( mixed $num[, int $type] ) - * Format a number. }}} */ -/* {{{ proto mixed numfmt_format( NumberFormatter $nf, mixed $num[, int type] ) - * Format a number. - */ +/* {{{ Format a number. */ PHP_FUNCTION( numfmt_format ) { zval *number; @@ -118,11 +114,7 @@ PHP_FUNCTION( numfmt_format ) } /* }}} */ -/* {{{ proto mixed NumberFormatter::formatCurrency( double $num, string $currency ) - * Format a number as currency. }}} */ -/* {{{ proto mixed numfmt_format_currency( NumberFormatter $nf, double $num, string $currency ) - * Format a number as currency. - */ +/* {{{ Format a number as currency. */ PHP_FUNCTION( numfmt_format_currency ) { double number; diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c index be5e6afdda..80d99b3f01 100644 --- a/ext/intl/formatter/formatter_main.c +++ b/ext/intl/formatter/formatter_main.c @@ -66,11 +66,7 @@ static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto NumberFormatter NumberFormatter::create( string $locale, int style[, string $pattern ] ) - * Create number formatter. }}} */ -/* {{{ proto NumberFormatter numfmt_create( string $locale, int style[, string $pattern ] ) - * Create number formatter. - */ +/* {{{ Create number formatter. */ PHP_FUNCTION( numfmt_create ) { object_init_ex( return_value, NumberFormatter_ce_ptr ); @@ -81,9 +77,7 @@ PHP_FUNCTION( numfmt_create ) } /* }}} */ -/* {{{ proto NumberFormatter::__construct( string $locale, int style[, string $pattern ] ) - * NumberFormatter object constructor. - */ +/* {{{ NumberFormatter object constructor. */ PHP_METHOD( NumberFormatter, __construct ) { zend_error_handling error_handling; @@ -99,11 +93,7 @@ PHP_METHOD( NumberFormatter, __construct ) } /* }}} */ -/* {{{ proto int NumberFormatter::getErrorCode() - * Get formatter's last error code. }}} */ -/* {{{ proto int numfmt_get_error_code( NumberFormatter $nf ) - * Get formatter's last error code. - */ +/* {{{ Get formatter's last error code. */ PHP_FUNCTION( numfmt_get_error_code ) { FORMATTER_METHOD_INIT_VARS @@ -122,11 +112,7 @@ PHP_FUNCTION( numfmt_get_error_code ) } /* }}} */ -/* {{{ proto string NumberFormatter::getErrorMessage( ) - * Get text description for formatter's last error code. }}} */ -/* {{{ proto string numfmt_get_error_message( NumberFormatter $nf ) - * Get text description for formatter's last error code. - */ +/* {{{ Get text description for formatter's last error code. */ PHP_FUNCTION( numfmt_get_error_message ) { zend_string *message = NULL; diff --git a/ext/intl/formatter/formatter_parse.c b/ext/intl/formatter/formatter_parse.c index b455398ddc..3015adac05 100644 --- a/ext/intl/formatter/formatter_parse.c +++ b/ext/intl/formatter/formatter_parse.c @@ -27,11 +27,7 @@ #define ICU_LOCALE_BUG 1 -/* {{{ proto mixed NumberFormatter::parse( string $str[, int $type, int &$position ]) - * Parse a number. }}} */ -/* {{{ proto mixed numfmt_parse( NumberFormatter $nf, string $str[, int $type, int &$position ]) - * Parse a number. - */ +/* {{{ Parse a number. */ PHP_FUNCTION( numfmt_parse ) { zend_long type = FORMAT_TYPE_DOUBLE; @@ -110,11 +106,7 @@ PHP_FUNCTION( numfmt_parse ) } /* }}} */ -/* {{{ proto float NumberFormatter::parseCurrency( string $str, string &$currency[, int &$position] ) - * Parse a number as currency. }}} */ -/* {{{ proto float numfmt_parse_currency( NumberFormatter $nf, string $str, string &$currency[, int &$position] ) - * Parse a number as currency. - */ +/* {{{ Parse a number as currency. */ PHP_FUNCTION( numfmt_parse_currency ) { double number; diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 4aa7d3d42e..12305aa049 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -49,8 +49,7 @@ void grapheme_register_constants( INIT_FUNC_ARGS ) } /* }}} */ -/* {{{ proto size_t grapheme_strlen(string str) - Get number of graphemes in a string */ +/* {{{ Get number of graphemes in a string */ PHP_FUNCTION(grapheme_strlen) { char* string; @@ -99,8 +98,7 @@ PHP_FUNCTION(grapheme_strlen) } /* }}} */ -/* {{{ proto int grapheme_strpos(string haystack, string needle [, int offset ]) - Find position of first occurrence of a string within another */ +/* {{{ Find position of first occurrence of a string within another */ PHP_FUNCTION(grapheme_strpos) { char *haystack, *needle; @@ -160,8 +158,7 @@ PHP_FUNCTION(grapheme_strpos) } /* }}} */ -/* {{{ proto int grapheme_stripos(string haystack, string needle [, int offset ]) - Find position of first occurrence of a string within another, ignoring case differences */ +/* {{{ Find position of first occurrence of a string within another, ignoring case differences */ PHP_FUNCTION(grapheme_stripos) { char *haystack, *needle; @@ -228,8 +225,7 @@ PHP_FUNCTION(grapheme_stripos) } /* }}} */ -/* {{{ proto int grapheme_strrpos(string haystack, string needle [, int offset]) - Find position of last occurrence of a string within another */ +/* {{{ Find position of last occurrence of a string within another */ PHP_FUNCTION(grapheme_strrpos) { char *haystack, *needle; @@ -289,8 +285,7 @@ PHP_FUNCTION(grapheme_strrpos) } /* }}} */ -/* {{{ proto int grapheme_strripos(string haystack, string needle [, int offset]) - Find position of last occurrence of a string within another, ignoring case */ +/* {{{ Find position of last occurrence of a string within another, ignoring case */ PHP_FUNCTION(grapheme_strripos) { char *haystack, *needle; @@ -359,8 +354,7 @@ PHP_FUNCTION(grapheme_strripos) } /* }}} */ -/* {{{ proto string grapheme_substr(string str, int start [, int length]) - Returns part of a string */ +/* {{{ Returns part of a string */ PHP_FUNCTION(grapheme_substr) { char *str; @@ -641,16 +635,14 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas } /* }}} */ -/* {{{ proto string grapheme_strstr(string haystack, string needle[, bool part]) - Finds first occurrence of a string within another */ +/* {{{ Finds first occurrence of a string within another */ PHP_FUNCTION(grapheme_strstr) { strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0 /* f_ignore_case */); } /* }}} */ -/* {{{ proto string grapheme_stristr(string haystack, string needle[, bool part]) - Finds first occurrence of a string within another */ +/* {{{ Finds first occurrence of a string within another */ PHP_FUNCTION(grapheme_stristr) { strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1 /* f_ignore_case */); @@ -753,8 +745,7 @@ static grapheme_extract_iter grapheme_extract_iters[] = { }; /* }}} */ -/* {{{ proto string grapheme_extract(string str, int size[, int extract_type[, int start[, int next]]]) - Function to extract a sequence of default grapheme clusters */ +/* {{{ Function to extract a sequence of default grapheme clusters */ PHP_FUNCTION(grapheme_extract) { char *str, *pstr; diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 4ea012a055..f9c4ee391b 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -211,8 +211,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode) php_intl_idn_to_46(INTERNAL_FUNCTION_PARAM_PASSTHRU, domain, (uint32_t)option, mode, idna_info); } -/* {{{ proto string idn_to_ascii(string domain[, int options[, int variant[, array &idna_info]]]) - Converts an Unicode domain to ASCII representation, as defined in the IDNA RFC */ +/* {{{ Converts an Unicode domain to ASCII representation, as defined in the IDNA RFC */ PHP_FUNCTION(idn_to_ascii) { php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_ASCII); @@ -220,8 +219,7 @@ PHP_FUNCTION(idn_to_ascii) /* }}} */ -/* {{{ proto string idn_to_utf8(string domain[, int options[, int variant[, array &idna_info]]]) - Converts an ASCII representation of the domain to Unicode (UTF-8), as defined in the IDNA RFC */ +/* {{{ Converts an ASCII representation of the domain to Unicode (UTF-8), as defined in the IDNA RFC */ PHP_FUNCTION(idn_to_utf8) { php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_UTF8); diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c index 42486aa04b..f2394df371 100644 --- a/ext/intl/intl_error.c +++ b/ext/intl/intl_error.c @@ -195,8 +195,7 @@ void intl_errors_set( intl_error* err, UErrorCode code, const char* msg, int cop } /* }}} */ -/* {{{ void intl_errors_reset( intl_error* err ) - */ +/* {{{ void intl_errors_reset( intl_error* err ) */ void intl_errors_reset( intl_error* err ) { if(err) { @@ -206,8 +205,7 @@ void intl_errors_reset( intl_error* err ) } /* }}} */ -/* {{{ void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg ) - */ +/* {{{ void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg ) */ void intl_errors_set_custom_msg( intl_error* err, const char* msg, int copyMsg ) { if(err) { @@ -217,8 +215,7 @@ void intl_errors_set_custom_msg( intl_error* err, const char* msg, int copyMsg ) } /* }}} */ -/* {{{ intl_errors_set_code( intl_error* err, UErrorCode err_code ) - */ +/* {{{ intl_errors_set_code( intl_error* err, UErrorCode err_code ) */ void intl_errors_set_code( intl_error* err, UErrorCode err_code ) { if(err) { diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index 8a4047b3d0..d48cfeff03 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -199,11 +199,9 @@ static zend_off_t getSingletonPos(const char* str) } /* }}} */ -/* {{{ proto static string Locale::getDefault( ) - Get default locale */ +/* {{{ Get default locale */ /* }}} */ -/* {{{ proto static string locale_get_default( ) - Get default locale */ +/* {{{ Get default locale */ PHP_NAMED_FUNCTION(zif_locale_get_default) { if (zend_parse_parameters_none() == FAILURE) { @@ -215,11 +213,9 @@ PHP_NAMED_FUNCTION(zif_locale_get_default) /* }}} */ -/* {{{ proto static string Locale::setDefault( string $locale ) - Set default locale */ +/* {{{ Set default locale */ /* }}} */ -/* {{{ proto static string locale_set_default( string $locale ) - Set default locale */ +/* {{{ Set default locale */ PHP_NAMED_FUNCTION(zif_locale_set_default) { zend_string* locale_name; @@ -433,36 +429,21 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto static string Locale::getScript($locale) - * gets the script for the $locale - }}} */ -/* {{{ proto static string locale_get_script($locale) - * gets the script for the $locale - */ +/* {{{ gets the script for the $locale */ PHP_FUNCTION( locale_get_script ) { get_icu_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto static string Locale::getRegion($locale) - * gets the region for the $locale - }}} */ -/* {{{ proto static string locale_get_region($locale) - * gets the region for the $locale - */ +/* {{{ gets the region for the $locale */ PHP_FUNCTION( locale_get_region ) { get_icu_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto static string Locale::getPrimaryLanguage($locale) - * gets the primary language for the $locale - }}} */ -/* {{{ proto static string locale_get_primary_language($locale) - * gets the primary language for the $locale - */ +/* {{{ gets the primary language for the $locale */ PHP_FUNCTION(locale_get_primary_language ) { get_icu_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); @@ -603,48 +584,28 @@ static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAME } /* }}} */ -/* {{{ proto static string Locale::getDisplayName($locale[, $in_locale = null]) -* gets the name for the $locale in $in_locale or default_locale - }}} */ -/* {{{ proto static string get_display_name($locale[, $in_locale = null]) -* gets the name for the $locale in $in_locale or default_locale -*/ +/* {{{ gets the name for the $locale in $in_locale or default_locale */ PHP_FUNCTION(locale_get_display_name) { get_icu_disp_value_src_php( DISP_NAME , INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto static string Locale::getDisplayLanguage($locale[, $in_locale = null]) -* gets the language for the $locale in $in_locale or default_locale - }}} */ -/* {{{ proto static string get_display_language($locale[, $in_locale = null]) -* gets the language for the $locale in $in_locale or default_locale -*/ +/* {{{ gets the language for the $locale in $in_locale or default_locale */ PHP_FUNCTION(locale_get_display_language) { get_icu_disp_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto static string Locale::getDisplayScript($locale, $in_locale = null) -* gets the script for the $locale in $in_locale or default_locale - }}} */ -/* {{{ proto static string get_display_script($locale, $in_locale = null) -* gets the script for the $locale in $in_locale or default_locale -*/ +/* {{{ gets the script for the $locale in $in_locale or default_locale */ PHP_FUNCTION(locale_get_display_script) { get_icu_disp_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); } /* }}} */ -/* {{{ proto static string Locale::getDisplayRegion($locale, $in_locale = null) -* gets the region for the $locale in $in_locale or default_locale - }}} */ -/* {{{ proto static string get_display_region($locale, $in_locale = null) -* gets the region for the $locale in $in_locale or default_locale -*/ +/* {{{ gets the region for the $locale in $in_locale or default_locale */ PHP_FUNCTION(locale_get_display_region) { get_icu_disp_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); @@ -665,12 +626,10 @@ PHP_FUNCTION(locale_get_display_variant) } /* }}} */ - /* {{{ proto static array getKeywords(string $locale) { - * return an associative array containing keyword-value + /* {{{ return an associative array containing keyword-value * pairs for this locale. The keys are keys to the array (doh!) * }}}*/ - /* {{{ proto static array locale_get_keywords(string $locale) { - * return an associative array containing keyword-value + /* {{{ return an associative array containing keyword-value * pairs for this locale. The keys are keys to the array (doh!) */ PHP_FUNCTION( locale_get_keywords ) @@ -743,12 +702,9 @@ PHP_FUNCTION( locale_get_keywords ) } /* }}} */ - /* {{{ proto static string Locale::canonicalize($locale) - * @return string the canonicalized locale + /* {{{ @return string the canonicalized locale * }}} */ - /* {{{ proto static string locale_canonicalize(Locale $loc, string $locale) - * @param string $locale The locale string to canonicalize - */ + /* {{{ @param string $locale The locale string to canonicalize */ PHP_FUNCTION(locale_canonicalize) { get_icu_value_src_php( LOC_CANONICALIZE_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); @@ -889,11 +845,9 @@ static int handleAppendResult( int result, smart_str* loc_name) /* }}} */ #define RETURN_SMART_STR(str) smart_str_0((str)); RETURN_NEW_STR((str)->s) -/* {{{ proto static string Locale::composeLocale($array) -* Creates a locale by combining the parts of locale-ID passed +/* {{{ Creates a locale by combining the parts of locale-ID passed * }}} */ -/* {{{ proto static string compose_locale($array) -* Creates a locale by combining the parts of locale-ID passed +/* {{{ Creates a locale by combining the parts of locale-ID passed * }}} */ PHP_FUNCTION(locale_compose) { @@ -1016,8 +970,7 @@ static zend_string* get_private_subtags(const char* loc_name) } /* }}} */ -/* {{{ code used by locale_parse -*/ +/* {{{ code used by locale_parse */ static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name) { zend_string* key_value = NULL; @@ -1077,12 +1030,7 @@ static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name) } /* }}} */ -/* {{{ proto static array Locale::parseLocale($locale) -* parses a locale-id into an array the different parts of it - }}} */ -/* {{{ proto static array parse_locale($locale) -* parses a locale-id into an array the different parts of it -*/ +/* {{{ parses a locale-id into an array the different parts of it */ PHP_FUNCTION(locale_parse) { const char* loc_name = NULL; @@ -1120,12 +1068,7 @@ PHP_FUNCTION(locale_parse) } /* }}} */ -/* {{{ proto static array Locale::getAllVariants($locale) -* gets an array containing the list of variants, or null - }}} */ -/* {{{ proto static array locale_get_all_variants($locale) -* gets an array containing the list of variants, or null -*/ +/* {{{ gets an array containing the list of variants, or null */ PHP_FUNCTION(locale_get_all_variants) { const char* loc_name = NULL; @@ -1178,9 +1121,7 @@ PHP_FUNCTION(locale_get_all_variants) } /* }}} */ -/*{{{ -* Converts to lower case and also replaces all hyphens with the underscore -*/ +/* {{{ * Converts to lower case and also replaces all hyphens with the underscore */ static int strToMatch(const char* str ,char *retstr) { char* anchor = NULL; @@ -1211,13 +1152,9 @@ static int strToMatch(const char* str ,char *retstr) } /* }}} */ -/* {{{ proto static boolean Locale::filterMatches(string $langtag, string $locale[, bool $canonicalize]) -* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm -*/ +/* {{{ Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm */ /* }}} */ -/* {{{ proto bool locale_filter_matches(string $langtag, string $locale[, bool $canonicalize]) -* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm -*/ +/* {{{ Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm */ PHP_FUNCTION(locale_filter_matches) { char* lang_tag = NULL; @@ -1493,13 +1430,11 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr, } /* }}} */ -/* {{{ proto string Locale::lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) -* Searches the items in $langtag for the best match to the language +/* {{{ Searches the items in $langtag for the best match to the language * range */ /* }}} */ -/* {{{ proto string locale_lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) -* Searches the items in $langtag for the best match to the language +/* {{{ Searches the items in $langtag for the best match to the language * range */ PHP_FUNCTION(locale_lookup) @@ -1551,13 +1486,9 @@ PHP_FUNCTION(locale_lookup) } /* }}} */ -/* {{{ proto string Locale::acceptFromHttp(string $http_accept) -* Tries to find out best available locale based on HTTP "Accept-Language" header -*/ +/* {{{ Tries to find out best available locale based on HTTP "Accept-Language" header */ /* }}} */ -/* {{{ proto string locale_accept_from_http(string $http_accept) -* Tries to find out best available locale based on HTTP "Accept-Language" header -*/ +/* {{{ Tries to find out best available locale based on HTTP "Accept-Language" header */ PHP_FUNCTION(locale_accept_from_http) { UEnumeration *available; diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index 8e8ca8d0c8..cb625ed037 100644 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -85,11 +85,7 @@ static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto MessageFormatter MesssageFormatter::create( string $locale, string $pattern ) - * Create formatter. }}} */ -/* {{{ proto MessageFormatter msgfmt_create( string $locale, string $pattern ) - * Create formatter. - */ +/* {{{ Create formatter. */ PHP_FUNCTION( msgfmt_create ) { object_init_ex( return_value, MessageFormatter_ce_ptr ); @@ -100,9 +96,7 @@ PHP_FUNCTION( msgfmt_create ) } /* }}} */ -/* {{{ proto MessageFormatter::__construct( string $locale, string $pattern ) - * MessageFormatter object constructor. - */ +/* {{{ MessageFormatter object constructor. */ PHP_METHOD( MessageFormatter, __construct ) { zend_error_handling error_handling; @@ -118,11 +112,7 @@ PHP_METHOD( MessageFormatter, __construct ) } /* }}} */ -/* {{{ proto int MessageFormatter::getErrorCode() - * Get formatter's last error code. }}} */ -/* {{{ proto int msgfmt_get_error_code( MessageFormatter $nf ) - * Get formatter's last error code. - */ +/* {{{ Get formatter's last error code. */ PHP_FUNCTION( msgfmt_get_error_code ) { zval* object = NULL; @@ -142,11 +132,7 @@ PHP_FUNCTION( msgfmt_get_error_code ) } /* }}} */ -/* {{{ proto string MessageFormatter::getErrorMessage( ) - * Get text description for formatter's last error code. }}} */ -/* {{{ proto string msgfmt_get_error_message( MessageFormatter $coll ) - * Get text description for formatter's last error code. - */ +/* {{{ Get text description for formatter's last error code. */ PHP_FUNCTION( msgfmt_get_error_message ) { zend_string* message = NULL; diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index e03d13bf23..44f693c1a0 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -23,11 +23,7 @@ #include <unicode/ustring.h> -/* {{{ proto string MessageFormatter::getPattern( ) - * Get formatter pattern. }}} */ -/* {{{ proto string msgfmt_get_pattern( MessageFormatter $mf ) - * Get formatter pattern. - */ +/* {{{ Get formatter pattern. */ PHP_FUNCTION( msgfmt_get_pattern ) { MSG_FORMAT_METHOD_INIT_VARS; @@ -49,11 +45,7 @@ PHP_FUNCTION( msgfmt_get_pattern ) } /* }}} */ -/* {{{ proto bool MessageFormatter::setPattern( string $pattern ) - * Set formatter pattern. }}} */ -/* {{{ proto bool msgfmt_set_pattern( MessageFormatter $mf, string $pattern ) - * Set formatter pattern. - */ +/* {{{ Set formatter pattern. */ PHP_FUNCTION( msgfmt_set_pattern ) { char* value = NULL; @@ -106,11 +98,7 @@ PHP_FUNCTION( msgfmt_set_pattern ) } /* }}} */ -/* {{{ proto string MessageFormatter::getLocale() - * Get formatter locale. }}} */ -/* {{{ proto string msgfmt_get_locale(MessageFormatter $mf) - * Get formatter locale. - */ +/* {{{ Get formatter locale. */ PHP_FUNCTION( msgfmt_get_locale ) { char *loc; diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index d54f3a12c6..1e4c49609e 100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -47,11 +47,7 @@ static void msgfmt_do_format(MessageFormatter_object *mfo, zval *args, zval *ret } /* }}} */ -/* {{{ proto mixed MessageFormatter::format( array $args ) - * Format a message. }}} */ -/* {{{ proto mixed msgfmt_format( MessageFormatter $nf, array $args ) - * Format a message. - */ +/* {{{ Format a message. */ PHP_FUNCTION( msgfmt_format ) { zval *args; @@ -72,11 +68,7 @@ PHP_FUNCTION( msgfmt_format ) } /* }}} */ -/* {{{ proto mixed MessageFormatter::formatMessage( string $locale, string $pattern, array $args ) - * Format a message. }}} */ -/* {{{ proto mixed msgfmt_format_message( string $locale, string $pattern, array $args ) - * Format a message. - */ +/* {{{ Format a message. */ PHP_FUNCTION( msgfmt_format_message ) { zval *args; diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index 70fbf25395..b8f253c373 100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -50,11 +50,7 @@ static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, size_t s } /* }}} */ -/* {{{ proto array MessageFormatter::parse( string $source ) - * Parse a message }}} */ -/* {{{ proto array msgfmt_parse( MessageFormatter $nf, string $source ) - * Parse a message. - */ +/* {{{ Parse a message */ PHP_FUNCTION( msgfmt_parse ) { char *source; @@ -76,11 +72,7 @@ PHP_FUNCTION( msgfmt_parse ) } /* }}} */ -/* {{{ proto array MessageFormatter::formatMessage( string $locale, string $pattern, string $source ) - * Parse a message. }}} */ -/* {{{ proto array msgfmt_parse_message( string $locale, string $pattern, string $source ) - * Parse a message. - */ +/* {{{ Parse a message. */ PHP_FUNCTION( msgfmt_parse_message ) { UChar *spattern = NULL; diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index 0672631bcd..f712049ea3 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -76,11 +76,7 @@ static UBool intl_is_normalized(zend_long form, const UChar *uinput, int32_t uin }/*}}}*/ #endif -/* {{{ proto string Normalizer::normalize( string $input [, string $form = FORM_C] ) - * Normalize a string. }}} */ -/* {{{ proto string normalizer_normalize( string $input [, string $form = FORM_C] ) - * Normalize a string. - */ +/* {{{ Normalize a string. */ PHP_FUNCTION( normalizer_normalize ) { char* input = NULL; @@ -219,11 +215,7 @@ PHP_FUNCTION( normalizer_normalize ) } /* }}} */ -/* {{{ proto bool Normalizer::isNormalized( string $input [, string $form = FORM_C] ) - * Test if a string is in a given normalization form. }}} */ -/* {{{ proto bool normalizer_is_normalized( string $input [, string $form = FORM_C] ) - * Test if a string is in a given normalization form. - */ +/* {{{ Test if a string is in a given normalization form. */ PHP_FUNCTION( normalizer_is_normalized ) { char* input = NULL; @@ -306,11 +298,7 @@ PHP_FUNCTION( normalizer_is_normalized ) } /* }}} */ -/* {{{ proto string|null Normalizer::getRawDecomposition( string $input [, string $form = FORM_C] ) - * Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. }}} */ -/* {{{ proto string|null normalizer_get_raw_decomposition( string $input [, string $form = FORM_C] ) - * Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. - */ +/* {{{ Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. */ #if U_ICU_VERSION_MAJOR_NUM >= 56 PHP_FUNCTION( normalizer_get_raw_decomposition ) { diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 89eb9161b6..2b0b19be9b 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -141,8 +141,7 @@ static PHP_GINIT_FUNCTION(intl) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION( intl ) { /* For the default locale php.ini setting */ @@ -242,8 +241,7 @@ PHP_MINIT_FUNCTION( intl ) #define EXPLICIT_CLEANUP_ENV_VAR "INTL_EXPLICIT_CLEANUP" -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION( intl ) { const char *cleanup; @@ -259,16 +257,14 @@ PHP_MSHUTDOWN_FUNCTION( intl ) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION( intl ) { return SUCCESS; } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION( intl ) { if(!Z_ISUNDEF(INTL_G(current_collator))) { @@ -284,8 +280,7 @@ PHP_RSHUTDOWN_FUNCTION( intl ) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION( intl ) { #ifndef UCONFIG_NO_FORMATTING diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index d2c07d0671..cd38b08c9b 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -132,9 +132,7 @@ static int resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto ResourceBundle::__construct( string $locale [, string $bundlename [, bool $fallback = true ]] ) - * ResourceBundle object constructor - */ +/* {{{ ResourceBundle object constructor */ PHP_METHOD( ResourceBundle, __construct ) { zend_error_handling error_handling; @@ -150,9 +148,7 @@ PHP_METHOD( ResourceBundle, __construct ) } /* }}} */ -/* {{{ proto ResourceBundle ResourceBundle::create( string $locale [, string $bundlename [, bool $fallback = true ]] ) -proto ResourceBundle resourcebundle_create( string $locale [, string $bundlename [, bool $fallback = true ]] ) -*/ +/* {{{ */ PHP_FUNCTION( resourcebundle_create ) { object_init_ex( return_value, ResourceBundle_ce_ptr ); @@ -229,10 +225,7 @@ zval *resourcebundle_array_get(zend_object *object, zval *offset, int type, zval } /* }}} */ -/* {{{ proto mixed ResourceBundle::get( int|string $resindex [, bool $fallback = true ] ) - * proto mixed resourcebundle_get( ResourceBundle $rb, int|string $resindex [, bool $fallback = true ] ) - * Get resource identified by numerical index or key name. - */ +/* {{{ Get resource identified by numerical index or key name. */ PHP_FUNCTION( resourcebundle_get ) { zend_bool fallback = 1; @@ -264,10 +257,7 @@ int resourcebundle_array_count(zend_object *object, zend_long *count) } /* }}} */ -/* {{{ proto int ResourceBundle::count() - * proto int resourcebundle_count( ResourceBundle $bundle ) - * Get resources count - */ +/* {{{ Get resources count */ PHP_FUNCTION( resourcebundle_count ) { int32_t len; @@ -283,10 +273,7 @@ PHP_FUNCTION( resourcebundle_count ) RETURN_LONG( len ); } -/* {{{ proto array ResourceBundle::getLocales( string $bundlename ) - * proto array resourcebundle_locales( string $bundlename ) - * Get available locales from ResourceBundle name - */ +/* {{{ Get available locales from ResourceBundle name */ PHP_FUNCTION( resourcebundle_locales ) { char * bundlename; @@ -327,10 +314,7 @@ PHP_FUNCTION( resourcebundle_locales ) } /* }}} */ -/* {{{ proto string ResourceBundle::getErrorCode( ) - * proto string resourcebundle_get_error_code( ResourceBundle $bundle ) - * Get text description for ResourceBundle's last error code. - */ +/* {{{ Get text description for ResourceBundle's last error code. */ PHP_FUNCTION( resourcebundle_get_error_code ) { RESOURCEBUNDLE_METHOD_INIT_VARS; @@ -347,10 +331,7 @@ PHP_FUNCTION( resourcebundle_get_error_code ) } /* }}} */ -/* {{{ proto string ResourceBundle::getErrorMessage( ) - * proto string resourcebundle_get_error_message( ResourceBundle $bundle ) - * Get text description for ResourceBundle's last error. - */ +/* {{{ Get text description for ResourceBundle's last error. */ PHP_FUNCTION( resourcebundle_get_error_message ) { zend_string* message = NULL; diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c index e49f215ca4..beb4c99ce8 100644 --- a/ext/intl/spoofchecker/spoofchecker_create.c +++ b/ext/intl/spoofchecker/spoofchecker_create.c @@ -20,9 +20,7 @@ #include "spoofchecker_class.h" #include "intl_data.h" -/* {{{ proto Spoofchecker::__construct() - * Spoofchecker object constructor. - */ +/* {{{ Spoofchecker object constructor. */ PHP_METHOD(Spoofchecker, __construct) { #if U_ICU_VERSION_MAJOR_NUM < 58 diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c index 42108ecf01..b04b69cb88 100644 --- a/ext/intl/spoofchecker/spoofchecker_main.c +++ b/ext/intl/spoofchecker/spoofchecker_main.c @@ -19,9 +19,7 @@ #include "php_intl.h" #include "spoofchecker_class.h" -/* {{{ proto bool Spoofchecker::isSuspicious( string text[, int &error_code ] ) - * Checks if a given text contains any suspicious characters - */ +/* {{{ Checks if a given text contains any suspicious characters */ PHP_METHOD(Spoofchecker, isSuspicious) { int ret; @@ -51,9 +49,7 @@ PHP_METHOD(Spoofchecker, isSuspicious) } /* }}} */ -/* {{{ proto bool Spoofchecker::areConfusable( string str1, string str2[, int &error_code ] ) - * Checks if a given text contains any confusable characters - */ +/* {{{ Checks if a given text contains any confusable characters */ PHP_METHOD(Spoofchecker, areConfusable) { int ret; @@ -86,9 +82,7 @@ PHP_METHOD(Spoofchecker, areConfusable) } /* }}} */ -/* {{{ proto void Spoofchecker::setAllowedLocales( string locales ) - * Locales to use when running checks - */ +/* {{{ Locales to use when running checks */ PHP_METHOD(Spoofchecker, setAllowedLocales) { char *locales; @@ -110,9 +104,7 @@ PHP_METHOD(Spoofchecker, setAllowedLocales) } /* }}} */ -/* {{{ proto void Spoofchecker::setChecks( int checks ) - * Set the checks to run - */ +/* {{{ Set the checks to run */ PHP_METHOD(Spoofchecker, setChecks) { zend_long checks; @@ -133,9 +125,7 @@ PHP_METHOD(Spoofchecker, setChecks) /* }}} */ #if U_ICU_VERSION_MAJOR_NUM >= 58 -/* {{{ proto void Spoofchecker::setRestrictionLevel( int $restriction_level ) - * Set the loosest restriction level allowed for strings. - */ +/* {{{ Set the loosest restriction level allowed for strings. */ PHP_METHOD(Spoofchecker, setRestrictionLevel) { zend_long level; diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index 0414849687..6516bb6ff7 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -599,9 +599,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message) } #if U_ICU_VERSION_MAJOR_NUM >= 52 -/* {{{ proto string IntlTimeZone::getWindowsID(string $timezone) - proto string intltz_get_windows_id(string $timezone) -Translate a system timezone (e.g. "America/Los_Angeles" into a +/* {{{ Translate a system timezone (e.g. "America/Los_Angeles" into a Windows Timezone (e.g. "Pacific Standard Time") */ U_CFUNC PHP_FUNCTION(intltz_get_windows_id) @@ -637,9 +635,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_windows_id) } /* }}} */ -/* {{{ proto string IntlTimeZone::getIDForWindowsID(string $timezone[, string $region = NULL]) - proto string intltz_get_id_for_windows_id(string $timezone[, string $region = NULL]) -Translate a windows timezone (e.g. "Pacific Time Zone" into a +/* {{{ Translate a windows timezone (e.g. "Pacific Time Zone" into a System Timezone (e.g. "America/Los_Angeles") */ U_CFUNC PHP_FUNCTION(intltz_get_id_for_windows_id) diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index fe6b8134a2..5ec0e10b78 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -94,10 +94,7 @@ static int create_transliterator( char *str_id, size_t str_id_len, zend_long dir return SUCCESS; } -/* {{{ proto Transliterator transliterator_create( string id [, int direction ] ) - * proto Transliterator Transliterator::create( string id [, int direction ] ) - * Opens a transliterator by id. - */ +/* {{{ Opens a transliterator by id. */ PHP_FUNCTION( transliterator_create ) { char *str_id; @@ -124,10 +121,7 @@ PHP_FUNCTION( transliterator_create ) } /* }}} */ -/* {{{ proto Transliterator transliterator_create_from_rules( string rules [, int direction ] ) - * proto Transliterator Transliterator::createFromRules( string rules [, int direction ] ) - * Opens a transliterator by id. - */ +/* {{{ Opens a transliterator by id. */ PHP_FUNCTION( transliterator_create_from_rules ) { char *str_rules; @@ -194,10 +188,7 @@ PHP_FUNCTION( transliterator_create_from_rules ) } /* }}} */ -/* {{{ proto Transliterator transliterator_create_inverse( Transliterator orig_trans ) - * proto Transliterator Transliterator::createInverse() - * Opens the inverse transliterator transliterator. - */ +/* {{{ Opens the inverse transliterator transliterator. */ PHP_FUNCTION( transliterator_create_inverse ) { Transliterator_object *to_orig; @@ -226,10 +217,7 @@ PHP_FUNCTION( transliterator_create_inverse ) } /* }}} */ -/* {{{ proto array transliterator_list_ids() - * proto array Transliterator::listIDs() - * Return an array with the registered transliterator IDs. - */ +/* {{{ Return an array with the registered transliterator IDs. */ PHP_FUNCTION( transliterator_list_ids ) { UEnumeration *en; @@ -275,9 +263,7 @@ PHP_FUNCTION( transliterator_list_ids ) } /* }}} */ -/* {{{ proto string transliterator_transliterate( Transliterator trans, string subject [, int start = 0 [, int end = -1 ]] ) - * proto string Transliterator::transliterate( string subject [, int start = 0 [, int end = -1 ]] ) - * Transliterate a string. */ +/* {{{ Transliterate a string. */ PHP_FUNCTION( transliterator_transliterate ) { char *str; @@ -450,10 +436,7 @@ PHP_METHOD( Transliterator, __construct ) 0 ); } -/* {{{ proto int transliterator_get_error_code( Transliterator trans ) - * proto int Transliterator::getErrorCode() - * Get the last error code for this transliterator. - */ +/* {{{ Get the last error code for this transliterator. */ PHP_FUNCTION( transliterator_get_error_code ) { TRANSLITERATOR_METHOD_INIT_VARS @@ -474,10 +457,7 @@ PHP_FUNCTION( transliterator_get_error_code ) /* }}} */ -/* {{{ proto string transliterator_get_error_message( Transliterator trans ) - * proto string Transliterator::getErrorMessage() - * Get the last error message for this transliterator. - */ +/* {{{ Get the last error message for this transliterator. */ PHP_FUNCTION( transliterator_get_error_message ) { zend_string* message = NULL; diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index b6d566120e..0f44b454b4 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -45,8 +45,7 @@ static zend_never_inline int parse_code_point_param(INTERNAL_FUNCTION_PARAMETERS return convert_cp(cp, string_codepoint, int_codepoint); } -/* {{{ proto string IntlChar::chr(int|string $codepoint) - * Converts a numeric codepoint to UTF-8 +/* {{{ Converts a numeric codepoint to UTF-8 * Acts as an identify function when given a valid UTF-8 encoded codepoint */ IC_METHOD(chr) { @@ -67,8 +66,7 @@ IC_METHOD(chr) { } /* }}} */ -/* {{{ proto int IntlChar::ord(int|string $character) - * Converts a UTf-8 encoded codepoint to its integer U32 value +/* {{{ Converts a UTf-8 encoded codepoint to its integer U32 value * Acts as an identity function when passed a valid integer codepoint */ IC_METHOD(ord) { @@ -82,7 +80,7 @@ IC_METHOD(ord) { } /* }}} */ -/* {{{ proto bool IntlChar::hasBinaryProperty(int|string $codepoint, int $property) */ +/* {{{ */ IC_METHOD(hasBinaryProperty) { UChar32 cp; zend_long prop; @@ -102,7 +100,7 @@ IC_METHOD(hasBinaryProperty) { } /* }}} */ -/* {{{ proto int IntlChar::getIntPropertyValue(int|string $codepoint, int $property) */ +/* {{{ */ IC_METHOD(getIntPropertyValue) { UChar32 cp; zend_long prop; @@ -122,7 +120,7 @@ IC_METHOD(getIntPropertyValue) { } /* }}} */ -/* {{{ proto int IntlChar::getIntPropertyMinValue(int $property) */ +/* {{{ */ IC_METHOD(getIntPropertyMinValue) { zend_long prop; @@ -134,7 +132,7 @@ IC_METHOD(getIntPropertyMinValue) { } /* }}} */ -/* {{{ proto int IntlChar::getIntPropertyMaxValue(int $property) */ +/* {{{ */ IC_METHOD(getIntPropertyMaxValue) { zend_long prop; @@ -146,7 +144,7 @@ IC_METHOD(getIntPropertyMaxValue) { } /* }}} */ -/* {{{ proto float IntlChar::getNumericValue(int|string $codepoint) */ +/* {{{ */ IC_METHOD(getNumericValue) { UChar32 cp; @@ -158,7 +156,7 @@ IC_METHOD(getNumericValue) { } /* }}} */ -/* {{{ proto void IntlChar::enumCharTypes(callable $callback) */ +/* {{{ */ typedef struct _enumCharType_data { zend_fcall_info fci; zend_fcall_info_cache fci_cache; @@ -199,7 +197,7 @@ IC_METHOD(enumCharTypes) { } /* }}} */ -/* {{{ proto int IntlChar::getBlockCode(int|string $codepoint) */ +/* {{{ */ IC_METHOD(getBlockCode) { UChar32 cp; @@ -211,7 +209,7 @@ IC_METHOD(getBlockCode) { } /* }}} */ -/* {{{ proto string IntlChar::charName(int|string $codepoint, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) */ +/* {{{ */ IC_METHOD(charName) { UChar32 cp; zend_string *string_codepoint; @@ -243,7 +241,7 @@ IC_METHOD(charName) { } /* }}} */ -/* {{{ proto int IntlChar::charFromName(string $characterName, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) */ +/* {{{ */ IC_METHOD(charFromName) { char *name; size_t name_len; @@ -318,7 +316,7 @@ IC_METHOD(enumCharNames) { } /* }}} */ -/* {{{ proto string IntlChar::getPropertyName(int $property, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) */ +/* {{{ */ IC_METHOD(getPropertyName) { zend_long property; zend_long nameChoice = U_LONG_PROPERTY_NAME; @@ -339,7 +337,7 @@ IC_METHOD(getPropertyName) { } /* }}} */ -/* {{{ proto int IntlChar::getPropertyEnum(string $alias) */ +/* {{{ */ IC_METHOD(getPropertyEnum) { char *alias; size_t alias_len; @@ -352,7 +350,7 @@ IC_METHOD(getPropertyEnum) { } /* }}} */ -/* {{{ proto string IntlChar::getPropertyValueName(int $property, int $value[, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) */ +/* {{{ */ IC_METHOD(getPropertyValueName) { zend_long property, value, nameChoice = U_LONG_PROPERTY_NAME; const char *ret; @@ -372,7 +370,7 @@ IC_METHOD(getPropertyValueName) { } /* }}} */ -/* {{{ proto int IntlChar::getPropertyValueEnum(int $property, string $name) */ +/* {{{ */ IC_METHOD(getPropertyValueEnum) { zend_long property; char *name; @@ -386,7 +384,7 @@ IC_METHOD(getPropertyValueEnum) { } /* }}} */ -/* {{{ proto int|string IntlChar::foldCase(int|string $codepoint, int $options = IntlChar::FOLD_CASE_DEFAULT) */ +/* {{{ */ IC_METHOD(foldCase) { UChar32 cp, ret; zend_long options = U_FOLD_CASE_DEFAULT; @@ -415,7 +413,7 @@ IC_METHOD(foldCase) { } /* }}} */ -/* {{{ proto int IntlChar::digit(int|string $codepoint[, int $radix = 10]) */ +/* {{{ */ IC_METHOD(digit) { UChar32 cp; zend_long radix = 10; @@ -443,7 +441,7 @@ IC_METHOD(digit) { } /* }}} */ -/* {{{ proto int IntlChar::forDigit(int $digit[, int $radix = 10]) */ +/* {{{ */ IC_METHOD(forDigit) { zend_long digit, radix = 10; @@ -455,7 +453,7 @@ IC_METHOD(forDigit) { } /* }}} */ -/* {{{ proto array IntlChar::charAge(int|string $codepoint) */ +/* {{{ */ IC_METHOD(charAge) { UChar32 cp; UVersionInfo version; @@ -473,7 +471,7 @@ IC_METHOD(charAge) { } /* }}} */ -/* {{{ proto array IntlChar::getUnicodeVersion() */ +/* {{{ */ IC_METHOD(getUnicodeVersion) { UVersionInfo version; int i; @@ -490,7 +488,7 @@ IC_METHOD(getUnicodeVersion) { } /* }}} */ -/* {{{ proto string IntlChar::getFC_NFKC_Closure(int|string $codepoint) */ +/* {{{ */ IC_METHOD(getFC_NFKC_Closure) { UChar32 cp; UChar *closure; @@ -522,7 +520,7 @@ IC_METHOD(getFC_NFKC_Closure) { } /* }}} */ -/* {{{ proto bool IntlChar::<name>(int|string $codepoint) */ +/* {{{ */ #define IC_BOOL_METHOD_CHAR(name) \ IC_METHOD(name) { \ UChar32 cp; \ @@ -562,7 +560,7 @@ IC_BOOL_METHOD_CHAR(isJavaIDPart) #undef IC_BOOL_METHOD_CHAR /* }}} */ -/* {{{ proto int IntlChar::<name>(int|string $codepoint) */ +/* {{{ */ #define IC_INT_METHOD_CHAR(name) \ IC_METHOD(name) { \ UChar32 cp; \ @@ -578,8 +576,7 @@ IC_INT_METHOD_CHAR(charDigitValue) #undef IC_INT_METHOD_CHAR /* }}} */ -/* {{{ proto int|string IntlChar::<name>(int|string $codepoint) - * Returns a utf-8 character if codepoint was passed as a utf-8 sequence +/* {{{ Returns a utf-8 character if codepoint was passed as a utf-8 sequence * Returns an int otherwise */ #define IC_CHAR_METHOD_CHAR(name) \ diff --git a/ext/json/json.c b/ext/json/json.c index 1797c00c9c..cbf4f84014 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -92,8 +92,7 @@ static PHP_MINIT_FUNCTION(json) } /* }}} */ -/* {{{ PHP_GINIT_FUNCTION -*/ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(json) { #if defined(COMPILE_DL_JSON) && defined(ZTS) @@ -106,8 +105,7 @@ static PHP_GINIT_FUNCTION(json) /* }}} */ -/* {{{ json_module_entry - */ +/* {{{ json_module_entry */ zend_module_entry json_module_entry = { STANDARD_MODULE_HEADER, "json", @@ -133,8 +131,7 @@ ZEND_TSRMLS_CACHE_DEFINE() ZEND_GET_MODULE(json) #endif -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(json) { php_info_print_table_start(); @@ -216,8 +213,7 @@ PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t } /* }}} */ -/* {{{ proto string json_encode(mixed data [, int options[, int depth]]) - Returns the JSON representation of a value */ +/* {{{ Returns the JSON representation of a value */ PHP_FUNCTION(json_encode) { zval *parameter; @@ -259,8 +255,7 @@ PHP_FUNCTION(json_encode) } /* }}} */ -/* {{{ proto mixed json_decode(string json [, bool assoc [, int depth]]) - Decodes the JSON representation into a PHP value */ +/* {{{ Decodes the JSON representation into a PHP value */ PHP_FUNCTION(json_decode) { char *str; @@ -314,8 +309,7 @@ PHP_FUNCTION(json_decode) } /* }}} */ -/* {{{ proto int json_last_error() - Returns the error code of the last json_encode() or json_decode() call. */ +/* {{{ Returns the error code of the last json_encode() or json_decode() call. */ PHP_FUNCTION(json_last_error) { ZEND_PARSE_PARAMETERS_NONE(); @@ -324,8 +318,7 @@ PHP_FUNCTION(json_last_error) } /* }}} */ -/* {{{ proto string json_last_error_msg() - Returns the error string of the last json_encode() or json_decode() call. */ +/* {{{ Returns the error string of the last json_encode() or json_decode() call. */ PHP_FUNCTION(json_last_error_msg) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index d2f0c6cb54..9a1624667e 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -693,15 +693,13 @@ static void _php_ldap_controls_free (LDAPControl*** ctrls) } /* }}} */ -/* {{{ PHP_INI_BEGIN - */ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_ldap_globals, ldap_globals, display_link_numbers) PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(ldap) { #if defined(COMPILE_DL_LDAP) && defined(ZTS) @@ -711,8 +709,7 @@ static PHP_GINIT_FUNCTION(ldap) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(ldap) { REGISTER_INI_ENTRIES(); @@ -932,8 +929,7 @@ PHP_MINIT_FUNCTION(ldap) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(ldap) { UNREGISTER_INI_ENTRIES(); @@ -941,8 +937,7 @@ PHP_MSHUTDOWN_FUNCTION(ldap) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(ldap) { char tmp[32]; @@ -980,8 +975,7 @@ PHP_MINFO_FUNCTION(ldap) } /* }}} */ -/* {{{ proto resource ldap_connect([string host [, int port [, string wallet [, string wallet_passwd [, int authmode]]]]]) - Connect to an LDAP server */ +/* {{{ Connect to an LDAP server */ PHP_FUNCTION(ldap_connect) { char *host = NULL; @@ -1083,8 +1077,7 @@ PHP_FUNCTION(ldap_connect) } /* }}} */ -/* {{{ _get_lderrno - */ +/* {{{ _get_lderrno */ static int _get_lderrno(LDAP *ldap) { #if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP) @@ -1099,8 +1092,7 @@ static int _get_lderrno(LDAP *ldap) } /* }}} */ -/* {{{ _set_lderrno - */ +/* {{{ _set_lderrno */ static void _set_lderrno(LDAP *ldap, int lderr) { #if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP) @@ -1112,8 +1104,7 @@ static void _set_lderrno(LDAP *ldap, int lderr) } /* }}} */ -/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]]) - Bind to LDAP directory */ +/* {{{ Bind to LDAP directory */ PHP_FUNCTION(ldap_bind) { zval *link; @@ -1166,8 +1157,7 @@ PHP_FUNCTION(ldap_bind) } /* }}} */ -/* {{{ proto resource ldap_bind_ext(resource link [, string dn [, string password [, serverctrls]]]) - Bind to LDAP directory */ +/* {{{ Bind to LDAP directory */ PHP_FUNCTION(ldap_bind_ext) { zval *serverctrls = NULL; @@ -1252,8 +1242,7 @@ typedef struct { char *authzid; } php_ldap_bictx; -/* {{{ _php_sasl_setdefs - */ +/* {{{ _php_sasl_setdefs */ static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *sasl_authc_id, char *passwd, char *sasl_authz_id) { php_ldap_bictx *ctx; @@ -1282,8 +1271,7 @@ static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_r } /* }}} */ -/* {{{ _php_sasl_freedefs - */ +/* {{{ _php_sasl_freedefs */ static void _php_sasl_freedefs(php_ldap_bictx *ctx) { if (ctx->mech) ber_memfree(ctx->mech); @@ -1328,8 +1316,7 @@ static int _php_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *in } /* }}} */ -/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [, string sasl_authz_id [, string props]]]]]]]) - Bind to LDAP directory using SASL */ +/* {{{ Bind to LDAP directory using SASL */ PHP_FUNCTION(ldap_sasl_bind) { zval *link; @@ -1370,8 +1357,7 @@ PHP_FUNCTION(ldap_sasl_bind) /* }}} */ #endif /* HAVE_LDAP_SASL */ -/* {{{ proto bool ldap_unbind(resource link) - Unbind from LDAP directory */ +/* {{{ Unbind from LDAP directory */ PHP_FUNCTION(ldap_unbind) { zval *link; @@ -1390,8 +1376,7 @@ PHP_FUNCTION(ldap_unbind) } /* }}} */ -/* {{{ php_set_opts - */ +/* {{{ php_set_opts */ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, int *old_sizelimit, int *old_timelimit, int *old_deref) { /* sizelimit */ @@ -1429,8 +1414,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in } /* }}} */ -/* {{{ php_ldap_do_search - */ +/* {{{ php_ldap_do_search */ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) { zval *link, *base_dn, *filter, *attrs = NULL, *attr, *serverctrls = NULL; @@ -1677,32 +1661,28 @@ cleanup: } /* }}} */ -/* {{{ proto resource ldap_read(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) - Read an entry */ +/* {{{ Read an entry */ PHP_FUNCTION(ldap_read) { php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE); } /* }}} */ -/* {{{ proto resource ldap_list(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) - Single-level search */ +/* {{{ Single-level search */ PHP_FUNCTION(ldap_list) { php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL); } /* }}} */ -/* {{{ proto resource ldap_search(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) - Search LDAP tree under base_dn */ +/* {{{ Search LDAP tree under base_dn */ PHP_FUNCTION(ldap_search) { php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE); } /* }}} */ -/* {{{ proto bool ldap_free_result(resource result) - Free result memory */ +/* {{{ Free result memory */ PHP_FUNCTION(ldap_free_result) { zval *result; @@ -1721,8 +1701,7 @@ PHP_FUNCTION(ldap_free_result) } /* }}} */ -/* {{{ proto int ldap_count_entries(resource link, resource result) - Count the number of entries in a search result */ +/* {{{ Count the number of entries in a search result */ PHP_FUNCTION(ldap_count_entries) { zval *link, *result; @@ -1745,8 +1724,7 @@ PHP_FUNCTION(ldap_count_entries) } /* }}} */ -/* {{{ proto resource ldap_first_entry(resource link, resource result) - Return first result id */ +/* {{{ Return first result id */ PHP_FUNCTION(ldap_first_entry) { zval *link, *result; @@ -1778,8 +1756,7 @@ PHP_FUNCTION(ldap_first_entry) } /* }}} */ -/* {{{ proto resource ldap_next_entry(resource link, resource result_entry) - Get next result entry */ +/* {{{ Get next result entry */ PHP_FUNCTION(ldap_next_entry) { zval *link, *result_entry; @@ -1810,8 +1787,7 @@ PHP_FUNCTION(ldap_next_entry) } /* }}} */ -/* {{{ proto array ldap_get_entries(resource link, resource result) - Get all result entries */ +/* {{{ Get all result entries */ PHP_FUNCTION(ldap_get_entries) { zval *link, *result; @@ -1911,8 +1887,7 @@ PHP_FUNCTION(ldap_get_entries) } /* }}} */ -/* {{{ proto string ldap_first_attribute(resource link, resource result_entry) - Return first attribute */ +/* {{{ Return first attribute */ PHP_FUNCTION(ldap_first_attribute) { zval *link, *result_entry; @@ -1944,8 +1919,7 @@ PHP_FUNCTION(ldap_first_attribute) } /* }}} */ -/* {{{ proto string ldap_next_attribute(resource link, resource result_entry) - Get the next attribute in result */ +/* {{{ Get the next attribute in result */ PHP_FUNCTION(ldap_next_attribute) { zval *link, *result_entry; @@ -1988,8 +1962,7 @@ PHP_FUNCTION(ldap_next_attribute) } /* }}} */ -/* {{{ proto array ldap_get_attributes(resource link, resource result_entry) - Get attributes from a search result entry */ +/* {{{ Get attributes from a search result entry */ PHP_FUNCTION(ldap_get_attributes) { zval *link, *result_entry; @@ -2047,8 +2020,7 @@ PHP_FUNCTION(ldap_get_attributes) } /* }}} */ -/* {{{ proto array ldap_get_values_len(resource link, resource result_entry, string attribute) - Get all values with lengths from a result entry */ +/* {{{ Get all values with lengths from a result entry */ PHP_FUNCTION(ldap_get_values_len) { zval *link, *result_entry; @@ -2089,8 +2061,7 @@ PHP_FUNCTION(ldap_get_values_len) } /* }}} */ -/* {{{ proto string ldap_get_dn(resource link, resource result_entry) - Get the DN of a result entry */ +/* {{{ Get the DN of a result entry */ PHP_FUNCTION(ldap_get_dn) { zval *link, *result_entry; @@ -2124,8 +2095,7 @@ PHP_FUNCTION(ldap_get_dn) } /* }}} */ -/* {{{ proto array ldap_explode_dn(string dn, int with_attrib) - Splits DN into its component parts */ +/* {{{ Splits DN into its component parts */ PHP_FUNCTION(ldap_explode_dn) { zend_long with_attrib; @@ -2157,8 +2127,7 @@ PHP_FUNCTION(ldap_explode_dn) } /* }}} */ -/* {{{ proto string ldap_dn2ufn(string dn) - Convert DN to User Friendly Naming format */ +/* {{{ Convert DN to User Friendly Naming format */ PHP_FUNCTION(ldap_dn2ufn) { char *dn, *ufn; @@ -2184,8 +2153,7 @@ PHP_FUNCTION(ldap_dn2ufn) /* added to fix use of ldap_modify_add for doing an ldap_add, gerrit thomson. */ #define PHP_LD_FULL_ADD 0xff -/* {{{ php_ldap_do_modify - */ +/* {{{ php_ldap_do_modify */ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext) { zval *serverctrls = NULL; @@ -2362,8 +2330,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool ldap_add(resource link, string dn, array entry [, array servercontrols]) - Add entries to LDAP directory */ +/* {{{ Add entries to LDAP directory */ PHP_FUNCTION(ldap_add) { /* use a newly define parameter into the do_modify so ldap_mod_add can be used the way it is supposed to be used , Gerrit THomson */ @@ -2371,8 +2338,7 @@ PHP_FUNCTION(ldap_add) } /* }}} */ -/* {{{ proto resource ldap_add_ext(resource link, string dn, array entry [, array servercontrols]) - Add entries to LDAP directory */ +/* {{{ Add entries to LDAP directory */ PHP_FUNCTION(ldap_add_ext) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD, 1); @@ -2381,56 +2347,49 @@ PHP_FUNCTION(ldap_add_ext) /* three functions for attribute base modifications, gerrit Thomson */ -/* {{{ proto bool ldap_mod_replace(resource link, string dn, array entry [, array servercontrols]) - Replace attribute values with new ones */ +/* {{{ Replace attribute values with new ones */ PHP_FUNCTION(ldap_mod_replace) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 0); } /* }}} */ -/* {{{ proto resource ldap_mod_replace_ext(resource link, string dn, array entry [, array servercontrols]) - Replace attribute values with new ones */ +/* {{{ Replace attribute values with new ones */ PHP_FUNCTION(ldap_mod_replace_ext) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 1); } /* }}} */ -/* {{{ proto bool ldap_mod_add(resource link, string dn, array entry [, array servercontrols]) - Add attribute values to current */ +/* {{{ Add attribute values to current */ PHP_FUNCTION(ldap_mod_add) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 0); } /* }}} */ -/* {{{ proto resource ldap_mod_add(resource link, string dn, array entry [, array servercontrols]) - Add attribute values to current */ +/* {{{ Add attribute values to current */ PHP_FUNCTION(ldap_mod_add_ext) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 1); } /* }}} */ -/* {{{ proto bool ldap_mod_del(resource link, string dn, array entry [, array servercontrols]) - Delete attribute values */ +/* {{{ Delete attribute values */ PHP_FUNCTION(ldap_mod_del) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 0); } /* }}} */ -/* {{{ proto resource ldap_mod_del_ext(resource link, string dn, array entry [, array servercontrols]) - Delete attribute values */ +/* {{{ Delete attribute values */ PHP_FUNCTION(ldap_mod_del_ext) { php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 1); } /* }}} */ -/* {{{ php_ldap_do_delete - */ +/* {{{ php_ldap_do_delete */ static void php_ldap_do_delete(INTERNAL_FUNCTION_PARAMETERS, int ext) { zval *serverctrls = NULL; @@ -2490,24 +2449,21 @@ cleanup: } /* }}} */ -/* {{{ proto bool ldap_delete(resource link, string dn [, array servercontrols]) - Delete an entry from a directory */ +/* {{{ Delete an entry from a directory */ PHP_FUNCTION(ldap_delete) { php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource ldap_delete_ext(resource link, string dn [, array servercontrols]) - Delete an entry from a directory */ +/* {{{ Delete an entry from a directory */ PHP_FUNCTION(ldap_delete_ext) { php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ _ldap_str_equal_to_const - */ +/* {{{ _ldap_str_equal_to_const */ static size_t _ldap_str_equal_to_const(const char *str, size_t str_len, const char *cstr) { size_t i; @@ -2525,8 +2481,7 @@ static size_t _ldap_str_equal_to_const(const char *str, size_t str_len, const ch } /* }}} */ -/* {{{ _ldap_strlen_max - */ +/* {{{ _ldap_strlen_max */ static size_t _ldap_strlen_max(const char *str, size_t max_len) { size_t i; @@ -2541,16 +2496,14 @@ static size_t _ldap_strlen_max(const char *str, size_t max_len) } /* }}} */ -/* {{{ _ldap_hash_fetch - */ +/* {{{ _ldap_hash_fetch */ static void _ldap_hash_fetch(zval *hashTbl, const char *key, zval **out) { *out = zend_hash_str_find(Z_ARRVAL_P(hashTbl), key, strlen(key)); } /* }}} */ -/* {{{ proto bool ldap_modify_batch(resource link, string dn, array modifs [, array servercontrols]) - Perform multiple modifications as part of one operation */ +/* {{{ Perform multiple modifications as part of one operation */ PHP_FUNCTION(ldap_modify_batch) { zval *serverctrls = NULL; @@ -2867,8 +2820,7 @@ PHP_FUNCTION(ldap_modify_batch) } /* }}} */ -/* {{{ proto int ldap_errno(resource link) - Get the current ldap error number */ +/* {{{ Get the current ldap error number */ PHP_FUNCTION(ldap_errno) { zval *link; @@ -2886,8 +2838,7 @@ PHP_FUNCTION(ldap_errno) } /* }}} */ -/* {{{ proto string ldap_err2str(int errno) - Convert error number to error string */ +/* {{{ Convert error number to error string */ PHP_FUNCTION(ldap_err2str) { zend_long perrno; @@ -2900,8 +2851,7 @@ PHP_FUNCTION(ldap_err2str) } /* }}} */ -/* {{{ proto string ldap_error(resource link) - Get the current ldap error string */ +/* {{{ Get the current ldap error string */ PHP_FUNCTION(ldap_error) { zval *link; @@ -2922,8 +2872,7 @@ PHP_FUNCTION(ldap_error) } /* }}} */ -/* {{{ proto bool ldap_compare(resource link, string dn, string attr, string value) - Determine if an entry has a specific value for one of its attributes */ +/* {{{ Determine if an entry has a specific value for one of its attributes */ PHP_FUNCTION(ldap_compare) { zval *serverctrls = NULL; @@ -2980,8 +2929,7 @@ cleanup: /* }}} */ #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) -/* {{{ proto bool ldap_get_option(resource link, int option, mixed retval) - Get the current value of various session-wide parameters */ +/* {{{ Get the current value of various session-wide parameters */ PHP_FUNCTION(ldap_get_option) { zval *link, *retval; @@ -3148,8 +3096,7 @@ PHP_FUNCTION(ldap_get_option) } /* }}} */ -/* {{{ proto bool ldap_set_option(resource link, int option, mixed newval) - Set the value of various session-wide parameters */ +/* {{{ Set the value of various session-wide parameters */ PHP_FUNCTION(ldap_set_option) { zval *link, *newval; @@ -3331,8 +3278,7 @@ PHP_FUNCTION(ldap_set_option) /* }}} */ #ifdef HAVE_LDAP_PARSE_RESULT -/* {{{ proto bool ldap_parse_result(resource link, resource result, int &errcode [, string &matcheddn [, string &errmsg [, array &referrals [, array &controls]]]]) - Extract information from result */ +/* {{{ Extract information from result */ PHP_FUNCTION(ldap_parse_result) { zval *link, *result, *errcode, *matcheddn, *errmsg, *referrals, *serverctrls; @@ -3407,8 +3353,7 @@ PHP_FUNCTION(ldap_parse_result) /* {{{ Extended operation response parsing, Pierangelo Masarati */ #ifdef HAVE_LDAP_PARSE_EXTENDED_RESULT -/* {{{ proto bool ldap_parse_exop(resource link, resource result [, string &retdata [, string &retoid]]) - Extract information from extended operation result */ +/* {{{ Extract information from extended operation result */ PHP_FUNCTION(ldap_parse_exop) { zval *link, *result, *retdata, *retoid; @@ -3464,8 +3409,7 @@ PHP_FUNCTION(ldap_parse_exop) #endif /* }}} */ -/* {{{ proto int ldap_count_references(resource link, resource result) - Count the number of references in a search result */ +/* {{{ Count the number of references in a search result */ PHP_FUNCTION(ldap_count_references) { zval *link, *result; @@ -3488,8 +3432,7 @@ PHP_FUNCTION(ldap_count_references) } /* }}} */ -/* {{{ proto resource ldap_first_reference(resource link, resource result) - Return first reference */ +/* {{{ Return first reference */ PHP_FUNCTION(ldap_first_reference) { zval *link, *result; @@ -3521,8 +3464,7 @@ PHP_FUNCTION(ldap_first_reference) } /* }}} */ -/* {{{ proto resource ldap_next_reference(resource link, resource reference_entry) - Get next reference */ +/* {{{ Get next reference */ PHP_FUNCTION(ldap_next_reference) { zval *link, *result_entry; @@ -3555,8 +3497,7 @@ PHP_FUNCTION(ldap_next_reference) /* }}} */ #ifdef HAVE_LDAP_PARSE_REFERENCE -/* {{{ proto bool ldap_parse_reference(resource link, resource reference_entry, array &referrals) - Extract information from reference entry */ +/* {{{ Extract information from reference entry */ PHP_FUNCTION(ldap_parse_reference) { zval *link, *result_entry, *referrals; @@ -3598,8 +3539,7 @@ PHP_FUNCTION(ldap_parse_reference) /* }}} */ #endif -/* {{{ php_ldap_do_rename - */ +/* {{{ php_ldap_do_rename */ static void php_ldap_do_rename(INTERNAL_FUNCTION_PARAMETERS, int ext) { zval *serverctrls = NULL; @@ -3680,16 +3620,14 @@ cleanup: } /* }}} */ -/* {{{ proto bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn [, array servercontrols]) - Modify the name of an entry */ +/* {{{ Modify the name of an entry */ PHP_FUNCTION(ldap_rename) { php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource ldap_rename_ext(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn [, array servercontrols]) - Modify the name of an entry */ +/* {{{ Modify the name of an entry */ PHP_FUNCTION(ldap_rename_ext) { php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -3697,8 +3635,7 @@ PHP_FUNCTION(ldap_rename_ext) /* }}} */ #ifdef HAVE_LDAP_START_TLS_S -/* {{{ proto bool ldap_start_tls(resource link) - Start TLS */ +/* {{{ Start TLS */ PHP_FUNCTION(ldap_start_tls) { zval *link; @@ -3727,8 +3664,7 @@ PHP_FUNCTION(ldap_start_tls) #endif /* (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) */ #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC) -/* {{{ _ldap_rebind_proc() -*/ +/* {{{ _ldap_rebind_proc() */ int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgid, void *params) { ldap_linkdata *ld; @@ -3760,8 +3696,7 @@ int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgi } /* }}} */ -/* {{{ proto bool ldap_set_rebind_proc(resource link, ?callable callback) - Set a callback function to do re-binds on referral chasing. */ +/* {{{ Set a callback function to do re-binds on referral chasing. */ PHP_FUNCTION(ldap_set_rebind_proc) { zval *link, *callback; @@ -3889,8 +3824,7 @@ PHP_FUNCTION(ldap_escape) } #ifdef STR_TRANSLATION -/* {{{ php_ldap_do_translate - */ +/* {{{ php_ldap_do_translate */ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) { char *value; @@ -3921,16 +3855,14 @@ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) } /* }}} */ -/* {{{ proto string ldap_t61_to_8859(string value) - Translate t61 characters to 8859 characters */ +/* {{{ Translate t61 characters to 8859 characters */ PHP_FUNCTION(ldap_t61_to_8859) { php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string ldap_8859_to_t61(string value) - Translate 8859 characters to t61 characters */ +/* {{{ Translate 8859 characters to t61 characters */ PHP_FUNCTION(ldap_8859_to_t61) { php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -3939,8 +3871,7 @@ PHP_FUNCTION(ldap_8859_to_t61) #endif #ifdef LDAP_CONTROL_PAGEDRESULTS -/* {{{ proto mixed ldap_control_paged_result(resource link, int pagesize [, bool iscritical [, string cookie]]) - Inject paged results control*/ +/* {{{ Inject paged results control*/ PHP_FUNCTION(ldap_control_paged_result) { zend_long pagesize; @@ -4033,8 +3964,7 @@ lcpr_error_out: } /* }}} */ -/* {{{ proto bool ldap_control_paged_result_response(resource link, resource result [, string &cookie [, int &estimated]]) - Extract paged results control response */ +/* {{{ Extract paged results control response */ PHP_FUNCTION(ldap_control_paged_result_response) { zval *link, *result, *cookie, *estimated; @@ -4131,8 +4061,7 @@ PHP_FUNCTION(ldap_control_paged_result_response) /* {{{ Extended operations, Pierangelo Masarati */ #ifdef HAVE_LDAP_EXTENDED_OPERATION_S -/* {{{ proto resource ldap_exop(resource link, string reqoid [, string reqdata [, array servercontrols [, string &retdata [, string &retoid]]]]) - Extended operation */ +/* {{{ Extended operation */ PHP_FUNCTION(ldap_exop) { zval *serverctrls = NULL; @@ -4234,8 +4163,7 @@ PHP_FUNCTION(ldap_exop) #endif #ifdef HAVE_LDAP_PASSWD -/* {{{ proto bool|string ldap_exop_passwd(resource link [, string user [, string oldpw [, string newpw [, array ctrls]]]]) - Passwd modify extended operation */ +/* {{{ Passwd modify extended operation */ PHP_FUNCTION(ldap_exop_passwd) { zval *link, *serverctrls; @@ -4327,8 +4255,7 @@ PHP_FUNCTION(ldap_exop_passwd) #endif #ifdef HAVE_LDAP_WHOAMI_S -/* {{{ proto bool|string ldap_exop_whoami(resource link) - Whoami extended operation */ +/* {{{ Whoami extended operation */ PHP_FUNCTION(ldap_exop_whoami) { zval *link; @@ -4363,8 +4290,7 @@ PHP_FUNCTION(ldap_exop_whoami) #endif #ifdef HAVE_LDAP_REFRESH_S -/* {{{ proto bool|int ldap_exop_refresh(resource link , string dn , int ttl) - DDS refresh extended operation */ +/* {{{ DDS refresh extended operation */ PHP_FUNCTION(ldap_exop_refresh) { zval *link, *ttl; diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index d77f6aa2fd..98402e2e49 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -892,8 +892,7 @@ static PHP_MINFO_FUNCTION(libxml) } /* }}} */ -/* {{{ proto void libxml_set_streams_context(resource streams_context) - Set the streams context for the next libxml document load or write */ +/* {{{ Set the streams context for the next libxml document load or write */ PHP_FUNCTION(libxml_set_streams_context) { zval *arg; @@ -910,8 +909,7 @@ PHP_FUNCTION(libxml_set_streams_context) } /* }}} */ -/* {{{ proto bool libxml_use_internal_errors([boolean use_errors]) - Disable libxml errors and allow user to fetch error information as needed */ +/* {{{ Disable libxml errors and allow user to fetch error information as needed */ PHP_FUNCTION(libxml_use_internal_errors) { xmlStructuredErrorFunc current_handler; @@ -951,8 +949,7 @@ PHP_FUNCTION(libxml_use_internal_errors) } /* }}} */ -/* {{{ proto object libxml_get_last_error() - Retrieve last error from libxml */ +/* {{{ Retrieve last error from libxml */ PHP_FUNCTION(libxml_get_last_error) { xmlErrorPtr error; @@ -983,8 +980,7 @@ PHP_FUNCTION(libxml_get_last_error) } /* }}} */ -/* {{{ proto object libxml_get_errors() - Retrieve array of errors */ +/* {{{ Retrieve array of errors */ PHP_FUNCTION(libxml_get_errors) { @@ -1025,8 +1021,7 @@ PHP_FUNCTION(libxml_get_errors) } /* }}} */ -/* {{{ proto void libxml_clear_errors() - Clear last error from libxml */ +/* {{{ Clear last error from libxml */ PHP_FUNCTION(libxml_clear_errors) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1046,8 +1041,7 @@ PHP_LIBXML_API zend_bool php_libxml_disable_entity_loader(zend_bool disable) /* return old; } /* }}} */ -/* {{{ proto bool libxml_disable_entity_loader([boolean disable]) - Disable/Enable ability to load external entities */ +/* {{{ Disable/Enable ability to load external entities */ PHP_FUNCTION(libxml_disable_entity_loader) { zend_bool disable = 1; @@ -1061,8 +1055,7 @@ PHP_FUNCTION(libxml_disable_entity_loader) } /* }}} */ -/* {{{ proto void libxml_set_external_entity_loader(callback resolver_function) - Changes the default external entity loader */ +/* {{{ Changes the default external entity loader */ PHP_FUNCTION(libxml_set_external_entity_loader) { zend_fcall_info fci; diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index f68c1f3c34..4f2533ada5 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1299,8 +1299,7 @@ PHP_MINFO_FUNCTION(mbstring) } /* }}} */ -/* {{{ proto string mb_language([string language]) - Sets the current language or Returns the current language as a string */ +/* {{{ Sets the current language or Returns the current language as a string */ PHP_FUNCTION(mb_language) { zend_string *name = NULL; @@ -1324,8 +1323,7 @@ PHP_FUNCTION(mb_language) } /* }}} */ -/* {{{ proto string mb_internal_encoding([string encoding]) - Sets the current internal encoding or Returns the current internal encoding as a string */ +/* {{{ Sets the current internal encoding or Returns the current internal encoding as a string */ PHP_FUNCTION(mb_internal_encoding) { const char *name = NULL; @@ -1353,8 +1351,7 @@ PHP_FUNCTION(mb_internal_encoding) } /* }}} */ -/* {{{ proto mixed mb_http_input([string type]) - Returns the input encoding */ +/* {{{ Returns the input encoding */ PHP_FUNCTION(mb_http_input) { char *typ = NULL; @@ -1448,8 +1445,7 @@ PHP_FUNCTION(mb_http_input) } /* }}} */ -/* {{{ proto string mb_http_output([string encoding]) - Sets the current output_encoding or returns the current output_encoding as a string */ +/* {{{ Sets the current output_encoding or returns the current output_encoding as a string */ PHP_FUNCTION(mb_http_output) { const char *name = NULL; @@ -1478,8 +1474,7 @@ PHP_FUNCTION(mb_http_output) } /* }}} */ -/* {{{ proto bool|array mb_detect_order([mixed encoding-list]) - Sets the current detect_order or Return the current detect_order as a array */ +/* {{{ Sets the current detect_order or Return the current detect_order as a array */ PHP_FUNCTION(mb_detect_order) { zend_string *order_str = NULL; @@ -1547,8 +1542,7 @@ static inline int php_mb_check_code_point(zend_long cp) return 1; } -/* {{{ proto string|int|true mb_substitute_character([string|int|null substitute_character]) - Sets the current substitute_character or returns the current substitute_character */ +/* {{{ Sets the current substitute_character or returns the current substitute_character */ PHP_FUNCTION(mb_substitute_character) { zend_string *substitute_character = NULL; @@ -1602,8 +1596,7 @@ PHP_FUNCTION(mb_substitute_character) } /* }}} */ -/* {{{ proto string mb_preferred_mime_name(string encoding) - Return the preferred MIME name (charset) as a string */ +/* {{{ Return the preferred MIME name (charset) as a string */ PHP_FUNCTION(mb_preferred_mime_name) { enum mbfl_no_encoding no_encoding; @@ -1633,8 +1626,7 @@ PHP_FUNCTION(mb_preferred_mime_name) #define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0) #define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0) -/* {{{ proto bool mb_parse_str(string encoded_string, array &result) - Parses GET/POST/COOKIE data and sets global variables */ +/* {{{ Parses GET/POST/COOKIE data and sets global variables */ PHP_FUNCTION(mb_parse_str) { zval *track_vars_array; @@ -1674,8 +1666,7 @@ PHP_FUNCTION(mb_parse_str) } /* }}} */ -/* {{{ proto string mb_output_handler(string contents, int status) - Returns string in output buffer converted to the http_output encoding */ +/* {{{ Returns string in output buffer converted to the http_output encoding */ PHP_FUNCTION(mb_output_handler) { char *arg_string; @@ -1778,8 +1769,7 @@ PHP_FUNCTION(mb_output_handler) } /* }}} */ -/* {{{ proto array mb_str_split(string str [, int split_length] [, string encoding]) - Convert a multibyte string to an array. If split_length is specified, +/* {{{ Convert a multibyte string to an array. If split_length is specified, break the string down into chunks each split_length characters long. */ /* structure to pass split params to the callback */ @@ -1941,8 +1931,7 @@ PHP_FUNCTION(mb_str_split) } /* }}} */ -/* {{{ proto int mb_strlen(string str [, string encoding]) - Get character numbers of a string */ +/* {{{ Get character numbers of a string */ PHP_FUNCTION(mb_strlen) { size_t n; @@ -1988,8 +1977,7 @@ static void handle_strpos_error(size_t error) { } } -/* {{{ proto int mb_strpos(string haystack, string needle [, int offset [, string encoding]]) - Find position of first occurrence of a string within another */ +/* {{{ Find position of first occurrence of a string within another */ PHP_FUNCTION(mb_strpos) { int reverse = 0; @@ -2017,8 +2005,7 @@ PHP_FUNCTION(mb_strpos) } /* }}} */ -/* {{{ proto int mb_strrpos(string haystack, string needle [, int offset [, string encoding]]) - Find position of last occurrence of a string within another */ +/* {{{ Find position of last occurrence of a string within another */ PHP_FUNCTION(mb_strrpos) { mbfl_string haystack, needle; @@ -2044,8 +2031,7 @@ PHP_FUNCTION(mb_strrpos) } /* }}} */ -/* {{{ proto int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - Finds position of first occurrence of a string within another, case insensitive */ +/* {{{ Finds position of first occurrence of a string within another, case insensitive */ PHP_FUNCTION(mb_stripos) { size_t n = (size_t) -1; @@ -2074,8 +2060,7 @@ PHP_FUNCTION(mb_stripos) } /* }}} */ -/* {{{ proto int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - Finds position of last occurrence of a string within another, case insensitive */ +/* {{{ Finds position of last occurrence of a string within another, case insensitive */ PHP_FUNCTION(mb_strripos) { size_t n = (size_t) -1; @@ -2158,32 +2143,28 @@ static void php_mb_strstr_variants(INTERNAL_FUNCTION_PARAMETERS, unsigned int va } } -/* {{{ proto string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - Finds first occurrence of a string within another */ +/* {{{ Finds first occurrence of a string within another */ PHP_FUNCTION(mb_strstr) { php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRSTR); } /* }}} */ -/* {{{ proto string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - Finds the last occurrence of a character in a string within another */ +/* {{{ Finds the last occurrence of a character in a string within another */ PHP_FUNCTION(mb_strrchr) { php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRCHR); } /* }}} */ -/* {{{ proto string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - Finds first occurrence of a string within another, case insensitive */ +/* {{{ Finds first occurrence of a string within another, case insensitive */ PHP_FUNCTION(mb_stristr) { php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRISTR); } /* }}} */ -/* {{{ proto string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - Finds the last occurrence of a character in a string within another, case insensitive */ +/* {{{ Finds the last occurrence of a character in a string within another, case insensitive */ PHP_FUNCTION(mb_strrichr) { php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRICHR); @@ -2195,8 +2176,7 @@ PHP_FUNCTION(mb_strrichr) #undef MB_STRISTR #undef MB_STRRICHR -/* {{{ proto int mb_substr_count(string haystack, string needle [, string encoding]) - Count the number of substring occurrences */ +/* {{{ Count the number of substring occurrences */ PHP_FUNCTION(mb_substr_count) { size_t n; @@ -2227,8 +2207,7 @@ PHP_FUNCTION(mb_substr_count) } /* }}} */ -/* {{{ proto string mb_substr(string str, int start [, int length [, string encoding]]) - Returns part of a string */ +/* {{{ Returns part of a string */ PHP_FUNCTION(mb_substr) { char *str; @@ -2290,8 +2269,7 @@ PHP_FUNCTION(mb_substr) } /* }}} */ -/* {{{ proto string mb_strcut(string str, int start [, int length [, string encoding]]) - Returns part of a string */ +/* {{{ Returns part of a string */ PHP_FUNCTION(mb_strcut) { zend_string *encoding = NULL; @@ -2346,8 +2324,7 @@ PHP_FUNCTION(mb_strcut) } /* }}} */ -/* {{{ proto int mb_strwidth(string str [, string encoding]) - Gets terminal width of a string */ +/* {{{ Gets terminal width of a string */ PHP_FUNCTION(mb_strwidth) { size_t n; @@ -2369,8 +2346,7 @@ PHP_FUNCTION(mb_strwidth) } /* }}} */ -/* {{{ proto string mb_strimwidth(string str, int start, int width [, string trimmarker [, string encoding]]) - Trim the string in terminal width */ +/* {{{ Trim the string in terminal width */ PHP_FUNCTION(mb_strimwidth) { char *str, *trimmarker = NULL; @@ -2592,8 +2568,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons /* }}} */ -/* {{{ proto string mb_convert_encoding(string str, string to-encoding [, mixed from-encoding]) - Returns converted string in desired encoding */ +/* {{{ Returns converted string in desired encoding */ PHP_FUNCTION(mb_convert_encoding) { zend_string *to_encoding_name; @@ -2674,8 +2649,7 @@ static char *mbstring_convert_case( MBSTRG(current_filter_illegal_mode), MBSTRG(current_filter_illegal_substchar)); } -/* {{{ proto string mb_convert_case(string source_string, int mode [, string encoding]) - Returns a case-folded version of source_string */ +/* {{{ Returns a case-folded version of source_string */ PHP_FUNCTION(mb_convert_case) { zend_string *from_encoding = NULL; @@ -2711,9 +2685,7 @@ PHP_FUNCTION(mb_convert_case) } /* }}} */ -/* {{{ proto string mb_strtoupper(string source_string [, string encoding]) - * Returns a upper cased version of source_string - */ +/* {{{ Returns a upper cased version of source_string */ PHP_FUNCTION(mb_strtoupper) { zend_string *from_encoding = NULL; @@ -2742,9 +2714,7 @@ PHP_FUNCTION(mb_strtoupper) } /* }}} */ -/* {{{ proto string mb_strtolower(string source_string [, string encoding]) - * Returns a lower cased version of source_string - */ +/* {{{ Returns a lower cased version of source_string */ PHP_FUNCTION(mb_strtolower) { zend_string *from_encoding = NULL; @@ -2773,8 +2743,7 @@ PHP_FUNCTION(mb_strtolower) } /* }}} */ -/* {{{ proto string mb_detect_encoding(string str [, mixed encoding_list [, bool strict]]) - Encodings of the given string is returned (as a string) */ +/* {{{ Encodings of the given string is returned (as a string) */ PHP_FUNCTION(mb_detect_encoding) { char *str; @@ -2840,8 +2809,7 @@ PHP_FUNCTION(mb_detect_encoding) } /* }}} */ -/* {{{ proto mixed mb_list_encodings() - Returns an array of all supported entity encodings */ +/* {{{ Returns an array of all supported entity encodings */ PHP_FUNCTION(mb_list_encodings) { const mbfl_encoding **encodings; @@ -2861,8 +2829,7 @@ PHP_FUNCTION(mb_list_encodings) } /* }}} */ -/* {{{ proto array mb_encoding_aliases(string encoding) - Returns an array of the aliases of a given encoding name */ +/* {{{ Returns an array of the aliases of a given encoding name */ PHP_FUNCTION(mb_encoding_aliases) { const mbfl_encoding *encoding; @@ -2887,8 +2854,7 @@ PHP_FUNCTION(mb_encoding_aliases) } /* }}} */ -/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed [, int indent]]]]) - Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */ +/* {{{ Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */ PHP_FUNCTION(mb_encode_mimeheader) { const mbfl_encoding *charset, *transenc; @@ -2939,8 +2905,7 @@ PHP_FUNCTION(mb_encode_mimeheader) } /* }}} */ -/* {{{ proto string mb_decode_mimeheader(string string) - Decodes the MIME "encoded-word" in the string */ +/* {{{ Decodes the MIME "encoded-word" in the string */ PHP_FUNCTION(mb_decode_mimeheader) { mbfl_string string, result, *ret; @@ -2960,8 +2925,7 @@ PHP_FUNCTION(mb_decode_mimeheader) } /* }}} */ -/* {{{ proto string mb_convert_kana(string str [, string option] [, string encoding]) - Conversion between full-width character and half-width character (Japanese) */ +/* {{{ Conversion between full-width character and half-width character (Japanese) */ PHP_FUNCTION(mb_convert_kana) { int opt; @@ -3147,8 +3111,7 @@ static int mb_recursive_convert_variable(mbfl_buffer_converter *convd, zval *var return 0; } /* }}} */ -/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding, mixed vars [, ...]) - Converts the string resource in variables to desired encoding */ +/* {{{ Converts the string resource in variables to desired encoding */ PHP_FUNCTION(mb_convert_variables) { zval *args; @@ -3322,16 +3285,14 @@ php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type) } /* }}} */ -/* {{{ proto string mb_encode_numericentity(string string, array convmap [, string encoding [, bool is_hex]]) - Converts specified characters to HTML numeric entities */ +/* {{{ Converts specified characters to HTML numeric entities */ PHP_FUNCTION(mb_encode_numericentity) { php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string mb_decode_numericentity(string string, array convmap [, string encoding]) - Converts HTML numeric entities to character code */ +/* {{{ Converts HTML numeric entities to character code */ PHP_FUNCTION(mb_decode_numericentity) { php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -3339,9 +3300,7 @@ PHP_FUNCTION(mb_decode_numericentity) /* }}} */ /* }}} */ -/* {{{ proto int mb_send_mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Sends an email message with MIME scheme - */ +/* {{{ Sends an email message with MIME scheme */ #define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos) \ if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) { \ @@ -3810,8 +3769,7 @@ PHP_FUNCTION(mb_send_mail) #undef PHP_MBSTR_MAIL_MIME_HEADER4 /* }}} */ -/* {{{ proto mixed mb_get_info([string type]) - Returns the current settings of mbstring */ +/* {{{ Returns the current settings of mbstring */ PHP_FUNCTION(mb_get_info) { char *typ = NULL; @@ -4074,8 +4032,7 @@ static int php_mb_check_encoding_recursive(HashTable *vars, const mbfl_encoding } -/* {{{ proto bool mb_check_encoding([mixed var[, string encoding]]) - Check if the string is valid for the specified encoding */ +/* {{{ Check if the string is valid for the specified encoding */ PHP_FUNCTION(mb_check_encoding) { zend_string *input_str = NULL, *enc = NULL; @@ -4160,7 +4117,7 @@ static inline zend_long php_mb_ord(const char *str, size_t str_len, zend_string } -/* {{{ proto int|false mb_ord([string str[, string encoding]]) */ +/* {{{ */ PHP_FUNCTION(mb_ord) { char *str; @@ -4277,7 +4234,7 @@ static inline zend_string *php_mb_chr(zend_long cp, zend_string *enc_name, uint3 } -/* {{{ proto string|false mb_chr([int cp[, string encoding]]) */ +/* {{{ */ PHP_FUNCTION(mb_chr) { zend_long cp; @@ -4299,7 +4256,7 @@ PHP_FUNCTION(mb_chr) } /* }}} */ -/* {{{ proto string mb_scrub([string str[, string encoding]]) */ +/* {{{ */ PHP_FUNCTION(mb_scrub) { const mbfl_encoding *enc; @@ -4436,8 +4393,7 @@ MBSTRING_API char *php_mb_safe_strrchr(const char *s, unsigned int c, size_t nby } /* }}} */ -/* {{{ MBSTRING_API int php_mb_stripos() - */ +/* {{{ MBSTRING_API int php_mb_stripos() */ MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t old_haystack_len, const char *old_needle, size_t old_needle_len, zend_long offset, const mbfl_encoding *enc) { size_t n = (size_t) -1; diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index b3c37826b1..a797efbf7b 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -846,8 +846,7 @@ static inline void mb_regex_substitute( * php functions */ -/* {{{ proto string mb_regex_encoding([string encoding]) - Returns the current encoding for regex as a string. */ +/* {{{ Returns the current encoding for regex as a string. */ PHP_FUNCTION(mb_regex_encoding) { char *encoding = NULL; @@ -982,16 +981,14 @@ out: } /* }}} */ -/* {{{ proto int mb_ereg(string pattern, string string [, array registers]) - Regular expression match for multibyte string */ +/* {{{ Regular expression match for multibyte string */ PHP_FUNCTION(mb_ereg) { _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int mb_eregi(string pattern, string string [, array registers]) - Case-insensitive regular expression match for multibyte string */ +/* {{{ Case-insensitive regular expression match for multibyte string */ PHP_FUNCTION(mb_eregi) { _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -1178,32 +1175,28 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp } /* }}} */ -/* {{{ proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - Replace regular expression for multibyte string */ +/* {{{ Replace regular expression for multibyte string */ PHP_FUNCTION(mb_ereg_replace) { _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); } /* }}} */ -/* {{{ proto string mb_eregi_replace(string pattern, string replacement, string string) - Case insensitive replace regular expression for multibyte string */ +/* {{{ Case insensitive replace regular expression for multibyte string */ PHP_FUNCTION(mb_eregi_replace) { _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, ONIG_OPTION_IGNORECASE, 0); } /* }}} */ -/* {{{ proto string mb_ereg_replace_callback(string pattern, string callback, string string [, string option]) - regular expression for multibyte string using replacement callback */ +/* {{{ regular expression for multibyte string using replacement callback */ PHP_FUNCTION(mb_ereg_replace_callback) { _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1); } /* }}} */ -/* {{{ proto array mb_split(string pattern, string string [, int limit]) - split multibyte string into array by regular expression */ +/* {{{ split multibyte string into array by regular expression */ PHP_FUNCTION(mb_split) { char *arg_pattern; @@ -1285,8 +1278,7 @@ PHP_FUNCTION(mb_split) } /* }}} */ -/* {{{ proto bool mb_ereg_match(string pattern, string string [,string option]) - Regular expression match for multibyte string */ +/* {{{ Regular expression match for multibyte string */ PHP_FUNCTION(mb_ereg_match) { char *arg_pattern; @@ -1463,32 +1455,28 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) } /* }}} */ -/* {{{ proto bool mb_ereg_search([string pattern[, string option]]) - Regular expression search for multibyte string */ +/* {{{ Regular expression search for multibyte string */ PHP_FUNCTION(mb_ereg_search) { _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto array mb_ereg_search_pos([string pattern[, string option]]) - Regular expression search for multibyte string */ +/* {{{ Regular expression search for multibyte string */ PHP_FUNCTION(mb_ereg_search_pos) { _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto array mb_ereg_search_regs([string pattern[, string option]]) - Regular expression search for multibyte string */ +/* {{{ Regular expression search for multibyte string */ PHP_FUNCTION(mb_ereg_search_regs) { _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ -/* {{{ proto bool mb_ereg_search_init(string string [, string pattern[, string option]]) - Initialize string and regular expression for search. */ +/* {{{ Initialize string and regular expression for search. */ PHP_FUNCTION(mb_ereg_search_init) { zend_string *arg_str; @@ -1546,8 +1534,7 @@ PHP_FUNCTION(mb_ereg_search_init) } /* }}} */ -/* {{{ proto array mb_ereg_search_getregs(void) - Get matched substring of the last time */ +/* {{{ Get matched substring of the last time */ PHP_FUNCTION(mb_ereg_search_getregs) { size_t n, i, len; @@ -1589,8 +1576,7 @@ PHP_FUNCTION(mb_ereg_search_getregs) } /* }}} */ -/* {{{ proto int mb_ereg_search_getpos(void) - Get search start position */ +/* {{{ Get search start position */ PHP_FUNCTION(mb_ereg_search_getpos) { if (zend_parse_parameters_none() == FAILURE) { @@ -1601,8 +1587,7 @@ PHP_FUNCTION(mb_ereg_search_getpos) } /* }}} */ -/* {{{ proto bool mb_ereg_search_setpos(int position) - Set search start position */ +/* {{{ Set search start position */ PHP_FUNCTION(mb_ereg_search_setpos) { zend_long position; @@ -1641,8 +1626,7 @@ static void _php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *sy } /* }}} */ -/* {{{ proto string mb_regex_set_options([string options]) - Set or get the default options for mbregex functions */ +/* {{{ Set or get the default options for mbregex functions */ PHP_FUNCTION(mb_regex_set_options) { OnigOptionType opt, prev_opt; diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index ec7d296b24..f832352edb 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -192,8 +192,7 @@ void php_clear_mysql(MY_MYSQL *mysql) { } /* }}} */ -/* {{{ mysqli_objects_free_storage - */ +/* {{{ mysqli_objects_free_storage */ static void mysqli_objects_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -208,8 +207,7 @@ static void mysqli_objects_free_storage(zend_object *object) /* mysqli_link_free_storage partly doubles the work of PHP_FUNCTION(mysqli_close) */ -/* {{{ mysqli_link_free_storage - */ +/* {{{ mysqli_link_free_storage */ static void mysqli_link_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -235,8 +233,7 @@ static void mysqli_driver_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_stmt_free_storage - */ +/* {{{ mysqli_stmt_free_storage */ static void mysqli_stmt_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -250,8 +247,7 @@ static void mysqli_stmt_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_result_free_storage - */ +/* {{{ mysqli_result_free_storage */ static void mysqli_result_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -264,8 +260,7 @@ static void mysqli_result_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_warning_free_storage - */ +/* {{{ mysqli_warning_free_storage */ static void mysqli_warning_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -421,8 +416,7 @@ HashTable *mysqli_object_get_debug_info(zend_object *object, int *is_temp) return retval; } -/* {{{ mysqli_objects_new - */ +/* {{{ mysqli_objects_new */ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type) { mysqli_object *intern; @@ -487,8 +481,7 @@ static const MYSQLND_REVERSE_API mysqli_reverse_api = { }; #endif -/* {{{ PHP_INI_BEGIN -*/ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mysqli.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_mysqli_globals, mysqli_globals, display_link_numbers) @@ -508,8 +501,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(mysqli) { #if defined(COMPILE_DL_MYSQLI) && defined(ZTS) @@ -535,8 +527,7 @@ static PHP_GINIT_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(mysqli) { zend_class_entry *ce,cex; @@ -840,8 +831,7 @@ PHP_MINIT_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(mysqli) { #ifndef MYSQLI_USE_MYSQLND @@ -871,8 +861,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(mysqli) { #if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) @@ -906,8 +895,7 @@ static int php_mysqli_persistent_helper_once(zend_rsrc_list_entry *le) #endif -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(mysqli) { /* check persistent connections, move used to free */ @@ -927,8 +915,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli) /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(mysqli) { char buf[32]; @@ -962,8 +949,7 @@ static const zend_module_dep mysqli_deps[] = { ZEND_MOD_END }; -/* {{{ mysqli_module_entry - */ +/* {{{ mysqli_module_entry */ zend_module_entry mysqli_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, mysqli_deps, @@ -1096,8 +1082,7 @@ PHP_METHOD(mysqli_result, getIterator) zend_create_internal_iterator_zval(return_value, ZEND_THIS); } -/* {{{ php_mysqli_fetch_into_hash_aux - */ +/* {{{ php_mysqli_fetch_into_hash_aux */ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype) { #ifndef MYSQLI_USE_MYSQLND @@ -1169,8 +1154,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend } /* }}} */ -/* {{{ php_mysqli_fetch_into_hash - */ +/* {{{ php_mysqli_fetch_into_hash */ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object) { MYSQL_RES *result; diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 0a360d6a6e..8dbbd45c8e 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -133,8 +133,7 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co /* }}} */ #endif -/* {{{ proto mixed mysqli_affected_rows(object link) - Get number of affected rows in previous MySQL operation */ +/* {{{ Get number of affected rows in previous MySQL operation */ PHP_FUNCTION(mysqli_affected_rows) { MY_MYSQL *mysql; @@ -155,8 +154,7 @@ PHP_FUNCTION(mysqli_affected_rows) } /* }}} */ -/* {{{ proto bool mysqli_autocommit(object link, bool mode) - Turn auto commit on or of */ +/* {{{ Turn auto commit on or of */ PHP_FUNCTION(mysqli_autocommit) { MY_MYSQL *mysql; @@ -311,8 +309,7 @@ end: #endif /* }}} */ -/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed ...]) - Bind variables to a prepared statement as parameters */ +/* {{{ Bind variables to a prepared statement as parameters */ PHP_FUNCTION(mysqli_stmt_bind_param) { zval *args; @@ -574,8 +571,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc) #endif /* }}} */ -/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var [,mixed ...]) - Bind variables to a prepared statement for result storage */ +/* {{{ Bind variables to a prepared statement for result storage */ PHP_FUNCTION(mysqli_stmt_bind_result) { zval *args; @@ -600,8 +596,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result) } /* }}} */ -/* {{{ proto bool mysqli_change_user(object link, string user, string password, string database) - Change logged-in user of the active connection */ +/* {{{ Change logged-in user of the active connection */ PHP_FUNCTION(mysqli_change_user) { MY_MYSQL *mysql; @@ -647,8 +642,7 @@ PHP_FUNCTION(mysqli_change_user) } /* }}} */ -/* {{{ proto string mysqli_character_set_name(object link) - Returns the name of the character set used for this connection */ +/* {{{ Returns the name of the character set used for this connection */ PHP_FUNCTION(mysqli_character_set_name) { MY_MYSQL *mysql; @@ -708,8 +702,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status) } /* }}} */ -/* {{{ proto bool mysqli_close(object link) - Close connection */ +/* {{{ Close connection */ PHP_FUNCTION(mysqli_close) { zval *mysql_link; @@ -730,8 +723,7 @@ PHP_FUNCTION(mysqli_close) } /* }}} */ -/* {{{ proto bool mysqli_commit(object link[, int flags [, string name ]]) - Commit outstanding actions and close transaction */ +/* {{{ Commit outstanding actions and close transaction */ PHP_FUNCTION(mysqli_commit) { MY_MYSQL *mysql; @@ -756,8 +748,7 @@ PHP_FUNCTION(mysqli_commit) } /* }}} */ -/* {{{ proto bool mysqli_data_seek(object result, int offset) - Move internal result pointer */ +/* {{{ Move internal result pointer */ PHP_FUNCTION(mysqli_data_seek) { MYSQL_RES *result; @@ -784,8 +775,7 @@ PHP_FUNCTION(mysqli_data_seek) } /* }}} */ -/* {{{ proto bool mysqli_debug(string debug) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_debug) { char *debug; @@ -800,8 +790,7 @@ PHP_FUNCTION(mysqli_debug) } /* }}} */ -/* {{{ proto bool mysqli_dump_debug_info(object link) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_dump_debug_info) { MY_MYSQL *mysql; @@ -816,8 +805,7 @@ PHP_FUNCTION(mysqli_dump_debug_info) } /* }}} */ -/* {{{ proto int mysqli_errno(object link) - Returns the numerical value of the error message from previous MySQL operation */ +/* {{{ Returns the numerical value of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_errno) { MY_MYSQL *mysql; @@ -831,8 +819,7 @@ PHP_FUNCTION(mysqli_errno) } /* }}} */ -/* {{{ proto string mysqli_error(object link) - Returns the text of the error message from previous MySQL operation */ +/* {{{ Returns the text of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_error) { MY_MYSQL *mysql; @@ -850,8 +837,7 @@ PHP_FUNCTION(mysqli_error) } /* }}} */ -/* {{{ proto bool mysqli_stmt_execute(object stmt) - Execute a prepared statement */ +/* {{{ Execute a prepared statement */ PHP_FUNCTION(mysqli_stmt_execute) { MY_STMT *stmt; @@ -1121,8 +1107,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS) #endif /* }}} */ -/* {{{ proto mixed mysqli_stmt_fetch(object stmt) - Fetch results from a prepared statement into the bound variables */ +/* {{{ Fetch results from a prepared statement into the bound variables */ PHP_FUNCTION(mysqli_stmt_fetch) { #ifndef MYSQLI_USE_MYSQLND @@ -1163,8 +1148,7 @@ static void php_add_field_properties(zval *value, const MYSQL_FIELD *field) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_field(object result) - Get column information from a result and return as an object */ +/* {{{ Get column information from a result and return as an object */ PHP_FUNCTION(mysqli_fetch_field) { MYSQL_RES *result; @@ -1186,8 +1170,7 @@ PHP_FUNCTION(mysqli_fetch_field) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_fields(object result) - Return array of objects containing field meta-data */ +/* {{{ Return array of objects containing field meta-data */ PHP_FUNCTION(mysqli_fetch_fields) { MYSQL_RES *result; @@ -1216,8 +1199,7 @@ PHP_FUNCTION(mysqli_fetch_fields) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_field_direct(object result, int offset) - Fetch meta-data for a single field */ +/* {{{ Fetch meta-data for a single field */ PHP_FUNCTION(mysqli_fetch_field_direct) { MYSQL_RES *result; @@ -1245,8 +1227,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_lengths(object result) - Get the length of each output in a result */ +/* {{{ Get the length of each output in a result */ PHP_FUNCTION(mysqli_fetch_lengths) { MYSQL_RES *result; @@ -1277,17 +1258,14 @@ PHP_FUNCTION(mysqli_fetch_lengths) } /* }}} */ -/* {{{ proto array mysqli_fetch_row(object result) - Get a result row as an enumerated array */ +/* {{{ Get a result row as an enumerated array */ PHP_FUNCTION(mysqli_fetch_row) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0); } /* }}} */ -/* {{{ proto int mysqli_field_count(object link) - Fetch the number of fields returned by the last query for the given link -*/ +/* {{{ Fetch the number of fields returned by the last query for the given link */ PHP_FUNCTION(mysqli_field_count) { MY_MYSQL *mysql; @@ -1302,9 +1280,7 @@ PHP_FUNCTION(mysqli_field_count) } /* }}} */ -/* {{{ proto int mysqli_field_seek(object result, int fieldnr) - Set result pointer to a specified field offset -*/ +/* {{{ Set result pointer to a specified field offset */ PHP_FUNCTION(mysqli_field_seek) { MYSQL_RES *result; @@ -1326,8 +1302,7 @@ PHP_FUNCTION(mysqli_field_seek) } /* }}} */ -/* {{{ proto int mysqli_field_tell(object result) - Get current field offset of result pointer */ +/* {{{ Get current field offset of result pointer */ PHP_FUNCTION(mysqli_field_tell) { MYSQL_RES *result; @@ -1342,8 +1317,7 @@ PHP_FUNCTION(mysqli_field_tell) } /* }}} */ -/* {{{ proto void mysqli_free_result(object result) - Free query result memory for the given result handle */ +/* {{{ Free query result memory for the given result handle */ PHP_FUNCTION(mysqli_free_result) { MYSQL_RES *result; @@ -1359,8 +1333,7 @@ PHP_FUNCTION(mysqli_free_result) } /* }}} */ -/* {{{ proto string mysqli_get_client_info(void) - Get MySQL client info */ +/* {{{ Get MySQL client info */ PHP_FUNCTION(mysqli_get_client_info) { if (getThis()) { @@ -1382,8 +1355,7 @@ PHP_FUNCTION(mysqli_get_client_info) } /* }}} */ -/* {{{ proto int mysqli_get_client_version(void) - Get MySQL client info */ +/* {{{ Get MySQL client info */ PHP_FUNCTION(mysqli_get_client_version) { if (zend_parse_parameters_none() == FAILURE) { @@ -1394,8 +1366,7 @@ PHP_FUNCTION(mysqli_get_client_version) } /* }}} */ -/* {{{ proto string mysqli_get_host_info(object link) - Get MySQL host info */ +/* {{{ Get MySQL host info */ PHP_FUNCTION(mysqli_get_host_info) { MY_MYSQL *mysql; @@ -1413,8 +1384,7 @@ PHP_FUNCTION(mysqli_get_host_info) } /* }}} */ -/* {{{ proto int mysqli_get_proto_info(object link) - Get MySQL protocol information */ +/* {{{ Get MySQL protocol information */ PHP_FUNCTION(mysqli_get_proto_info) { MY_MYSQL *mysql; @@ -1428,8 +1398,7 @@ PHP_FUNCTION(mysqli_get_proto_info) } /* }}} */ -/* {{{ proto string mysqli_get_server_info(object link) - Get MySQL server info */ +/* {{{ Get MySQL server info */ PHP_FUNCTION(mysqli_get_server_info) { MY_MYSQL *mysql; @@ -1448,8 +1417,7 @@ PHP_FUNCTION(mysqli_get_server_info) } /* }}} */ -/* {{{ proto int mysqli_get_server_version(object link) - Return the MySQL version for the server referenced by the given link */ +/* {{{ Return the MySQL version for the server referenced by the given link */ PHP_FUNCTION(mysqli_get_server_version) { MY_MYSQL *mysql; @@ -1464,8 +1432,7 @@ PHP_FUNCTION(mysqli_get_server_version) } /* }}} */ -/* {{{ proto string mysqli_info(object link) - Get information about the most recent query */ +/* {{{ Get information about the most recent query */ PHP_FUNCTION(mysqli_info) { MY_MYSQL *mysql; @@ -1526,24 +1493,21 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_method) } /* }}} */ -/* {{{ proto resource mysqli_init(void) - Initialize mysqli and return a resource for use with mysql_real_connect */ +/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */ PHP_FUNCTION(mysqli_init) { php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE); } /* }}} */ -/* {{{ proto resource mysqli::init(void) - Initialize mysqli and return a resource for use with mysql_real_connect */ +/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */ PHP_FUNCTION(mysqli_init_method) { php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE); } /* }}} */ -/* {{{ proto mixed mysqli_insert_id(object link) - Get the ID generated from the previous INSERT operation */ +/* {{{ Get the ID generated from the previous INSERT operation */ PHP_FUNCTION(mysqli_insert_id) { MY_MYSQL *mysql; @@ -1559,8 +1523,7 @@ PHP_FUNCTION(mysqli_insert_id) } /* }}} */ -/* {{{ proto bool mysqli_kill(object link, int processid) - Kill a mysql process on the server */ +/* {{{ Kill a mysql process on the server */ PHP_FUNCTION(mysqli_kill) { MY_MYSQL *mysql; @@ -1585,8 +1548,7 @@ PHP_FUNCTION(mysqli_kill) } /* }}} */ -/* {{{ proto bool mysqli_more_results(object link) - check if there any more query results from a multi query */ +/* {{{ check if there any more query results from a multi query */ PHP_FUNCTION(mysqli_more_results) { MY_MYSQL *mysql; @@ -1601,8 +1563,7 @@ PHP_FUNCTION(mysqli_more_results) } /* }}} */ -/* {{{ proto bool mysqli_next_result(object link) - read next result from multi_query */ +/* {{{ read next result from multi_query */ PHP_FUNCTION(mysqli_next_result) { MY_MYSQL *mysql; zval *mysql_link; @@ -1617,8 +1578,7 @@ PHP_FUNCTION(mysqli_next_result) { /* }}} */ #if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND) -/* {{{ proto bool mysqli_stmt_more_results(object link) - check if there any more query results from a multi query */ +/* {{{ check if there any more query results from a multi query */ PHP_FUNCTION(mysqli_stmt_more_results) { MY_STMT *stmt; @@ -1633,8 +1593,7 @@ PHP_FUNCTION(mysqli_stmt_more_results) } /* }}} */ -/* {{{ proto bool mysqli_stmt_next_result(object link) - read next result from multi_query */ +/* {{{ read next result from multi_query */ PHP_FUNCTION(mysqli_stmt_next_result) { MY_STMT *stmt; zval *mysql_stmt; @@ -1649,8 +1608,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) { /* }}} */ #endif -/* {{{ proto int mysqli_num_fields(object result) - Get number of fields in result */ +/* {{{ Get number of fields in result */ PHP_FUNCTION(mysqli_num_fields) { MYSQL_RES *result; @@ -1665,8 +1623,7 @@ PHP_FUNCTION(mysqli_num_fields) } /* }}} */ -/* {{{ proto mixed mysqli_num_rows(object result) - Get number of rows in result */ +/* {{{ Get number of rows in result */ PHP_FUNCTION(mysqli_num_rows) { MYSQL_RES *result; @@ -1751,8 +1708,7 @@ static int mysqli_options_get_option_zval_type(int option) } /* }}} */ -/* {{{ proto bool mysqli_options(object link, int flags, mixed values) - Set options */ +/* {{{ Set options */ PHP_FUNCTION(mysqli_options) { MY_MYSQL *mysql; @@ -1807,8 +1763,7 @@ PHP_FUNCTION(mysqli_options) } /* }}} */ -/* {{{ proto bool mysqli_ping(object link) - Ping a server connection or reconnect if there is no connection */ +/* {{{ Ping a server connection or reconnect if there is no connection */ PHP_FUNCTION(mysqli_ping) { MY_MYSQL *mysql; @@ -1826,8 +1781,7 @@ PHP_FUNCTION(mysqli_ping) } /* }}} */ -/* {{{ proto mixed mysqli_prepare(object link, string query) - Prepare a SQL statement for execution */ +/* {{{ Prepare a SQL statement for execution */ PHP_FUNCTION(mysqli_prepare) { MY_MYSQL *mysql; @@ -1910,16 +1864,14 @@ PHP_FUNCTION(mysqli_prepare) } /* }}} */ -/* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]]) - Open a connection to a mysql server */ +/* {{{ Open a connection to a mysql server */ PHP_FUNCTION(mysqli_real_connect) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE); } /* }}} */ -/* {{{ proto bool mysqli_real_query(object link, string query) - Binary-safe version of mysql_query() */ +/* {{{ Binary-safe version of mysql_query() */ PHP_FUNCTION(mysqli_real_query) { MY_MYSQL *mysql; @@ -1949,8 +1901,7 @@ PHP_FUNCTION(mysqli_real_query) } /* }}} */ -/* {{{ proto string mysqli_real_escape_string(object link, string escapestr) - Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */ +/* {{{ Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */ PHP_FUNCTION(mysqli_real_escape_string) { MY_MYSQL *mysql; zval *mysql_link = NULL; @@ -1971,8 +1922,7 @@ PHP_FUNCTION(mysqli_real_escape_string) { } /* }}} */ -/* {{{ proto bool mysqli_rollback(object link) - Undo actions from current transaction */ +/* {{{ Undo actions from current transaction */ PHP_FUNCTION(mysqli_rollback) { MY_MYSQL *mysql; @@ -1997,8 +1947,7 @@ PHP_FUNCTION(mysqli_rollback) } /* }}} */ -/* {{{ proto bool mysqli_stmt_send_long_data(object stmt, int param_nr, string data) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_send_long_data) { MY_STMT *stmt; @@ -2023,8 +1972,7 @@ PHP_FUNCTION(mysqli_stmt_send_long_data) } /* }}} */ -/* {{{ proto string|int|false mysqli_stmt_affected_rows(object stmt) - Return the number of rows affected in the last query for the given link. */ +/* {{{ Return the number of rows affected in the last query for the given link. */ PHP_FUNCTION(mysqli_stmt_affected_rows) { MY_STMT *stmt; @@ -2044,8 +1992,7 @@ PHP_FUNCTION(mysqli_stmt_affected_rows) } /* }}} */ -/* {{{ proto bool mysqli_stmt_close(object stmt) - Close statement */ +/* {{{ Close statement */ PHP_FUNCTION(mysqli_stmt_close) { MY_STMT *stmt; @@ -2064,8 +2011,7 @@ PHP_FUNCTION(mysqli_stmt_close) } /* }}} */ -/* {{{ proto void mysqli_stmt_data_seek(object stmt, int offset) - Move internal result pointer */ +/* {{{ Move internal result pointer */ PHP_FUNCTION(mysqli_stmt_data_seek) { MY_STMT *stmt; @@ -2086,8 +2032,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek) } /* }}} */ -/* {{{ proto int mysqli_stmt_field_count(object stmt) { - Return the number of result columns for the given statement */ +/* {{{ Return the number of result columns for the given statement */ PHP_FUNCTION(mysqli_stmt_field_count) { MY_STMT *stmt; @@ -2102,8 +2047,7 @@ PHP_FUNCTION(mysqli_stmt_field_count) } /* }}} */ -/* {{{ proto void mysqli_stmt_free_result(object stmt) - Free stored result memory for the given statement handle */ +/* {{{ Free stored result memory for the given statement handle */ PHP_FUNCTION(mysqli_stmt_free_result) { MY_STMT *stmt; @@ -2119,8 +2063,7 @@ PHP_FUNCTION(mysqli_stmt_free_result) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_insert_id(object stmt) - Get the ID generated from the previous INSERT operation */ +/* {{{ Get the ID generated from the previous INSERT operation */ PHP_FUNCTION(mysqli_stmt_insert_id) { MY_STMT *stmt; @@ -2136,8 +2079,7 @@ PHP_FUNCTION(mysqli_stmt_insert_id) } /* }}} */ -/* {{{ proto int mysqli_stmt_param_count(object stmt) - Return the number of parameter for the given statement */ +/* {{{ Return the number of parameter for the given statement */ PHP_FUNCTION(mysqli_stmt_param_count) { MY_STMT *stmt; @@ -2152,8 +2094,7 @@ PHP_FUNCTION(mysqli_stmt_param_count) } /* }}} */ -/* {{{ proto bool mysqli_stmt_reset(object stmt) - reset a prepared statement */ +/* {{{ reset a prepared statement */ PHP_FUNCTION(mysqli_stmt_reset) { MY_STMT *stmt; @@ -2172,8 +2113,7 @@ PHP_FUNCTION(mysqli_stmt_reset) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_num_rows(object stmt) - Return the number of rows in statements result set */ +/* {{{ Return the number of rows in statements result set */ PHP_FUNCTION(mysqli_stmt_num_rows) { MY_STMT *stmt; @@ -2191,8 +2131,7 @@ PHP_FUNCTION(mysqli_stmt_num_rows) } /* }}} */ -/* {{{ proto bool mysqli_select_db(object link, string dbname) - Select a MySQL database */ +/* {{{ Select a MySQL database */ PHP_FUNCTION(mysqli_select_db) { MY_MYSQL *mysql; @@ -2213,8 +2152,7 @@ PHP_FUNCTION(mysqli_select_db) } /* }}} */ -/* {{{ proto string mysqli_sqlstate(object link) - Returns the SQLSTATE error from previous MySQL operation */ +/* {{{ Returns the SQLSTATE error from previous MySQL operation */ PHP_FUNCTION(mysqli_sqlstate) { MY_MYSQL *mysql; @@ -2232,8 +2170,7 @@ PHP_FUNCTION(mysqli_sqlstate) } /* }}} */ -/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_ssl_set) { MY_MYSQL *mysql; @@ -2258,8 +2195,7 @@ PHP_FUNCTION(mysqli_ssl_set) } /* }}} */ -/* {{{ proto mixed mysqli_stat(object link) - Get current system status */ +/* {{{ Get current system status */ PHP_FUNCTION(mysqli_stat) { MY_MYSQL *mysql; @@ -2291,8 +2227,7 @@ PHP_FUNCTION(mysqli_stat) /* }}} */ -/* {{{ proto bool mysqli_refresh(object link, int options) - Flush tables or caches, or reset replication server information */ +/* {{{ Flush tables or caches, or reset replication server information */ PHP_FUNCTION(mysqli_refresh) { MY_MYSQL *mysql; @@ -2311,8 +2246,7 @@ PHP_FUNCTION(mysqli_refresh) } /* }}} */ -/* {{{ proto int mysqli_stmt_attr_set(object stmt, int attr, int mode) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_attr_set) { MY_STMT *stmt; @@ -2358,8 +2292,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set) } /* }}} */ -/* {{{ proto int mysqli_stmt_attr_get(object stmt, int attr) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_attr_get) { MY_STMT *stmt; @@ -2385,8 +2318,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get) } /* }}} */ -/* {{{ proto int mysqli_stmt_errno(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_errno) { MY_STMT *stmt; @@ -2401,8 +2333,7 @@ PHP_FUNCTION(mysqli_stmt_errno) } /* }}} */ -/* {{{ proto string mysqli_stmt_error(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_error) { MY_STMT *stmt; @@ -2421,9 +2352,7 @@ PHP_FUNCTION(mysqli_stmt_error) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_init(object link) - Initialize statement object -*/ +/* {{{ Initialize statement object */ PHP_FUNCTION(mysqli_stmt_init) { MY_MYSQL *mysql; @@ -2453,9 +2382,7 @@ PHP_FUNCTION(mysqli_stmt_init) } /* }}} */ -/* {{{ proto bool mysqli_stmt_prepare(object stmt, string query) - prepare server side statement with query -*/ +/* {{{ prepare server side statement with query */ PHP_FUNCTION(mysqli_stmt_prepare) { MY_STMT *stmt; @@ -2478,8 +2405,7 @@ PHP_FUNCTION(mysqli_stmt_prepare) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_result_metadata(object stmt) - return result set from statement */ +/* {{{ return result set from statement */ PHP_FUNCTION(mysqli_stmt_result_metadata) { MY_STMT *stmt; @@ -2504,8 +2430,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata) } /* }}} */ -/* {{{ proto bool mysqli_stmt_store_result(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_store_result) { MY_STMT *stmt; @@ -2553,8 +2478,7 @@ PHP_FUNCTION(mysqli_stmt_store_result) } /* }}} */ -/* {{{ proto string mysqli_stmt_sqlstate(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_sqlstate) { MY_STMT *stmt; @@ -2573,8 +2497,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate) } /* }}} */ -/* {{{ proto object mysqli_store_result(object link [, int flags]) - Buffer result set on client */ +/* {{{ Buffer result set on client */ PHP_FUNCTION(mysqli_store_result) { MY_MYSQL *mysql; @@ -2608,8 +2531,7 @@ PHP_FUNCTION(mysqli_store_result) } /* }}} */ -/* {{{ proto int mysqli_thread_id(object link) - Return the current thread ID */ +/* {{{ Return the current thread ID */ PHP_FUNCTION(mysqli_thread_id) { MY_MYSQL *mysql; @@ -2624,8 +2546,7 @@ PHP_FUNCTION(mysqli_thread_id) } /* }}} */ -/* {{{ proto bool mysqli_thread_safe(void) - Return whether thread safety is given or not */ +/* {{{ Return whether thread safety is given or not */ PHP_FUNCTION(mysqli_thread_safe) { if (zend_parse_parameters_none() == FAILURE) { @@ -2636,8 +2557,7 @@ PHP_FUNCTION(mysqli_thread_safe) } /* }}} */ -/* {{{ proto mixed mysqli_use_result(object link) - Directly retrieve query results - do not buffer results on client side */ +/* {{{ Directly retrieve query results - do not buffer results on client side */ PHP_FUNCTION(mysqli_use_result) { MY_MYSQL *mysql; @@ -2665,8 +2585,7 @@ PHP_FUNCTION(mysqli_use_result) } /* }}} */ -/* {{{ proto int mysqli_warning_count(object link) - Return number of warnings from the last query for the given link */ +/* {{{ Return number of warnings from the last query for the given link */ PHP_FUNCTION(mysqli_warning_count) { MY_MYSQL *mysql; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 5f3114e9df..ba97e0aa24 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -31,8 +31,7 @@ #define SAFE_STR(a) ((a)?a:"") -/* {{{ php_mysqli_set_error - */ +/* {{{ php_mysqli_set_error */ static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err) { MyG(error_no) = mysql_errno; @@ -370,24 +369,21 @@ err: RETVAL_FALSE; } /* }}} */ -/* {{{ proto object mysqli_connect([string hostname [,string username [,string passwd [,string dbname [,int port [,string socket]]]]]]) - Open a connection to a mysql server */ +/* {{{ Open a connection to a mysql server */ PHP_FUNCTION(mysqli_connect) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE); } /* }}} */ -/* {{{ proto object mysqli_link_construct() - */ +/* {{{ */ PHP_FUNCTION(mysqli_link_construct) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE); } /* }}} */ -/* {{{ proto int mysqli_connect_errno(void) - Returns the numerical value of the error message from last connect command */ +/* {{{ Returns the numerical value of the error message from last connect command */ PHP_FUNCTION(mysqli_connect_errno) { if (zend_parse_parameters_none() == FAILURE) { @@ -398,8 +394,7 @@ PHP_FUNCTION(mysqli_connect_errno) } /* }}} */ -/* {{{ proto string mysqli_connect_error(void) - Returns the text of the error message from previous MySQL operation */ +/* {{{ Returns the text of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_connect_error) { if (zend_parse_parameters_none() == FAILURE) { @@ -414,24 +409,21 @@ PHP_FUNCTION(mysqli_connect_error) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_array(object result [,int resulttype]) - Fetch a result row as an associative array, a numeric array, or both */ +/* {{{ Fetch a result row as an associative array, a numeric array, or both */ PHP_FUNCTION(mysqli_fetch_array) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); } /* }}} */ -/* {{{ proto mixed mysqli_fetch_assoc(object result) - Fetch a result row as an associative array */ +/* {{{ Fetch a result row as an associative array */ PHP_FUNCTION(mysqli_fetch_assoc) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0); } /* }}} */ -/* {{{ proto mixed mysqli_fetch_all(object result [,int resulttype]) - Fetches all result rows as an associative array, a numeric array, or both */ +/* {{{ Fetches all result rows as an associative array, a numeric array, or both */ #ifdef MYSQLI_USE_MYSQLND PHP_FUNCTION(mysqli_fetch_all) { @@ -454,8 +446,7 @@ PHP_FUNCTION(mysqli_fetch_all) } /* }}} */ -/* {{{ proto array mysqli_get_client_stats(void) - Returns statistics about the zval cache */ +/* {{{ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_client_stats) { if (zend_parse_parameters_none() == FAILURE) { @@ -465,8 +456,7 @@ PHP_FUNCTION(mysqli_get_client_stats) } /* }}} */ -/* {{{ proto array mysqli_get_connection_stats(void) - Returns statistics about the zval cache */ +/* {{{ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_connection_stats) { MY_MYSQL *mysql; @@ -483,8 +473,7 @@ PHP_FUNCTION(mysqli_get_connection_stats) #endif /* }}} */ -/* {{{ proto mixed mysqli_error_list(object connection) - Fetches all client errors */ +/* {{{ Fetches all client errors */ PHP_FUNCTION(mysqli_error_list) { MY_MYSQL *mysql; @@ -529,8 +518,7 @@ PHP_FUNCTION(mysqli_error_list) } /* }}} */ -/* {{{ proto string mysqli_stmt_error_list(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_error_list) { MY_STMT *stmt; @@ -575,16 +563,14 @@ PHP_FUNCTION(mysqli_stmt_error_list) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_object(object result [, string class_name [, NULL|array ctor_params]]) - Fetch a result row as an object */ +/* {{{ Fetch a result row as an object */ PHP_FUNCTION(mysqli_fetch_object) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1); } /* }}} */ -/* {{{ proto bool mysqli_multi_query(object link, string query) - allows to execute multiple queries */ +/* {{{ allows to execute multiple queries */ PHP_FUNCTION(mysqli_multi_query) { MY_MYSQL *mysql; @@ -631,7 +617,7 @@ PHP_FUNCTION(mysqli_multi_query) } /* }}} */ -/* {{{ proto mixed mysqli_query(object link, string query [,int resultmode]) */ +/* {{{ */ PHP_FUNCTION(mysqli_query) { MY_MYSQL *mysql; @@ -835,8 +821,7 @@ static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, z } /* }}} */ -/* {{{ proto int mysqli_poll(array read, array write, array error, int sec [, int usec]) U - Poll connections */ +/* {{{ Poll connections */ PHP_FUNCTION(mysqli_poll) { zval *r_array, *e_array, *dont_poll_array; @@ -899,8 +884,7 @@ PHP_FUNCTION(mysqli_poll) } /* }}} */ -/* {{{ proto int mysqli_reap_async_query(object link) U - Poll connections */ +/* {{{ Poll connections */ PHP_FUNCTION(mysqli_reap_async_query) { MY_MYSQL *mysql; @@ -952,8 +936,7 @@ PHP_FUNCTION(mysqli_reap_async_query) } /* }}} */ -/* {{{ proto object mysqli_stmt_get_result(object link) U - Buffer result set on client */ +/* {{{ Buffer result set on client */ PHP_FUNCTION(mysqli_stmt_get_result) { MYSQL_RES *result; @@ -979,7 +962,7 @@ PHP_FUNCTION(mysqli_stmt_get_result) /* }}} */ #endif -/* {{{ proto object mysqli_get_warnings(object link) */ +/* {{{ */ PHP_FUNCTION(mysqli_get_warnings) { MY_MYSQL *mysql; @@ -1009,7 +992,7 @@ PHP_FUNCTION(mysqli_get_warnings) } /* }}} */ -/* {{{ proto object mysqli_stmt_get_warnings(object link) */ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_get_warnings) { MY_STMT *stmt; @@ -1035,8 +1018,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings) } /* }}} */ -/* {{{ proto bool mysqli_set_charset(object link, string csname) - sets client character set */ +/* {{{ sets client character set */ PHP_FUNCTION(mysqli_set_charset) { MY_MYSQL *mysql; @@ -1056,8 +1038,7 @@ PHP_FUNCTION(mysqli_set_charset) } /* }}} */ -/* {{{ proto object mysqli_get_charset(object link) U - returns a character set object */ +/* {{{ returns a character set object */ PHP_FUNCTION(mysqli_get_charset) { MY_MYSQL *mysql; @@ -1116,7 +1097,7 @@ PHP_FUNCTION(mysqli_get_charset) #ifndef MYSQLI_USE_MYSQLND extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name); -/* {{{ proto bool mysqli_begin_transaction_libmysql */ +/* {{{ */ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name) { int ret; @@ -1165,8 +1146,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo /* }}} */ #endif -/* {{{ proto bool mysqli_begin_transaction(object link, [int flags [, string name]]) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_begin_transaction) { MY_MYSQL *mysql; @@ -1206,7 +1186,7 @@ PHP_FUNCTION(mysqli_begin_transaction) /* }}} */ #ifndef MYSQLI_USE_MYSQLND -/* {{{ proto bool mysqli_savepoint_libmysql */ +/* {{{ */ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release) { int ret; @@ -1219,8 +1199,7 @@ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend /* }}} */ #endif -/* {{{ proto bool mysqli_savepoint(object link, string name) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_savepoint) { MY_MYSQL *mysql; @@ -1248,8 +1227,7 @@ PHP_FUNCTION(mysqli_savepoint) } /* }}} */ -/* {{{ proto bool mysqli_release_savepoint(object link, string name) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_release_savepoint) { MY_MYSQL *mysql; @@ -1276,8 +1254,7 @@ PHP_FUNCTION(mysqli_release_savepoint) } /* }}} */ -/* {{{ proto bool mysqli_get_links_stats() - Returns information about open and cached links */ +/* {{{ Returns information about open and cached links */ PHP_FUNCTION(mysqli_get_links_stats) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index 64cff6cb49..e12015c2b0 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -25,8 +25,7 @@ extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...); -/* {{{ proto bool mysqli_report(int flags) - sets report level */ +/* {{{ sets report level */ PHP_FUNCTION(mysqli_report) { zend_long flags; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 71b11019d0..ab7fc61f94 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -41,8 +41,7 @@ const char mysqlnd_read_body_name[] = "mysqlnd_read_body"; #define ERROR_MARKER 0xFF #define EODATA_MARKER 0xFE -/* {{{ mysqlnd_command_to_text - */ +/* {{{ mysqlnd_command_to_text */ const char * const mysqlnd_command_to_text[COM_END] = { "SLEEP", "QUIT", "INIT_DB", "QUERY", "FIELD_LIST", diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index c3ed9ca8f2..dc0ec54728 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -83,8 +83,7 @@ mysqlnd_minfo_dump_api_plugins(smart_str * buffer) /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(mysqlnd) { char buf[32]; @@ -143,8 +142,7 @@ PHP_MINFO_FUNCTION(mysqlnd) PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd) -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(mysqlnd) { #if defined(COMPILE_DL_MYSQLND) && defined(ZTS) @@ -173,8 +171,7 @@ static PHP_GINIT_FUNCTION(mysqlnd) /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateNetCmdBufferSize) { zend_long long_value; @@ -190,8 +187,7 @@ static PHP_INI_MH(OnUpdateNetCmdBufferSize) /* }}} */ -/* {{{ PHP_INI_BEGIN -*/ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("mysqlnd.collect_statistics", "1", PHP_INI_ALL, OnUpdateBool, collect_statistics, zend_mysqlnd_globals, mysqlnd_globals) STD_PHP_INI_BOOLEAN("mysqlnd.collect_memory_statistics","0",PHP_INI_SYSTEM, OnUpdateBool, collect_memory_statistics, zend_mysqlnd_globals, mysqlnd_globals) @@ -217,8 +213,7 @@ PHP_INI_END() /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(mysqlnd) { REGISTER_INI_ENTRIES(); @@ -229,8 +224,7 @@ static PHP_MINIT_FUNCTION(mysqlnd) /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(mysqlnd) { mysqlnd_library_end(); @@ -242,8 +236,7 @@ static PHP_MSHUTDOWN_FUNCTION(mysqlnd) #if PHP_DEBUG -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(mysqlnd) { if (MYSQLND_G(debug)) { @@ -268,8 +261,7 @@ static PHP_RINIT_FUNCTION(mysqlnd) #if PHP_DEBUG -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ static PHP_RSHUTDOWN_FUNCTION(mysqlnd) { MYSQLND_DEBUG * dbg = MYSQLND_G(dbg); @@ -296,8 +288,7 @@ static const zend_module_dep mysqlnd_deps[] = { ZEND_MOD_END }; -/* {{{ mysqlnd_module_entry - */ +/* {{{ mysqlnd_module_entry */ zend_module_entry mysqlnd_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 3a43f837ae..e5aeafc7fe 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -124,8 +124,7 @@ ZEND_GET_MODULE(oci8) #include "oci8_arginfo.h" -/* {{{ extension definition structures -*/ +/* {{{ extension definition structures */ zend_module_entry oci8_module_entry = { STANDARD_MODULE_HEADER, @@ -163,8 +162,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ startup, shutdown and info functions -*/ +/* {{{ startup, shutdown and info functions */ /* {{{ php_oci_init_global_handles() * diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index a822514432..2dba527625 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -40,8 +40,7 @@ #define OCI_STMT_CALL 10 #endif -/* {{{ proto bool oci_register_taf_callback( resource connection [, mixed callback] ) - Register a callback function for Oracle Transparent Application Failover (TAF) */ +/* {{{ Register a callback function for Oracle Transparent Application Failover (TAF) */ PHP_FUNCTION(oci_register_taf_callback) { zval *z_connection; @@ -93,8 +92,7 @@ PHP_FUNCTION(oci_register_taf_callback) } /* }}} */ -/* {{{ proto bool oci_unregister_taf_callback( resource connection ) - * Unregister a callback function for Oracle Transparent Application Failover (TAF) */ +/* {{{ Unregister a callback function for Oracle Transparent Application Failover (TAF) */ PHP_FUNCTION(oci_unregister_taf_callback) { zval *z_connection; @@ -114,8 +112,7 @@ PHP_FUNCTION(oci_unregister_taf_callback) } /* }}} */ -/* {{{ proto bool oci_define_by_name(resource stmt, string name, mixed &var [, int type]) - Define a PHP variable to an Oracle column by name */ +/* {{{ Define a PHP variable to an Oracle column by name */ /* if you want to define a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE defining!!! */ PHP_FUNCTION(oci_define_by_name) { @@ -182,8 +179,7 @@ PHP_FUNCTION(oci_define_by_name) } /* }}} */ -/* {{{ proto bool oci_bind_by_name(resource stmt, string name, mixed &var [, int maxlength [, int type]]) - Bind a PHP variable to an Oracle placeholder by name */ +/* {{{ Bind a PHP variable to an Oracle placeholder by name */ /* if you want to bind a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE binding!!! */ PHP_FUNCTION(oci_bind_by_name) { @@ -217,8 +213,7 @@ PHP_FUNCTION(oci_bind_by_name) } /* }}} */ -/* {{{ proto bool oci_bind_array_by_name(resource stmt, string name, array &var, int max_table_length [, int max_item_length [, int type ]]) - Bind a PHP array to an Oracle PL/SQL type by name */ +/* {{{ Bind a PHP array to an Oracle PL/SQL type by name */ PHP_FUNCTION(oci_bind_array_by_name) { size_t name_len; @@ -258,8 +253,7 @@ PHP_FUNCTION(oci_bind_array_by_name) } /* }}} */ -/* {{{ proto bool oci_free_descriptor() - Deletes large object description */ +/* {{{ Deletes large object description */ PHP_FUNCTION(oci_free_descriptor) { zval *tmp, *z_descriptor; @@ -281,8 +275,7 @@ PHP_FUNCTION(oci_free_descriptor) } /* }}} */ -/* {{{ proto bool oci_lob_save( string data [, int offset ]) - Saves a large object */ +/* {{{ Saves a large object */ PHP_FUNCTION(oci_lob_save) { zval *tmp, *z_descriptor; @@ -315,8 +308,7 @@ PHP_FUNCTION(oci_lob_save) } /* }}} */ -/* {{{ proto bool oci_lob_import( string filename ) - Loads file into a LOB */ +/* {{{ Loads file into a LOB */ PHP_FUNCTION(oci_lob_import) { zval *tmp, *z_descriptor; @@ -342,8 +334,7 @@ PHP_FUNCTION(oci_lob_import) } /* }}} */ -/* {{{ proto string oci_lob_load() - Loads a large object */ +/* {{{ Loads a large object */ PHP_FUNCTION(oci_lob_load) { zval *tmp, *z_descriptor; @@ -377,8 +368,7 @@ PHP_FUNCTION(oci_lob_load) } /* }}} */ -/* {{{ proto string oci_lob_read( int length ) - Reads particular part of a large object */ +/* {{{ Reads particular part of a large object */ PHP_FUNCTION(oci_lob_read) { zval *tmp, *z_descriptor; @@ -417,8 +407,7 @@ PHP_FUNCTION(oci_lob_read) } /* }}} */ -/* {{{ proto bool oci_lob_eof() - Checks if EOF is reached */ +/* {{{ Checks if EOF is reached */ PHP_FUNCTION(oci_lob_eof) { zval *tmp, *z_descriptor; @@ -445,8 +434,7 @@ PHP_FUNCTION(oci_lob_eof) } /* }}} */ -/* {{{ proto int oci_lob_tell() - Tells LOB pointer position */ +/* {{{ Tells LOB pointer position */ PHP_FUNCTION(oci_lob_tell) { zval *tmp, *z_descriptor; @@ -467,8 +455,7 @@ PHP_FUNCTION(oci_lob_tell) } /* }}} */ -/* {{{ proto bool oci_lob_rewind() - Rewind pointer of a LOB */ +/* {{{ Rewind pointer of a LOB */ PHP_FUNCTION(oci_lob_rewind) { zval *tmp, *z_descriptor; @@ -491,8 +478,7 @@ PHP_FUNCTION(oci_lob_rewind) } /* }}} */ -/* {{{ proto bool oci_lob_seek( int offset [, int whence ]) - Moves the pointer of a LOB */ +/* {{{ Moves the pointer of a LOB */ PHP_FUNCTION(oci_lob_seek) { zval *tmp, *z_descriptor; @@ -540,8 +526,7 @@ PHP_FUNCTION(oci_lob_seek) } /* }}} */ -/* {{{ proto int oci_lob_size() - Returns size of a large object */ +/* {{{ Returns size of a large object */ PHP_FUNCTION(oci_lob_size) { zval *tmp, *z_descriptor; @@ -566,8 +551,7 @@ PHP_FUNCTION(oci_lob_size) } /* }}} */ -/* {{{ proto int oci_lob_write( string string [, int length ]) - Writes data to current position of a LOB */ +/* {{{ Writes data to current position of a LOB */ PHP_FUNCTION(oci_lob_write) { zval *tmp, *z_descriptor; @@ -607,8 +591,7 @@ PHP_FUNCTION(oci_lob_write) } /* }}} */ -/* {{{ proto bool oci_lob_append( object lob ) - Appends data from a LOB to another LOB */ +/* {{{ Appends data from a LOB to another LOB */ PHP_FUNCTION(oci_lob_append) { zval *tmp_dest, *tmp_from, *z_descriptor_dest, *z_descriptor_from; @@ -639,8 +622,7 @@ PHP_FUNCTION(oci_lob_append) } /* }}} */ -/* {{{ proto bool oci_lob_truncate( [ int length ]) - Truncates a LOB */ +/* {{{ Truncates a LOB */ PHP_FUNCTION(oci_lob_truncate) { zval *tmp, *z_descriptor; @@ -672,8 +654,7 @@ PHP_FUNCTION(oci_lob_truncate) } /* }}} */ -/* {{{ proto int oci_lob_erase( [ int offset [, int length ] ] ) - Erases a specified portion of the internal LOB, starting at a specified offset */ +/* {{{ Erases a specified portion of the internal LOB, starting at a specified offset */ PHP_FUNCTION(oci_lob_erase) { zval *tmp, *z_descriptor; @@ -719,8 +700,7 @@ PHP_FUNCTION(oci_lob_erase) } /* }}} */ -/* {{{ proto bool oci_lob_flush( [ int flag ] ) - Flushes the LOB buffer */ +/* {{{ Flushes the LOB buffer */ PHP_FUNCTION(oci_lob_flush) { zval *tmp, *z_descriptor; @@ -750,8 +730,7 @@ PHP_FUNCTION(oci_lob_flush) } /* }}} */ -/* {{{ proto bool ocisetbufferinglob( boolean flag ) - Enables/disables buffering for a LOB */ +/* {{{ Enables/disables buffering for a LOB */ PHP_FUNCTION(ocisetbufferinglob) { zval *tmp, *z_descriptor; @@ -776,8 +755,7 @@ PHP_FUNCTION(ocisetbufferinglob) } /* }}} */ -/* {{{ proto bool ocigetbufferinglob() - Returns current state of buffering for a LOB */ +/* {{{ Returns current state of buffering for a LOB */ PHP_FUNCTION(ocigetbufferinglob) { zval *tmp, *z_descriptor; @@ -801,8 +779,7 @@ PHP_FUNCTION(ocigetbufferinglob) } /* }}} */ -/* {{{ proto bool oci_lob_copy( object lob_to, object lob_from [, int length ] ) - Copies data from a LOB to another LOB */ +/* {{{ Copies data from a LOB to another LOB */ PHP_FUNCTION(oci_lob_copy) { zval *tmp_dest, *tmp_from, *z_descriptor_dest, *z_descriptor_from; @@ -843,8 +820,7 @@ PHP_FUNCTION(oci_lob_copy) } /* }}} */ -/* {{{ proto bool oci_lob_is_equal( object lob1, object lob2 ) - Tests to see if two LOB/FILE locators are equal */ +/* {{{ Tests to see if two LOB/FILE locators are equal */ PHP_FUNCTION(oci_lob_is_equal) { zval *tmp_first, *tmp_second, *z_descriptor_first, *z_descriptor_second; @@ -879,8 +855,7 @@ PHP_FUNCTION(oci_lob_is_equal) } /* }}} */ -/* {{{ proto bool oci_lob_export([string filename [, int start [, int length]]]) - Writes a large object into a file */ +/* {{{ Writes a large object into a file */ PHP_FUNCTION(oci_lob_export) { zval *tmp, *z_descriptor; @@ -985,8 +960,7 @@ PHP_FUNCTION(oci_lob_export) } /* }}} */ -/* {{{ proto bool oci_lob_write_temporary(string var [, int lob_type]) - Writes temporary blob */ +/* {{{ Writes temporary blob */ PHP_FUNCTION(oci_lob_write_temporary) { zval *tmp, *z_descriptor; @@ -1013,8 +987,7 @@ PHP_FUNCTION(oci_lob_write_temporary) } /* }}} */ -/* {{{ proto bool oci_lob_close() - Closes lob descriptor */ +/* {{{ Closes lob descriptor */ PHP_FUNCTION(oci_lob_close) { zval *tmp, *z_descriptor; @@ -1038,8 +1011,7 @@ PHP_FUNCTION(oci_lob_close) } /* }}} */ -/* {{{ proto object oci_new_descriptor(resource connection [, int type]) - Initialize a new empty descriptor LOB/FILE (LOB is default) */ +/* {{{ Initialize a new empty descriptor LOB/FILE (LOB is default) */ PHP_FUNCTION(oci_new_descriptor) { zval *z_connection; @@ -1065,8 +1037,7 @@ PHP_FUNCTION(oci_new_descriptor) } /* }}} */ -/* {{{ proto bool oci_rollback(resource connection) - Rollback the current context */ +/* {{{ Rollback the current context */ PHP_FUNCTION(oci_rollback) { zval *z_connection; @@ -1089,8 +1060,7 @@ PHP_FUNCTION(oci_rollback) } /* }}} */ -/* {{{ proto bool oci_commit(resource connection) - Commit the current context */ +/* {{{ Commit the current context */ PHP_FUNCTION(oci_commit) { zval *z_connection; @@ -1113,8 +1083,7 @@ PHP_FUNCTION(oci_commit) } /* }}} */ -/* {{{ proto string oci_field_name(resource stmt, mixed col) - Tell the name of a column */ +/* {{{ Tell the name of a column */ PHP_FUNCTION(oci_field_name) { php_oci_out_column *column; @@ -1126,8 +1095,7 @@ PHP_FUNCTION(oci_field_name) } /* }}} */ -/* {{{ proto int oci_field_size(resource stmt, mixed col) - Tell the maximum data size of a column */ +/* {{{ Tell the maximum data size of a column */ PHP_FUNCTION(oci_field_size) { php_oci_out_column *column; @@ -1143,8 +1111,7 @@ PHP_FUNCTION(oci_field_size) } /* }}} */ -/* {{{ proto int oci_field_scale(resource stmt, mixed col) - Tell the scale of a column */ +/* {{{ Tell the scale of a column */ PHP_FUNCTION(oci_field_scale) { php_oci_out_column *column; @@ -1156,8 +1123,7 @@ PHP_FUNCTION(oci_field_scale) } /* }}} */ -/* {{{ proto int oci_field_precision(resource stmt, mixed col) - Tell the precision of a column */ +/* {{{ Tell the precision of a column */ PHP_FUNCTION(oci_field_precision) { php_oci_out_column *column; @@ -1169,8 +1135,7 @@ PHP_FUNCTION(oci_field_precision) } /* }}} */ -/* {{{ proto mixed oci_field_type(resource stmt, mixed col) - Tell the data type of a column */ +/* {{{ Tell the data type of a column */ PHP_FUNCTION(oci_field_type) { php_oci_out_column *column; @@ -1249,8 +1214,7 @@ PHP_FUNCTION(oci_field_type) } /* }}} */ -/* {{{ proto int oci_field_type_raw(resource stmt, mixed col) - Tell the raw oracle data type of a column */ +/* {{{ Tell the raw oracle data type of a column */ PHP_FUNCTION(oci_field_type_raw) { php_oci_out_column *column; @@ -1263,8 +1227,7 @@ PHP_FUNCTION(oci_field_type_raw) } /* }}} */ -/* {{{ proto bool oci_field_is_null(resource stmt, mixed col) - Tell whether a field in the current row is NULL */ +/* {{{ Tell whether a field in the current row is NULL */ PHP_FUNCTION(oci_field_is_null) { php_oci_out_column *column; @@ -1278,16 +1241,14 @@ PHP_FUNCTION(oci_field_is_null) } /* }}} */ -/* {{{ proto void oci_internal_debug(int onoff) - Toggle internal debugging output for the OCI extension */ +/* {{{ Toggle internal debugging output for the OCI extension */ PHP_FUNCTION(oci_internal_debug) { /* NOP in OCI8 2.0. Obsoleted by DTrace probes */ } /* }}} */ -/* {{{ proto bool oci_execute(resource stmt [, int mode]) - Execute a parsed statement */ +/* {{{ Execute a parsed statement */ PHP_FUNCTION(oci_execute) { zval *z_statement; @@ -1309,8 +1270,7 @@ PHP_FUNCTION(oci_execute) } /* }}} */ -/* {{{ proto bool oci_cancel(resource stmt) - Cancel reading from a cursor */ +/* {{{ Cancel reading from a cursor */ PHP_FUNCTION(oci_cancel) { zval *z_statement; @@ -1329,8 +1289,7 @@ PHP_FUNCTION(oci_cancel) } /* }}} */ -/* {{{ proto bool oci_fetch(resource stmt) - Prepare a new row of data for reading */ +/* {{{ Prepare a new row of data for reading */ PHP_FUNCTION(oci_fetch) { zval *z_statement; @@ -1350,16 +1309,14 @@ PHP_FUNCTION(oci_fetch) } /* }}} */ -/* {{{ proto int ocifetchinto(resource stmt, array &output [, int mode]) - Fetch a row of result data into an array */ +/* {{{ Fetch a row of result data into an array */ PHP_FUNCTION(ocifetchinto) { php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM, 3); } /* }}} */ -/* {{{ proto int oci_fetch_all(resource stmt, array &output[, int skip[, int maxrows[, int flags]]]) - Fetch all rows of result data into an array */ +/* {{{ Fetch all rows of result data into an array */ PHP_FUNCTION(oci_fetch_all) { zval *z_statement, *array; @@ -1488,8 +1445,7 @@ PHP_FUNCTION(oci_fetch_all) } /* }}} */ -/* {{{ proto object oci_fetch_object( resource stmt ) - Fetch a result row as an object */ +/* {{{ Fetch a result row as an object */ PHP_FUNCTION(oci_fetch_object) { php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS, 2); @@ -1500,32 +1456,28 @@ PHP_FUNCTION(oci_fetch_object) } /* }}} */ -/* {{{ proto array oci_fetch_row( resource stmt ) - Fetch a result row as an enumerated array */ +/* {{{ Fetch a result row as an enumerated array */ PHP_FUNCTION(oci_fetch_row) { php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM | PHP_OCI_RETURN_NULLS, 1); } /* }}} */ -/* {{{ proto array oci_fetch_assoc( resource stmt ) - Fetch a result row as an associative array */ +/* {{{ Fetch a result row as an associative array */ PHP_FUNCTION(oci_fetch_assoc) { php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS, 1); } /* }}} */ -/* {{{ proto array oci_fetch_array( resource stmt [, int mode ]) - Fetch a result row as an array */ +/* {{{ Fetch a result row as an array */ PHP_FUNCTION(oci_fetch_array) { php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS, 2); } /* }}} */ -/* {{{ proto bool oci_free_statement(resource stmt) - Free all resources associated with a statement */ +/* {{{ Free all resources associated with a statement */ PHP_FUNCTION(oci_free_statement) { zval *z_statement; @@ -1542,8 +1494,7 @@ PHP_FUNCTION(oci_free_statement) } /* }}} */ -/* {{{ proto bool oci_close(resource connection) - Disconnect from database */ +/* {{{ Disconnect from database */ PHP_FUNCTION(oci_close) { /* oci_close for pconnect (if old_oci_close_semantics not set) would @@ -1582,32 +1533,28 @@ PHP_FUNCTION(oci_close) } /* }}} */ -/* {{{ proto resource oci_new_connect(string user, string pass [, string db, string charset [, int session_mode ]]) - Connect to an Oracle database and log on. Returns a new session. */ +/* {{{ Connect to an Oracle database and log on. Returns a new session. */ PHP_FUNCTION(oci_new_connect) { php_oci_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1); } /* }}} */ -/* {{{ proto resource oci_connect(string user, string pass [, string db [, string charset [, int session_mode ]]) - Connect to an Oracle database and log on. Returns a new session. */ +/* {{{ Connect to an Oracle database and log on. Returns a new session. */ PHP_FUNCTION(oci_connect) { php_oci_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); } /* }}} */ -/* {{{ proto resource oci_pconnect(string user, string pass [, string db [, string charset [, int session_mode ]]) - Connect to an Oracle database using a persistent connection and log on. Returns a new session. */ +/* {{{ Connect to an Oracle database using a persistent connection and log on. Returns a new session. */ PHP_FUNCTION(oci_pconnect) { php_oci_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 0); } /* }}} */ -/* {{{ proto array oci_error([resource stmt|connection|global]) - Return the last error of stmt|connection|global. If no error happened returns false. */ +/* {{{ Return the last error of stmt|connection|global. If no error happened returns false. */ PHP_FUNCTION(oci_error) { zval *arg = NULL; @@ -1679,8 +1626,7 @@ go_out: } /* }}} */ -/* {{{ proto int oci_num_fields(resource stmt) - Return the number of result columns in a statement */ +/* {{{ Return the number of result columns in a statement */ PHP_FUNCTION(oci_num_fields) { zval *z_statement; @@ -1696,8 +1642,7 @@ PHP_FUNCTION(oci_num_fields) } /* }}} */ -/* {{{ proto resource oci_parse(resource connection, string statement) - Parse a SQL or PL/SQL statement and return a statement resource */ +/* {{{ Parse a SQL or PL/SQL statement and return a statement resource */ PHP_FUNCTION(oci_parse) { zval *z_connection; @@ -1722,8 +1667,7 @@ PHP_FUNCTION(oci_parse) } /* }}} */ -/* {{{ proto bool oci_set_prefetch(resource stmt, int prefetch_rows) - Sets the number of rows to be prefetched on execute to prefetch_rows for stmt */ +/* {{{ Sets the number of rows to be prefetched on execute to prefetch_rows for stmt */ PHP_FUNCTION(oci_set_prefetch) { zval *z_statement; @@ -1749,8 +1693,7 @@ PHP_FUNCTION(oci_set_prefetch) } /* }}} */ -/* {{{ proto bool oci_set_client_identifier(resource connection, string value) - Sets the client identifier attribute on the connection */ +/* {{{ Sets the client identifier attribute on the connection */ PHP_FUNCTION(oci_set_client_identifier) { zval *z_connection; @@ -1801,8 +1744,7 @@ PHP_FUNCTION(oci_set_client_identifier) } /* }}} */ -/* {{{ proto bool oci_set_edition(string value) - Sets the edition attribute for all subsequent connections created */ +/* {{{ Sets the edition attribute for all subsequent connections created */ PHP_FUNCTION(oci_set_edition) { char *edition; @@ -1833,8 +1775,7 @@ PHP_FUNCTION(oci_set_edition) } /* }}} */ -/* {{{ proto bool oci_set_module_name(resource connection, string value) - Sets the module attribute on the connection for end-to-end tracing */ +/* {{{ Sets the module attribute on the connection for end-to-end tracing */ PHP_FUNCTION(oci_set_module_name) { zval *z_connection; @@ -1868,8 +1809,7 @@ PHP_FUNCTION(oci_set_module_name) } /* }}} */ -/* {{{ proto bool oci_set_action(resource connection, string value) - Sets the action attribute on the connection for end-to-end tracing */ +/* {{{ Sets the action attribute on the connection for end-to-end tracing */ PHP_FUNCTION(oci_set_action) { zval *z_connection; @@ -1903,8 +1843,7 @@ PHP_FUNCTION(oci_set_action) } /* }}} */ -/* {{{ proto bool oci_set_client_info(resource connection, string value) - Sets the client info attribute on the connection for end-to-end tracing */ +/* {{{ Sets the client info attribute on the connection for end-to-end tracing */ PHP_FUNCTION(oci_set_client_info) { zval *z_connection; @@ -1938,8 +1877,7 @@ PHP_FUNCTION(oci_set_client_info) } /* }}} */ -/* {{{ proto bool oci_set_db_operation(resource connection, string value) - Sets the "DB operation" on the connection for Oracle end-to-end tracing. +/* {{{ Sets the "DB operation" on the connection for Oracle end-to-end tracing. For history, see Oracle bug 16695981 */ PHP_FUNCTION(oci_set_db_operation) { @@ -1971,8 +1909,7 @@ PHP_FUNCTION(oci_set_db_operation) } /* }}} */ -/* {{{ proto bool oci_set_call_timeout(resource connection, int call_timeout) - */ +/* {{{ */ PHP_FUNCTION(oci_set_call_timeout) { zval *z_connection; @@ -2002,8 +1939,7 @@ PHP_FUNCTION(oci_set_call_timeout) } /* }}} */ -/* {{{ proto bool oci_password_change(resource connection, string username, string old_password, string new_password) - Changes the password of an account */ +/* {{{ Changes the password of an account */ PHP_FUNCTION(oci_password_change) { zval *z_connection; @@ -2056,8 +1992,7 @@ PHP_FUNCTION(oci_password_change) } /* }}} */ -/* {{{ proto resource oci_new_cursor(resource connection) - Return a new cursor (Statement-Handle) - use this to bind ref-cursors! */ +/* {{{ Return a new cursor (Statement-Handle) - use this to bind ref-cursors! */ PHP_FUNCTION(oci_new_cursor) { zval *z_connection; @@ -2079,8 +2014,7 @@ PHP_FUNCTION(oci_new_cursor) } /* }}} */ -/* {{{ proto string oci_result(resource stmt, mixed column) - Return a single column of result data */ +/* {{{ Return a single column of result data */ PHP_FUNCTION(oci_result) { php_oci_out_column *column; @@ -2095,8 +2029,7 @@ PHP_FUNCTION(oci_result) } /* }}} */ -/* {{{ proto string oci_client_version() - Return a string containing runtime client library version information */ +/* {{{ Return a string containing runtime client library version information */ PHP_FUNCTION(oci_client_version) { char version[256]; @@ -2107,8 +2040,7 @@ PHP_FUNCTION(oci_client_version) } /* }}} */ -/* {{{ proto string oci_server_version(resource connection) - Return a string containing server version information */ +/* {{{ Return a string containing server version information */ PHP_FUNCTION(oci_server_version) { zval *z_connection; @@ -2131,8 +2063,7 @@ PHP_FUNCTION(oci_server_version) } /* }}} */ -/* {{{ proto string oci_statement_type(resource stmt) - Return the query type of an OCI statement */ +/* {{{ Return the query type of an OCI statement */ PHP_FUNCTION(oci_statement_type) { zval *z_statement; @@ -2186,8 +2117,7 @@ PHP_FUNCTION(oci_statement_type) } /* }}} */ -/* {{{ proto int oci_num_rows(resource stmt) - Return the row count of an OCI statement */ +/* {{{ Return the row count of an OCI statement */ PHP_FUNCTION(oci_num_rows) { zval *z_statement; @@ -2207,8 +2137,7 @@ PHP_FUNCTION(oci_num_rows) } /* }}} */ -/* {{{ proto bool oci_free_collection() - Deletes collection object*/ +/* {{{ Deletes collection object*/ PHP_FUNCTION(oci_free_collection) { zval *tmp, *z_collection; @@ -2230,8 +2159,7 @@ PHP_FUNCTION(oci_free_collection) } /* }}} */ -/* {{{ proto bool oci_collection_append(string value) - Append an object to the collection */ +/* {{{ Append an object to the collection */ PHP_FUNCTION(oci_collection_append) { zval *tmp, *z_collection; @@ -2257,8 +2185,7 @@ PHP_FUNCTION(oci_collection_append) } /* }}} */ -/* {{{ proto string oci_collection_element_get(int ndx) - Retrieve the value at collection index ndx */ +/* {{{ Retrieve the value at collection index ndx */ PHP_FUNCTION(oci_collection_element_get) { zval *tmp, *z_collection; @@ -2282,8 +2209,7 @@ PHP_FUNCTION(oci_collection_element_get) } /* }}} */ -/* {{{ proto bool oci_collection_assign(object from) - Assign a collection from another existing collection */ +/* {{{ Assign a collection from another existing collection */ PHP_FUNCTION(oci_collection_assign) { zval *tmp_dest, *tmp_from, *z_collection_dest, *z_collection_from; @@ -2313,8 +2239,7 @@ PHP_FUNCTION(oci_collection_assign) } /* }}} */ -/* {{{ proto bool oci_collection_element_assign(int index, string val) - Assign element val to collection at index ndx */ +/* {{{ Assign element val to collection at index ndx */ PHP_FUNCTION(oci_collection_element_assign) { zval *tmp, *z_collection; @@ -2341,8 +2266,7 @@ PHP_FUNCTION(oci_collection_element_assign) } /* }}} */ -/* {{{ proto int oci_collection_size() - Return the size of a collection */ +/* {{{ Return the size of a collection */ PHP_FUNCTION(oci_collection_size) { zval *tmp, *z_collection; @@ -2367,8 +2291,7 @@ PHP_FUNCTION(oci_collection_size) } /* }}} */ -/* {{{ proto int oci_collection_max() - Return the max value of a collection. For a varray this is the maximum length of the array */ +/* {{{ Return the max value of a collection. For a varray this is the maximum length of the array */ PHP_FUNCTION(oci_collection_max) { zval *tmp, *z_collection; @@ -2393,8 +2316,7 @@ PHP_FUNCTION(oci_collection_max) } /* }}} */ -/* {{{ proto bool oci_collection_trim(int num) - Trim num elements from the end of a collection */ +/* {{{ Trim num elements from the end of a collection */ PHP_FUNCTION(oci_collection_trim) { zval *tmp, *z_collection; @@ -2419,8 +2341,7 @@ PHP_FUNCTION(oci_collection_trim) } /* }}} */ -/* {{{ proto object oci_new_collection(resource connection, string tdo [, string schema]) - Initialize a new collection */ +/* {{{ Initialize a new collection */ PHP_FUNCTION(oci_new_collection) { zval *z_connection; @@ -2445,8 +2366,7 @@ PHP_FUNCTION(oci_new_collection) } /* }}} */ -/* {{{ proto bool oci_get_implicit(resource stmt) - Get the next statement resource from an Oracle 12c PL/SQL Implicit Result Set */ +/* {{{ Get the next statement resource from an Oracle 12c PL/SQL Implicit Result Set */ PHP_FUNCTION(oci_get_implicit_resultset) { zval *z_statement; diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index cf2b3c1a02..7a4495f0d1 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -66,8 +66,7 @@ static int le_result, le_conn, le_pconn; PHP_ODBC_API ZEND_DECLARE_MODULE_GLOBALS(odbc) static PHP_GINIT_FUNCTION(odbc); -/* {{{ odbc_module_entry - */ +/* {{{ odbc_module_entry */ zend_module_entry odbc_module_entry = { STANDARD_MODULE_HEADER, "odbc", @@ -93,8 +92,7 @@ ZEND_TSRMLS_CACHE_DEFINE() ZEND_GET_MODULE(odbc) #endif -/* {{{ _free_odbc_result - */ +/* {{{ _free_odbc_result */ static void _free_odbc_result(zend_resource *rsrc) { odbc_result *res = (odbc_result *)rsrc->ptr; @@ -145,8 +143,7 @@ static void safe_odbc_disconnect( void *handle ) } /* }}} */ -/* {{{ _close_odbc_conn - */ +/* {{{ _close_odbc_conn */ static void _close_odbc_conn(zend_resource *rsrc) { zend_resource *p; @@ -174,8 +171,7 @@ static void _close_odbc_conn(zend_resource *rsrc) } /* }}} */ -/* {{{ void _close_odbc_pconn - */ +/* {{{ void _close_odbc_pconn */ static void _close_odbc_pconn(zend_resource *rsrc) { zend_resource *p; @@ -204,8 +200,7 @@ static void _close_odbc_pconn(zend_resource *rsrc) } /* }}} */ -/* {{{ PHP_INI_DISP(display_link_nums) - */ +/* {{{ PHP_INI_DISP(display_link_nums) */ static PHP_INI_DISP(display_link_nums) { char *value; @@ -228,8 +223,7 @@ static PHP_INI_DISP(display_link_nums) } /* }}} */ -/* {{{ PHP_INI_DISP(display_defPW) - */ +/* {{{ PHP_INI_DISP(display_defPW) */ static PHP_INI_DISP(display_defPW) { char *value; @@ -258,8 +252,7 @@ static PHP_INI_DISP(display_defPW) } /* }}} */ -/* {{{ PHP_INI_DISP(display_binmode) - */ +/* {{{ PHP_INI_DISP(display_binmode) */ static PHP_INI_DISP(display_binmode) { char *value; @@ -288,8 +281,7 @@ static PHP_INI_DISP(display_binmode) } /* }}} */ -/* {{{ PHP_INI_DISP(display_lrl) - */ +/* {{{ PHP_INI_DISP(display_lrl) */ static PHP_INI_DISP(display_lrl) { char *value; @@ -313,8 +305,7 @@ static PHP_INI_DISP(display_lrl) /* }}} */ -/* {{{ PHP_INI_DISP(display_cursortype) - */ +/* {{{ PHP_INI_DISP(display_cursortype) */ static PHP_INI_DISP(display_cursortype) { char *value; @@ -355,8 +346,7 @@ static PHP_INI_DISP(display_cursortype) /* }}} */ -/* {{{ PHP_INI_BEGIN - */ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_persistent, zend_odbc_globals, odbc_globals) @@ -820,8 +810,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type) /* Main User Functions */ -/* {{{ proto void odbc_close_all(void) - Close all ODBC connections */ +/* {{{ Close all ODBC connections */ PHP_FUNCTION(odbc_close_all) { zend_resource *p; @@ -853,24 +842,21 @@ PHP_FUNCTION(odbc_close_all) } /* }}} */ -/* {{{ proto bool odbc_binmode(int result_id, int mode) - Handle binary column data */ +/* {{{ Handle binary column data */ PHP_FUNCTION(odbc_binmode) { php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool odbc_longreadlen(int result_id, int length) - Handle LONG columns */ +/* {{{ Handle LONG columns */ PHP_FUNCTION(odbc_longreadlen) { php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto resource odbc_prepare(resource connection_id, string query) - Prepares a statement for execution */ +/* {{{ Prepares a statement for execution */ PHP_FUNCTION(odbc_prepare) { zval *pv_conn; @@ -974,8 +960,7 @@ PHP_FUNCTION(odbc_prepare) * Execute prepared SQL statement. Supports only input parameters. */ -/* {{{ proto bool odbc_execute(resource result_id [, array parameters_array]) - Execute a prepared statement */ +/* {{{ Execute a prepared statement */ PHP_FUNCTION(odbc_execute) { zval *pv_res, *pv_param_arr, *tmp; @@ -1186,8 +1171,7 @@ PHP_FUNCTION(odbc_execute) } /* }}} */ -/* {{{ proto string odbc_cursor(resource result_id) - Get cursor name */ +/* {{{ Get cursor name */ PHP_FUNCTION(odbc_cursor) { zval *pv_res; @@ -1245,8 +1229,7 @@ PHP_FUNCTION(odbc_cursor) /* }}} */ #ifdef HAVE_SQLDATASOURCES -/* {{{ proto array odbc_data_source(resource connection_id, int fetch_type) - Return information about the currently connected data source */ +/* {{{ Return information about the currently connected data source */ PHP_FUNCTION(odbc_data_source) { zval *zv_conn; @@ -1305,8 +1288,7 @@ PHP_FUNCTION(odbc_data_source) /* }}} */ #endif /* HAVE_SQLDATASOURCES */ -/* {{{ proto resource odbc_exec(resource connection_id, string query [, int flags]) - Prepare and execute an SQL statement */ +/* {{{ Prepare and execute an SQL statement */ /* XXX Use flags */ PHP_FUNCTION(odbc_exec) { @@ -1524,8 +1506,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) /* }}} */ -/* {{{ proto object odbc_fetch_object(resource result [, int rownumber]) - Fetch a result row as an object */ +/* {{{ Fetch a result row as an object */ PHP_FUNCTION(odbc_fetch_object) { php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); @@ -1535,8 +1516,7 @@ PHP_FUNCTION(odbc_fetch_object) } /* }}} */ -/* {{{ proto array odbc_fetch_array(resource result [, int rownumber]) - Fetch a result row as an associative array */ +/* {{{ Fetch a result row as an associative array */ PHP_FUNCTION(odbc_fetch_array) { php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); @@ -1544,8 +1524,7 @@ PHP_FUNCTION(odbc_fetch_array) /* }}} */ #endif -/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array [, int rownumber]) - Fetch one result row into an array */ +/* {{{ Fetch one result row into an array */ PHP_FUNCTION(odbc_fetch_into) { int i; @@ -1666,8 +1645,7 @@ PHP_FUNCTION(odbc_fetch_into) } /* }}} */ -/* {{{ proto bool solid_fetch_prev(resource result_id) - */ +/* {{{ */ #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) PHP_FUNCTION(solid_fetch_prev) { @@ -1701,8 +1679,7 @@ PHP_FUNCTION(solid_fetch_prev) #endif /* }}} */ -/* {{{ proto bool odbc_fetch_row(resource result_id [, int row_number]) - Fetch a row */ +/* {{{ Fetch a row */ PHP_FUNCTION(odbc_fetch_row) { SQLLEN rownum; @@ -1755,8 +1732,7 @@ PHP_FUNCTION(odbc_fetch_row) } /* }}} */ -/* {{{ proto mixed odbc_result(resource result_id, mixed field) - Get result data */ +/* {{{ Get result data */ PHP_FUNCTION(odbc_result) { char *field; @@ -1946,8 +1922,7 @@ PHP_FUNCTION(odbc_result) } /* }}} */ -/* {{{ proto int odbc_result_all(resource result_id [, string format]) - Print result as HTML table */ +/* {{{ Print result as HTML table */ PHP_FUNCTION(odbc_result_all) { char *buf = NULL; @@ -2071,8 +2046,7 @@ PHP_FUNCTION(odbc_result_all) } /* }}} */ -/* {{{ proto bool odbc_free_result(resource result_id) - Free resources associated with a result */ +/* {{{ Free resources associated with a result */ PHP_FUNCTION(odbc_free_result) { zval *pv_res; @@ -2103,16 +2077,14 @@ PHP_FUNCTION(odbc_free_result) } /* }}} */ -/* {{{ proto resource odbc_connect(string DSN, string user, string password [, int cursor_option]) - Connect to a datasource */ +/* {{{ Connect to a datasource */ PHP_FUNCTION(odbc_connect) { odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource odbc_pconnect(string DSN, string user, string password [, int cursor_option]) - Establish a persistent connection to a datasource */ +/* {{{ Establish a persistent connection to a datasource */ PHP_FUNCTION(odbc_pconnect) { odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -2368,8 +2340,7 @@ try_and_get_another_connection: } /* }}} */ -/* {{{ proto void odbc_close(resource connection_id) - Close an ODBC connection */ +/* {{{ Close an ODBC connection */ PHP_FUNCTION(odbc_close) { zval *pv_conn; @@ -2407,8 +2378,7 @@ PHP_FUNCTION(odbc_close) } /* }}} */ -/* {{{ proto int odbc_num_rows(resource result_id) - Get number of rows in a result */ +/* {{{ Get number of rows in a result */ PHP_FUNCTION(odbc_num_rows) { odbc_result *result; @@ -2429,8 +2399,7 @@ PHP_FUNCTION(odbc_num_rows) /* }}} */ #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) -/* {{{ proto bool odbc_next_result(resource result_id) - Checks if multiple results are available */ +/* {{{ Checks if multiple results are available */ PHP_FUNCTION(odbc_next_result) { odbc_result *result; @@ -2481,8 +2450,7 @@ PHP_FUNCTION(odbc_next_result) /* }}} */ #endif -/* {{{ proto int odbc_num_fields(resource result_id) - Get number of columns in a result */ +/* {{{ Get number of columns in a result */ PHP_FUNCTION(odbc_num_fields) { odbc_result *result; @@ -2500,8 +2468,7 @@ PHP_FUNCTION(odbc_num_fields) } /* }}} */ -/* {{{ proto string odbc_field_name(resource result_id, int field_number) - Get a column name */ +/* {{{ Get a column name */ PHP_FUNCTION(odbc_field_name) { odbc_result *result; @@ -2535,8 +2502,7 @@ PHP_FUNCTION(odbc_field_name) } /* }}} */ -/* {{{ proto string odbc_field_type(resource result_id, int field_number) - Get the datatype of a column */ +/* {{{ Get the datatype of a column */ PHP_FUNCTION(odbc_field_type) { odbc_result *result; @@ -2573,24 +2539,21 @@ PHP_FUNCTION(odbc_field_type) } /* }}} */ -/* {{{ proto int odbc_field_len(resource result_id, int field_number) - Get the length (precision) of a column */ +/* {{{ Get the length (precision) of a column */ PHP_FUNCTION(odbc_field_len) { odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int odbc_field_scale(resource result_id, int field_number) - Get the scale of a column */ +/* {{{ Get the scale of a column */ PHP_FUNCTION(odbc_field_scale) { odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int odbc_field_num(resource result_id, string field_name) - Return column number */ +/* {{{ Return column number */ PHP_FUNCTION(odbc_field_num) { char *fname; @@ -2625,8 +2588,7 @@ PHP_FUNCTION(odbc_field_num) } /* }}} */ -/* {{{ proto mixed odbc_autocommit(resource connection_id [, int OnOff]) - Toggle autocommit mode or get status */ +/* {{{ Toggle autocommit mode or get status */ /* There can be problems with pconnections!*/ PHP_FUNCTION(odbc_autocommit) { @@ -2663,16 +2625,14 @@ PHP_FUNCTION(odbc_autocommit) } /* }}} */ -/* {{{ proto bool odbc_commit(resource connection_id) - Commit an ODBC transaction */ +/* {{{ Commit an ODBC transaction */ PHP_FUNCTION(odbc_commit) { odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool odbc_rollback(resource connection_id) - Rollback a transaction */ +/* {{{ Rollback a transaction */ PHP_FUNCTION(odbc_rollback) { odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -2711,24 +2671,21 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode) } /* }}} */ -/* {{{ proto string odbc_error([resource connection_id]) - Get the last error code */ +/* {{{ Get the last error code */ PHP_FUNCTION(odbc_error) { php_odbc_lasterror(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string odbc_errormsg([resource connection_id]) - Get the last error message */ +/* {{{ Get the last error message */ PHP_FUNCTION(odbc_errormsg) { php_odbc_lasterror(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool odbc_setoption(resource conn_id|result_id, int which, int option, int value) - Sets connection or statement options */ +/* {{{ Sets connection or statement options */ /* This one has to be used carefully. We can't allow to set connection options for persistent connections. I think that SetStmtOption is of little use, since most of those can only be specified before preparing/executing statements. @@ -2789,8 +2746,7 @@ PHP_FUNCTION(odbc_setoption) * metadata functions */ -/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier [, string owner [, string name [, string table_types]]]]) - Call the SQLTables function */ +/* {{{ Call the SQLTables function */ PHP_FUNCTION(odbc_tables) { zval *pv_conn; @@ -2858,8 +2814,7 @@ PHP_FUNCTION(odbc_tables) } /* }}} */ -/* {{{ proto resource odbc_columns(resource connection_id [, string qualifier [, string owner [, string table_name [, string column_name]]]]) - Returns a result identifier that can be used to fetch a list of column names in specified tables */ +/* {{{ Returns a result identifier that can be used to fetch a list of column names in specified tables */ PHP_FUNCTION(odbc_columns) { zval *pv_conn; @@ -2930,8 +2885,7 @@ PHP_FUNCTION(odbc_columns) /* }}} */ #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -/* {{{ proto resource odbc_columnprivileges(resource connection_id, string catalog, string schema, string table, string column) - Returns a result identifier that can be used to fetch a list of columns and associated privileges for the specified table */ +/* {{{ Returns a result identifier that can be used to fetch a list of columns and associated privileges for the specified table */ PHP_FUNCTION(odbc_columnprivileges) { zval *pv_conn; @@ -2996,8 +2950,7 @@ PHP_FUNCTION(odbc_columnprivileges) #endif /* HAVE_DBMAKER || HAVE_SOLID*/ #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -/* {{{ proto resource odbc_foreignkeys(resource connection_id, string pk_qualifier, string pk_owner, string pk_table, string fk_qualifier, string fk_owner, string fk_table) - Returns a result identifier to either a list of foreign keys in the specified table or a list of foreign keys in other tables that refer to the primary key in the specified table */ +/* {{{ Returns a result identifier to either a list of foreign keys in the specified table or a list of foreign keys in other tables that refer to the primary key in the specified table */ PHP_FUNCTION(odbc_foreignkeys) { zval *pv_conn; @@ -3075,8 +3028,7 @@ PHP_FUNCTION(odbc_foreignkeys) /* }}} */ #endif /* HAVE_SOLID */ -/* {{{ proto resource odbc_gettypeinfo(resource connection_id [, int data_type]) - Returns a result identifier containing information about data types supported by the data source */ +/* {{{ Returns a result identifier containing information about data types supported by the data source */ PHP_FUNCTION(odbc_gettypeinfo) { zval *pv_conn; @@ -3136,8 +3088,7 @@ PHP_FUNCTION(odbc_gettypeinfo) } /* }}} */ -/* {{{ proto resource odbc_primarykeys(resource connection_id, string qualifier, string owner, string table) - Returns a result identifier listing the column names that comprise the primary key for a table */ +/* {{{ Returns a result identifier listing the column names that comprise the primary key for a table */ PHP_FUNCTION(odbc_primarykeys) { zval *pv_conn; @@ -3199,8 +3150,7 @@ PHP_FUNCTION(odbc_primarykeys) /* }}} */ #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -/* {{{ proto resource odbc_procedurecolumns(resource connection_id [, string qualifier, string owner, string proc, string column]) - Returns a result identifier containing the list of input and output parameters, as well as the columns that make up the result set for the specified procedures */ +/* {{{ Returns a result identifier containing the list of input and output parameters, as well as the columns that make up the result set for the specified procedures */ PHP_FUNCTION(odbc_procedurecolumns) { zval *pv_conn; @@ -3269,8 +3219,7 @@ PHP_FUNCTION(odbc_procedurecolumns) #endif /* HAVE_SOLID */ #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -/* {{{ proto resource odbc_procedures(resource connection_id [, string qualifier, string owner, string name]) - Returns a result identifier containing the list of procedure names in a datasource */ +/* {{{ Returns a result identifier containing the list of procedure names in a datasource */ PHP_FUNCTION(odbc_procedures) { zval *pv_conn; @@ -3336,8 +3285,7 @@ PHP_FUNCTION(odbc_procedures) /* }}} */ #endif /* HAVE_SOLID */ -/* {{{ proto resource odbc_specialcolumns(resource connection_id, int type, string qualifier, string owner, string table, int scope, int nullable) - Returns a result identifier containing either the optimal set of columns that uniquely identifies a row in the table or columns that are automatically updated when any value in the row is updated by a transaction */ +/* {{{ Returns a result identifier containing either the optimal set of columns that uniquely identifies a row in the table or columns that are automatically updated when any value in the row is updated by a transaction */ PHP_FUNCTION(odbc_specialcolumns) { zval *pv_conn; @@ -3408,8 +3356,7 @@ PHP_FUNCTION(odbc_specialcolumns) } /* }}} */ -/* {{{ proto resource odbc_statistics(resource connection_id, string qualifier, string owner, string name, int unique, int accuracy) - Returns a result identifier that contains statistics about a single table and the indexes associated with the table */ +/* {{{ Returns a result identifier that contains statistics about a single table and the indexes associated with the table */ PHP_FUNCTION(odbc_statistics) { zval *pv_conn; @@ -3479,8 +3426,7 @@ PHP_FUNCTION(odbc_statistics) /* }}} */ #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) -/* {{{ proto resource odbc_tableprivileges(resource connection_id, string qualifier, string owner, string name) - Returns a result identifier containing a list of tables and the privileges associated with each table */ +/* {{{ Returns a result identifier containing a list of tables and the privileges associated with each table */ PHP_FUNCTION(odbc_tableprivileges) { zval *pv_conn; diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 9b73533ce4..1595ea4e38 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -517,8 +517,7 @@ int start_accel_module(void) return zend_startup_module(&accel_module_entry); } -/* {{{ proto array accelerator_get_scripts() - Get the scripts which are accelerated by ZendAccelerator */ +/* {{{ Get the scripts which are accelerated by ZendAccelerator */ static int accelerator_get_scripts(zval *return_value) { uint32_t i; @@ -567,8 +566,7 @@ static int accelerator_get_scripts(zval *return_value) return 1; } -/* {{{ proto array accelerator_get_status([bool fetch_scripts]) - Obtain statistics information regarding code acceleration */ +/* {{{ Obtain statistics information regarding code acceleration */ ZEND_FUNCTION(opcache_get_status) { zend_long reqs; @@ -701,8 +699,7 @@ static int add_blacklist_path(zend_blacklist_entry *p, zval *return_value) return 0; } -/* {{{ proto array accelerator_get_configuration() - Obtain configuration information */ +/* {{{ Obtain configuration information */ ZEND_FUNCTION(opcache_get_configuration) { zval directives, version, blacklist; @@ -809,8 +806,7 @@ ZEND_FUNCTION(opcache_get_configuration) add_assoc_zval(return_value, "blacklist", &blacklist); } -/* {{{ proto void accelerator_reset() - Request that the contents of the opcode cache to be reset */ +/* {{{ Request that the contents of the opcode cache to be reset */ ZEND_FUNCTION(opcache_reset) { if (zend_parse_parameters_none() == FAILURE) { @@ -836,8 +832,7 @@ ZEND_FUNCTION(opcache_reset) RETURN_TRUE; } -/* {{{ proto void opcache_invalidate(string $script [, bool $force = false]) - Invalidates cached script (in necessary or forced) */ +/* {{{ Invalidates cached script (in necessary or forced) */ ZEND_FUNCTION(opcache_invalidate) { char *script_name; @@ -909,8 +904,7 @@ ZEND_FUNCTION(opcache_compile_file) zend_destroy_file_handle(&handle); } -/* {{{ proto bool opcache_is_script_cached(string $script) - Return true if the script is cached in OPCache, false if it is not cached or if OPCache is not running. */ +/* {{{ Return true if the script is cached in OPCache, false if it is not cached or if OPCache is not running. */ ZEND_FUNCTION(opcache_is_script_cached) { zend_string *script_name; diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index b2c5cefc70..d2ad33f7bb 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -127,8 +127,7 @@ enum php_openssl_encoding { ENCODING_PEM, }; -/* {{{ openssl_module_entry - */ +/* {{{ openssl_module_entry */ zend_module_entry openssl_module_entry = { STANDARD_MODULE_HEADER, "openssl", @@ -1014,8 +1013,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(openssl) { char * config_filename; @@ -1183,8 +1181,7 @@ PHP_MINIT_FUNCTION(openssl) } /* }}} */ -/* {{{ PHP_GINIT_FUNCTION -*/ +/* {{{ PHP_GINIT_FUNCTION */ PHP_GINIT_FUNCTION(openssl) { #if defined(COMPILE_DL_OPENSSL) && defined(ZTS) @@ -1194,8 +1191,7 @@ PHP_GINIT_FUNCTION(openssl) } /* }}} */ -/* {{{ PHP_GSHUTDOWN_FUNCTION -*/ +/* {{{ PHP_GSHUTDOWN_FUNCTION */ PHP_GSHUTDOWN_FUNCTION(openssl) { if (openssl_globals->errors) { @@ -1204,8 +1200,7 @@ PHP_GSHUTDOWN_FUNCTION(openssl) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(openssl) { php_info_print_table_start(); @@ -1218,8 +1213,7 @@ PHP_MINFO_FUNCTION(openssl) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(openssl) { #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) @@ -1258,8 +1252,7 @@ PHP_MSHUTDOWN_FUNCTION(openssl) /* {{{ x509 cert functions */ -/* {{{ proto array openssl_get_cert_locations(void) - Retrieve an array mapping available certificate locations */ +/* {{{ Retrieve an array mapping available certificate locations */ PHP_FUNCTION(openssl_get_cert_locations) { if (zend_parse_parameters_none() == FAILURE) { @@ -1370,8 +1363,7 @@ static X509 * php_openssl_x509_from_zval(zval * val, int makeresource, zend_reso /* }}} */ -/* {{{ proto bool openssl_x509_export_to_file(mixed x509, string outfilename [, bool notext = true]) - Exports a CERT to file or a var */ +/* {{{ Exports a CERT to file or a var */ PHP_FUNCTION(openssl_x509_export_to_file) { X509 * cert; @@ -1420,8 +1412,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) } /* }}} */ -/* {{{ proto string openssl_spki_new(mixed zpkey, string challenge [, mixed method]) - Creates new private key (or uses existing) and creates a new spki cert +/* {{{ Creates new private key (or uses existing) and creates a new spki cert outputting results to var */ PHP_FUNCTION(openssl_spki_new) { @@ -1519,8 +1510,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool openssl_spki_verify(string spki) - Verifies spki returns boolean */ +/* {{{ Verifies spki returns boolean */ PHP_FUNCTION(openssl_spki_verify) { size_t spkstr_len; @@ -1579,8 +1569,7 @@ cleanup: } /* }}} */ -/* {{{ proto string openssl_spki_export(string spki) - Exports public key from existing spki to var */ +/* {{{ Exports public key from existing spki to var */ PHP_FUNCTION(openssl_spki_export) { size_t spkstr_len; @@ -1649,8 +1638,7 @@ cleanup: } /* }}} */ -/* {{{ proto string openssl_spki_export_challenge(string spki) - Exports spkac challenge from existing spki to var */ +/* {{{ Exports spkac challenge from existing spki to var */ PHP_FUNCTION(openssl_spki_export_challenge) { size_t spkstr_len; @@ -1692,8 +1680,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool openssl_x509_export(mixed x509, string &out [, bool notext = true]) - Exports a CERT to file or a var */ +/* {{{ Exports a CERT to file or a var */ PHP_FUNCTION(openssl_x509_export) { X509 * cert; @@ -1798,8 +1785,7 @@ PHP_FUNCTION(openssl_x509_fingerprint) } } -/* {{{ proto bool openssl_x509_check_private_key(mixed cert, mixed key) - Checks if a private key corresponds to a CERT */ +/* {{{ Checks if a private key corresponds to a CERT */ PHP_FUNCTION(openssl_x509_check_private_key) { zval * zcert, *zkey; @@ -1830,8 +1816,7 @@ PHP_FUNCTION(openssl_x509_check_private_key) } /* }}} */ -/* {{{ proto int openssl_x509_verify(mixed cert, mixed key) - Verifies the signature of certificate cert using public key key */ +/* {{{ Verifies the signature of certificate cert using public key key */ PHP_FUNCTION(openssl_x509_verify) { zval * zcert, *zkey; @@ -1941,8 +1926,7 @@ static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension) return 0; } -/* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true]) - Returns an array of the fields/values of the CERT */ +/* {{{ Returns an array of the fields/values of the CERT */ PHP_FUNCTION(openssl_x509_parse) { zval * zcert; @@ -2191,8 +2175,7 @@ static int check_cert(X509_STORE *ctx, X509 *x, STACK_OF(X509) *untrustedchain, } /* }}} */ -/* {{{ proto int openssl_x509_checkpurpose(mixed x509cert, int purpose, array cainfo [, string untrustedfile]) - Checks the CERT to see if it can be used for the purpose in purpose. cainfo holds information about trusted CAs */ +/* {{{ Checks the CERT to see if it can be used for the purpose in purpose. cainfo holds information about trusted CAs */ PHP_FUNCTION(openssl_x509_checkpurpose) { zval * zcert, * zcainfo = NULL; @@ -2315,8 +2298,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) } /* }}} */ -/* {{{ proto resource openssl_x509_read(mixed cert) - Reads X.509 certificates */ +/* {{{ Reads X.509 certificates */ PHP_FUNCTION(openssl_x509_read) { zval *cert; @@ -2336,8 +2318,7 @@ PHP_FUNCTION(openssl_x509_read) } /* }}} */ -/* {{{ proto void openssl_x509_free(resource x509) - Frees X.509 certificates */ +/* {{{ Frees X.509 certificates */ PHP_FUNCTION(openssl_x509_free) { zval *x509; @@ -2418,8 +2399,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkcs12_export_to_file(mixed x509, string filename, mixed priv_key, string pass[, array args]) - Creates and exports a PKCS to file */ +/* {{{ Creates and exports a PKCS to file */ PHP_FUNCTION(openssl_pkcs12_export_to_file) { X509 * cert = NULL; @@ -2515,8 +2495,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool openssl_pkcs12_export(mixed x509, string &out, mixed priv_key, string pass[, array args]) - Creates and exports a PKCS12 to a var */ +/* {{{ Creates and exports a PKCS12 to a var */ PHP_FUNCTION(openssl_pkcs12_export) { X509 * cert = NULL; @@ -2600,8 +2579,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool openssl_pkcs12_read(string PKCS12, array &certs, string pass) - Parses a PKCS12 to an array */ +/* {{{ Parses a PKCS12 to an array */ PHP_FUNCTION(openssl_pkcs12_read) { zval *zout = NULL, zextracerts, zcert, zpkey; @@ -2938,8 +2916,7 @@ static X509_REQ * php_openssl_csr_from_zval(zval * val, int makeresource, zend_r } /* }}} */ -/* {{{ proto bool openssl_csr_export_to_file(resource csr, string outfilename [, bool notext=true]) - Exports a CSR to file */ +/* {{{ Exports a CSR to file */ PHP_FUNCTION(openssl_csr_export_to_file) { X509_REQ * csr; @@ -2990,8 +2967,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) } /* }}} */ -/* {{{ proto bool openssl_csr_export(resource csr, string &out [, bool notext=true]) - Exports a CSR to file or a var */ +/* {{{ Exports a CSR to file or a var */ PHP_FUNCTION(openssl_csr_export) { X509_REQ * csr; @@ -3039,8 +3015,7 @@ PHP_FUNCTION(openssl_csr_export) } /* }}} */ -/* {{{ proto resource openssl_csr_sign(mixed csr, mixed x509, mixed priv_key, int days [, array config_args [, int serial]]) - Signs a cert with another CERT */ +/* {{{ Signs a cert with another CERT */ PHP_FUNCTION(openssl_csr_sign) { zval * zcert = NULL, *zcsr, *zpkey, *args = NULL; @@ -3188,8 +3163,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array configargs [, array extraattribs]]) - Generates a privkey and CSR */ +/* {{{ Generates a privkey and CSR */ PHP_FUNCTION(openssl_csr_new) { struct php_x509_request req; @@ -3276,8 +3250,7 @@ PHP_FUNCTION(openssl_csr_new) } /* }}} */ -/* {{{ proto mixed openssl_csr_get_subject(mixed csr [, bool use_shortnames = TRUE]) - Returns the subject of a CERT or FALSE on error */ +/* {{{ Returns the subject of a CERT or FALSE on error */ PHP_FUNCTION(openssl_csr_get_subject) { zval * zcsr; @@ -3307,8 +3280,7 @@ PHP_FUNCTION(openssl_csr_get_subject) } /* }}} */ -/* {{{ proto mixed openssl_csr_get_public_key(mixed csr [, bool use_shortnames = TRUE]) - Returns the subject of a CERT or FALSE on error */ +/* {{{ Returns the subject of a CERT or FALSE on error */ PHP_FUNCTION(openssl_csr_get_public_key) { zval * zcsr; @@ -3968,8 +3940,7 @@ static zend_bool php_openssl_pkey_init_dh(DH *dh, zval *data) } /* }}} */ -/* {{{ proto mixed openssl_pkey_new([array configargs]) - Generates a new private key */ +/* {{{ Generates a new private key */ PHP_FUNCTION(openssl_pkey_new) { struct php_x509_request req; @@ -4181,8 +4152,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkey_export_to_file(mixed key, string outfilename [, string passphrase [, array config_args]]) - Gets an exportable representation of a key into a file */ +/* {{{ Gets an exportable representation of a key into a file */ PHP_FUNCTION(openssl_pkey_export_to_file) { struct php_x509_request req; @@ -4271,8 +4241,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkey_export(mixed key, &mixed out [, string passphrase [, array config_args]]) - Gets an exportable representation of a key into a string or file */ +/* {{{ Gets an exportable representation of a key into a string or file */ PHP_FUNCTION(openssl_pkey_export) { struct php_x509_request req; @@ -4354,8 +4323,7 @@ PHP_FUNCTION(openssl_pkey_export) } /* }}} */ -/* {{{ proto mixed openssl_pkey_get_public(mixed cert) - Gets public key from X.509 certificate */ +/* {{{ Gets public key from X.509 certificate */ PHP_FUNCTION(openssl_pkey_get_public) { zval *cert; @@ -4373,8 +4341,7 @@ PHP_FUNCTION(openssl_pkey_get_public) } /* }}} */ -/* {{{ proto void openssl_pkey_free(int key) - Frees a key */ +/* {{{ Frees a key */ PHP_FUNCTION(openssl_pkey_free) { zval *key; @@ -4390,8 +4357,7 @@ PHP_FUNCTION(openssl_pkey_free) } /* }}} */ -/* {{{ proto mixed openssl_pkey_get_private(string key [, string passphrase]) - Gets private keys */ +/* {{{ Gets private keys */ PHP_FUNCTION(openssl_pkey_get_private) { zval *cert; @@ -4415,8 +4381,7 @@ PHP_FUNCTION(openssl_pkey_get_private) /* }}} */ -/* {{{ proto mixed openssl_pkey_get_details(resource key) - returns an array with the key details (bits, pkey, type)*/ +/* {{{ returns an array with the key details (bits, pkey, type)*/ PHP_FUNCTION(openssl_pkey_get_details) { zval *key; @@ -4589,8 +4554,7 @@ PHP_FUNCTION(openssl_pkey_get_details) } /* }}} */ -/* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key) - Computes shared secret for public value of remote DH key and local DH key */ +/* {{{ Computes shared secret for public value of remote DH key and local DH key */ PHP_FUNCTION(openssl_dh_compute_key) { zval *key; @@ -4636,8 +4600,7 @@ PHP_FUNCTION(openssl_dh_compute_key) } /* }}} */ -/* {{{ proto string openssl_pkey_derive(peer_pub_key, priv_key, int keylen=NULL) - Computes shared secret for public value of remote and local DH or ECDH key */ +/* {{{ Computes shared secret for public value of remote and local DH or ECDH key */ PHP_FUNCTION(openssl_pkey_derive) { zval *priv_key; @@ -4684,8 +4647,7 @@ PHP_FUNCTION(openssl_pkey_derive) /* }}} */ -/* {{{ proto mixed openssl_pbkdf2(string password, string salt, int key_length, int iterations [, string digest_method = "sha1"]) - Generates a PKCS5 v2 PBKDF2 string, defaults to sha1 */ +/* {{{ Generates a PKCS5 v2 PBKDF2 string, defaults to sha1 */ PHP_FUNCTION(openssl_pbkdf2) { zend_long key_length = 0, iterations = 0; @@ -4742,8 +4704,7 @@ PHP_FUNCTION(openssl_pbkdf2) /* {{{ PKCS7 S/MIME functions */ -/* {{{ proto bool openssl_pkcs7_verify(string filename, int flags [, string signerscerts [, array cainfo [, string extracerts [, string content [, string pk7]]]]]) - Verifys that the data block is intact, the signer is who they say they are, and returns the CERTs of the signers */ +/* {{{ Verifys that the data block is intact, the signer is who they say they are, and returns the CERTs of the signers */ PHP_FUNCTION(openssl_pkcs7_verify) { X509_STORE * store = NULL; @@ -4887,8 +4848,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkcs7_encrypt(string infile, string outfile, mixed recipcerts, array headers [, int flags [, int cipher]]) - Encrypts the message in the file named infile with the certificates in recipcerts and output the result to the file named outfile */ +/* {{{ Encrypts the message in the file named infile with the certificates in recipcerts and output the result to the file named outfile */ PHP_FUNCTION(openssl_pkcs7_encrypt) { zval * zrecipcerts, * zheaders = NULL; @@ -5025,8 +4985,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkcs7_read(string P7B, array &certs) - Exports the PKCS7 file to an array of PEM certificates */ +/* {{{ Exports the PKCS7 file to an array of PEM certificates */ PHP_FUNCTION(openssl_pkcs7_read) { zval * zout = NULL, zcert; @@ -5128,8 +5087,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkcs7_sign(string infile, string outfile, mixed signcert, mixed signkey, array headers [, int flags [, string extracertsfilename]]) - Signs the MIME message in the file named infile with signcert/signkey and output the result to file name outfile. headers lists plain text headers to exclude from the signed portion of the message, and should include to, from and subject as a minimum */ +/* {{{ Signs the MIME message in the file named infile with signcert/signkey and output the result to file name outfile. headers lists plain text headers to exclude from the signed portion of the message, and should include to, from and subject as a minimum */ PHP_FUNCTION(openssl_pkcs7_sign) { @@ -5251,8 +5209,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_pkcs7_decrypt(string infilename, string outfilename, mixed recipcert [, mixed recipkey]) - Decrypts the S/MIME message in the file name infilename and output the results to the file name outfilename. recipcert is a CERT for one of the recipients. recipkey specifies the private key matching recipcert, if recipcert does not include the key */ +/* {{{ Decrypts the S/MIME message in the file name infilename and output the results to the file name outfilename. recipcert is a CERT for one of the recipients. recipkey specifies the private key matching recipcert, if recipcert does not include the key */ PHP_FUNCTION(openssl_pkcs7_decrypt) { @@ -5332,8 +5289,7 @@ clean_exit: /* {{{ CMS S/MIME functions taken from PKCS#7 functions */ -/* {{{ proto bool openssl_cms_verify(string filename, int flags [, string signerscerts [, array cainfo [, string extracerts [, string content [, string pk7]]]], string sigfile, int encoding]) - Verifies that the data block is intact, the signer is who they say they are, and returns the CERTs of the signers */ +/* {{{ Verifies that the data block is intact, the signer is who they say they are, and returns the CERTs of the signers */ PHP_FUNCTION(openssl_cms_verify) { X509_STORE * store = NULL; @@ -5516,8 +5472,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_cms_encrypt(string infile, string outfile, mixed recipcerts, array headers [, int flags [,int encoding [, int cipher]]]) - Encrypts the message in the file named infile with the certificates in recipcerts and output the result to the file named outfile */ +/* {{{ Encrypts the message in the file named infile with the certificates in recipcerts and output the result to the file named outfile */ PHP_FUNCTION(openssl_cms_encrypt) { zval * zrecipcerts, * zheaders = NULL; @@ -5699,8 +5654,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_cms_read(string P7B, array &certs) - Exports the CMS file to an array of PEM certificates */ +/* {{{ Exports the CMS file to an array of PEM certificates */ PHP_FUNCTION(openssl_cms_read) { zval * zout = NULL, zcert; @@ -5798,8 +5752,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_cms_sign(string infile, string outfile, mixed signcert, mixed signkey, array headers [, int flags, int encoding [, string extracertsfilename]]) - Signs the MIME message in the file named infile with signcert/signkey and output the result to file name outfile. headers lists plain text headers to exclude from the signed portion of the message, and should include to, from and subject as a minimum */ +/* {{{ Signs the MIME message in the file named infile with signcert/signkey and output the result to file name outfile. headers lists plain text headers to exclude from the signed portion of the message, and should include to, from and subject as a minimum */ PHP_FUNCTION(openssl_cms_sign) { @@ -5979,8 +5932,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_cms_decrypt(string infilename, string outfilename, mixed recipcert [, mixed recipkey [, int encoding]) - Decrypts the S/MIME message in the file name infilename and output the results to the file name outfilename. recipcert is a CERT for one of the recipients. recipkey specifies the private key matching recipcert, if recipcert does not include the key */ +/* {{{ Decrypts the S/MIME message in the file name infilename and output the results to the file name outfilename. recipcert is a CERT for one of the recipients. recipkey specifies the private key matching recipcert, if recipcert does not include the key */ PHP_FUNCTION(openssl_cms_decrypt) { @@ -6078,8 +6030,7 @@ clean_exit: -/* {{{ proto bool openssl_private_encrypt(string data, string &crypted, mixed key [, int padding]) - Encrypts data with private key */ +/* {{{ Encrypts data with private key */ PHP_FUNCTION(openssl_private_encrypt) { zval *key, *crypted; @@ -6141,8 +6092,7 @@ PHP_FUNCTION(openssl_private_encrypt) } /* }}} */ -/* {{{ proto bool openssl_private_decrypt(string data, string &decrypted, mixed key [, int padding]) - Decrypts data with private key */ +/* {{{ Decrypts data with private key */ PHP_FUNCTION(openssl_private_decrypt) { zval *key, *crypted; @@ -6212,8 +6162,7 @@ PHP_FUNCTION(openssl_private_decrypt) } /* }}} */ -/* {{{ proto bool openssl_public_encrypt(string data, string &crypted, mixed key [, int padding]) - Encrypts data with public key */ +/* {{{ Encrypts data with public key */ PHP_FUNCTION(openssl_public_encrypt) { zval *key, *crypted; @@ -6275,8 +6224,7 @@ PHP_FUNCTION(openssl_public_encrypt) } /* }}} */ -/* {{{ proto bool openssl_public_decrypt(string data, string &crypted, resource key [, int padding]) - Decrypts data with public key */ +/* {{{ Decrypts data with public key */ PHP_FUNCTION(openssl_public_decrypt) { zval *key, *crypted; @@ -6348,8 +6296,7 @@ PHP_FUNCTION(openssl_public_decrypt) } /* }}} */ -/* {{{ proto mixed openssl_error_string(void) - Returns a description of the last error, and alters the index of the error messages. Returns false when the are no more messages */ +/* {{{ Returns a description of the last error, and alters the index of the error messages. Returns false when the are no more messages */ PHP_FUNCTION(openssl_error_string) { char buf[256]; @@ -6377,8 +6324,7 @@ PHP_FUNCTION(openssl_error_string) } /* }}} */ -/* {{{ proto bool openssl_sign(string data, &string signature, mixed key[, mixed method]) - Signs data */ +/* {{{ Signs data */ PHP_FUNCTION(openssl_sign) { zval *key, *signature; @@ -6444,8 +6390,7 @@ PHP_FUNCTION(openssl_sign) } /* }}} */ -/* {{{ proto int openssl_verify(string data, string signature, mixed key[, mixed method]) - Verifys data */ +/* {{{ Verifys data */ PHP_FUNCTION(openssl_verify) { zval *key; @@ -6507,8 +6452,7 @@ PHP_FUNCTION(openssl_verify) } /* }}} */ -/* {{{ proto int openssl_seal(string data, &string sealdata, &array ekeys, array pubkeys [, string method [, &string iv]])) - Seals data */ +/* {{{ Seals data */ PHP_FUNCTION(openssl_seal) { zval *pubkeys, *pubkey, *sealdata, *ekeys, *iv = NULL; @@ -6642,8 +6586,7 @@ clean_exit: } /* }}} */ -/* {{{ proto bool openssl_open(string data, &string opendata, string ekey, mixed privkey [, string method [, string iv]]) - Opens data */ +/* {{{ Opens data */ PHP_FUNCTION(openssl_open) { zval *privkey, *opendata; @@ -6738,8 +6681,7 @@ static void php_openssl_add_method(const OBJ_NAME *name, void *arg) /* {{{ */ } /* }}} */ -/* {{{ proto array openssl_get_md_methods([bool aliases = false]) - Return array of available digest methods */ +/* {{{ Return array of available digest methods */ PHP_FUNCTION(openssl_get_md_methods) { zend_bool aliases = 0; @@ -6754,8 +6696,7 @@ PHP_FUNCTION(openssl_get_md_methods) } /* }}} */ -/* {{{ proto array openssl_get_cipher_methods([bool aliases = false]) - Return array of available cipher methods */ +/* {{{ Return array of available cipher methods */ PHP_FUNCTION(openssl_get_cipher_methods) { zend_bool aliases = 0; @@ -6770,8 +6711,7 @@ PHP_FUNCTION(openssl_get_cipher_methods) } /* }}} */ -/* {{{ proto array openssl_get_curve_names() - Return array of available elliptic curves */ +/* {{{ Return array of available elliptic curves */ #ifdef HAVE_EVP_PKEY_EC PHP_FUNCTION(openssl_get_curve_names) { @@ -6801,8 +6741,7 @@ PHP_FUNCTION(openssl_get_curve_names) #endif /* }}} */ -/* {{{ proto string openssl_digest(string data, string method [, bool raw_output=false]) - Computes digest hash value for given data using given method, returns raw or binhex encoded string */ +/* {{{ Computes digest hash value for given data using given method, returns raw or binhex encoded string */ PHP_FUNCTION(openssl_digest) { zend_bool raw_output = 0; @@ -7147,8 +7086,7 @@ PHP_OPENSSL_API zend_string* php_openssl_encrypt( return outbuf; } -/* {{{ proto string openssl_encrypt(string data, string method, string password [, int options=0 [, string $iv=''[, string &$tag = ''[, string $aad = ''[, int $tag_length = 16]]]]]) - Encrypts given data with given method and key, returns raw or base64 encoded string */ +/* {{{ Encrypts given data with given method and key, returns raw or base64 encoded string */ PHP_FUNCTION(openssl_encrypt) { zend_long options = 0, tag_len = 16; @@ -7249,8 +7187,7 @@ PHP_OPENSSL_API zend_string* php_openssl_decrypt( return outbuf; } -/* {{{ proto string openssl_decrypt(string data, string method, string password [, int options=0 [, string $iv = ''[, string $tag = ''[, string $aad = '']]]]) - Takes raw or base64 encoded string and decrypts it using given method and key */ +/* {{{ Takes raw or base64 encoded string and decrypts it using given method and key */ PHP_FUNCTION(openssl_decrypt) { zend_long options = 0; @@ -7289,7 +7226,7 @@ PHP_OPENSSL_API zend_long php_openssl_cipher_iv_length(const char *method) return EVP_CIPHER_iv_length(cipher_type); } -/* {{{ proto int openssl_cipher_iv_length(string $method) */ +/* {{{ */ PHP_FUNCTION(openssl_cipher_iv_length) { char *method; @@ -7350,8 +7287,7 @@ PHP_OPENSSL_API zend_string* php_openssl_random_pseudo_bytes(zend_long buffer_le return buffer; } -/* {{{ proto string openssl_random_pseudo_bytes(int length [, &bool returned_strong_result]) - Returns a string of the length specified filled with random pseudo bytes */ +/* {{{ Returns a string of the length specified filled with random pseudo bytes */ PHP_FUNCTION(openssl_random_pseudo_bytes) { zend_string *buffer = NULL; diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 6206342168..bc228ce570 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -473,8 +473,7 @@ PHP_MINFO_FUNCTION(pcntl) php_info_print_table_end(); } -/* {{{ proto int pcntl_fork(void) - Forks the currently running process following the same behavior as the UNIX fork() system call*/ +/* {{{ Forks the currently running process following the same behavior as the UNIX fork() system call*/ PHP_FUNCTION(pcntl_fork) { pid_t id; @@ -493,8 +492,7 @@ PHP_FUNCTION(pcntl_fork) } /* }}} */ -/* {{{ proto int pcntl_alarm(int seconds) - Set an alarm clock for delivery of a signal*/ +/* {{{ Set an alarm clock for delivery of a signal*/ PHP_FUNCTION(pcntl_alarm) { zend_long seconds; @@ -540,8 +538,7 @@ PHP_FUNCTION(pcntl_alarm) PHP_RUSAGE_COMMON(from, to); \ } -/* {{{ proto int pcntl_waitpid(int pid, int &status, int options, array &$rusage) - Waits on or returns the status of a forked child as defined by the waitpid() system call */ +/* {{{ Waits on or returns the status of a forked child as defined by the waitpid() system call */ PHP_FUNCTION(pcntl_waitpid) { zend_long pid, options = 0; @@ -590,8 +587,7 @@ PHP_FUNCTION(pcntl_waitpid) } /* }}} */ -/* {{{ proto int pcntl_wait(int &status, int $options, array &$rusage) - Waits on or returns the status of a forked child as defined by the waitpid() system call */ +/* {{{ Waits on or returns the status of a forked child as defined by the waitpid() system call */ PHP_FUNCTION(pcntl_wait) { zend_long options = 0; @@ -645,8 +641,7 @@ PHP_FUNCTION(pcntl_wait) #undef PHP_RUSAGE_COMMON #undef PHP_RUSAGE_TO_ARRAY -/* {{{ proto bool pcntl_wifexited(int status) - Returns true if the child status code represents a successful exit */ +/* {{{ Returns true if the child status code represents a successful exit */ PHP_FUNCTION(pcntl_wifexited) { zend_long status_word; @@ -666,8 +661,7 @@ PHP_FUNCTION(pcntl_wifexited) } /* }}} */ -/* {{{ proto bool pcntl_wifstopped(int status) - Returns true if the child status code represents a stopped process (WUNTRACED must have been used with waitpid) */ +/* {{{ Returns true if the child status code represents a stopped process (WUNTRACED must have been used with waitpid) */ PHP_FUNCTION(pcntl_wifstopped) { zend_long status_word; @@ -687,8 +681,7 @@ PHP_FUNCTION(pcntl_wifstopped) } /* }}} */ -/* {{{ proto bool pcntl_wifsignaled(int status) - Returns true if the child status code represents a process that was terminated due to a signal */ +/* {{{ Returns true if the child status code represents a process that was terminated due to a signal */ PHP_FUNCTION(pcntl_wifsignaled) { zend_long status_word; @@ -707,8 +700,7 @@ PHP_FUNCTION(pcntl_wifsignaled) RETURN_FALSE; } /* }}} */ -/* {{{ proto bool pcntl_wifcontinued(int status) - Returns true if the child status code represents a process that was resumed due to a SIGCONT signal */ +/* {{{ Returns true if the child status code represents a process that was resumed due to a SIGCONT signal */ PHP_FUNCTION(pcntl_wifcontinued) { zend_long status_word; @@ -728,8 +720,7 @@ PHP_FUNCTION(pcntl_wifcontinued) /* }}} */ -/* {{{ proto int pcntl_wexitstatus(int status) - Returns the status code of a child's exit */ +/* {{{ Returns the status code of a child's exit */ PHP_FUNCTION(pcntl_wexitstatus) { zend_long status_word; @@ -747,8 +738,7 @@ PHP_FUNCTION(pcntl_wexitstatus) } /* }}} */ -/* {{{ proto int pcntl_wtermsig(int status) - Returns the number of the signal that terminated the process who's status code is passed */ +/* {{{ Returns the number of the signal that terminated the process who's status code is passed */ PHP_FUNCTION(pcntl_wtermsig) { zend_long status_word; @@ -766,8 +756,7 @@ PHP_FUNCTION(pcntl_wtermsig) } /* }}} */ -/* {{{ proto int pcntl_wstopsig(int status) - Returns the number of the signal that caused the process to stop who's status code is passed */ +/* {{{ Returns the number of the signal that caused the process to stop who's status code is passed */ PHP_FUNCTION(pcntl_wstopsig) { zend_long status_word; @@ -785,8 +774,7 @@ PHP_FUNCTION(pcntl_wstopsig) } /* }}} */ -/* {{{ proto bool pcntl_exec(string path [, array args [, array envs]]) - Executes specified program in current process space as defined by exec(2) */ +/* {{{ Executes specified program in current process space as defined by exec(2) */ PHP_FUNCTION(pcntl_exec) { zval *args = NULL, *envs = NULL; @@ -891,8 +879,7 @@ PHP_FUNCTION(pcntl_exec) } /* }}} */ -/* {{{ proto bool pcntl_signal(int signo, callback handle [, bool restart_syscalls]) - Assigns a system signal handler to a PHP function */ +/* {{{ Assigns a system signal handler to a PHP function */ PHP_FUNCTION(pcntl_signal) { zval *handle; @@ -968,8 +955,7 @@ PHP_FUNCTION(pcntl_signal) } /* }}} */ -/* {{{ proto bool pcntl_signal_get_handler(int signo) - Gets signal handler */ +/* {{{ Gets signal handler */ PHP_FUNCTION(pcntl_signal_get_handler) { zval *prev_handle; @@ -991,8 +977,7 @@ PHP_FUNCTION(pcntl_signal_get_handler) } } -/* {{{ proto bool pcntl_signal_dispatch() - Dispatch signals to signal handlers */ +/* {{{ Dispatch signals to signal handlers */ PHP_FUNCTION(pcntl_signal_dispatch) { if (zend_parse_parameters_none() == FAILURE) { @@ -1005,8 +990,7 @@ PHP_FUNCTION(pcntl_signal_dispatch) /* }}} */ #ifdef HAVE_SIGPROCMASK -/* {{{ proto bool pcntl_sigprocmask(int how, array set[, array &oldset]) - Examine and change blocked signals */ +/* {{{ Examine and change blocked signals */ PHP_FUNCTION(pcntl_sigprocmask) { zend_long how, signo; @@ -1117,16 +1101,14 @@ static void pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAMETERS, int timedwait) /* {{ } /* }}} */ -/* {{{ proto int pcntl_sigwaitinfo(array set[, array &siginfo]) - Synchronously wait for queued signals */ +/* {{{ Synchronously wait for queued signals */ PHP_FUNCTION(pcntl_sigwaitinfo) { pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int pcntl_sigtimedwait(array set[, array &siginfo[, int seconds[, int nanoseconds]]]) - Wait for queued signals */ +/* {{{ Wait for queued signals */ PHP_FUNCTION(pcntl_sigtimedwait) { pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -1191,8 +1173,7 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi #endif #ifdef HAVE_GETPRIORITY -/* {{{ proto int pcntl_getpriority([int pid [, int process_identifier]]) - Get the priority of any process */ +/* {{{ Get the priority of any process */ PHP_FUNCTION(pcntl_getpriority) { zend_long who = PRIO_PROCESS; @@ -1231,8 +1212,7 @@ PHP_FUNCTION(pcntl_getpriority) #endif #ifdef HAVE_SETPRIORITY -/* {{{ proto bool pcntl_setpriority(int priority [, int pid [, int process_identifier]]) - Change the priority of any process */ +/* {{{ Change the priority of any process */ PHP_FUNCTION(pcntl_setpriority) { zend_long who = PRIO_PROCESS; @@ -1271,8 +1251,7 @@ PHP_FUNCTION(pcntl_setpriority) /* }}} */ #endif -/* {{{ proto int pcntl_get_last_error(void) - Retrieve the error number set by the last pcntl function which failed. */ +/* {{{ Retrieve the error number set by the last pcntl function which failed. */ PHP_FUNCTION(pcntl_get_last_error) { if (zend_parse_parameters_none() == FAILURE) { @@ -1283,8 +1262,7 @@ PHP_FUNCTION(pcntl_get_last_error) } /* }}} */ -/* {{{ proto string pcntl_strerror(int errno) - Retrieve the system error message associated with the given errno. */ +/* {{{ Retrieve the system error message associated with the given errno. */ PHP_FUNCTION(pcntl_strerror) { zend_long error; @@ -1399,8 +1377,7 @@ void pcntl_signal_dispatch() sigprocmask(SIG_SETMASK, &old_mask, NULL); } -/* {{{ proto bool pcntl_async_signals([bool on]) - Enable/disable asynchronous signal handling and return the old setting. */ +/* {{{ Enable/disable asynchronous signal handling and return the old setting. */ PHP_FUNCTION(pcntl_async_signals) { zend_bool on, on_is_null = 1; @@ -1419,8 +1396,7 @@ PHP_FUNCTION(pcntl_async_signals) /* }}} */ #ifdef HAVE_UNSHARE -/* {{{ proto bool pcntl_unshare(int flags) - disassociate parts of the process execution context */ +/* {{{ disassociate parts of the process execution context */ PHP_FUNCTION(pcntl_unshare) { zend_long flags; diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 98fa437bec..122373dea3 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -572,8 +572,7 @@ static zend_always_inline size_t calculate_unit_length(pcre_cache_entry *pce, co } /* }}} */ -/* {{{ pcre_get_compiled_regex_cache - */ +/* {{{ pcre_get_compiled_regex_cache */ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, int locale_aware) { pcre2_code *re = NULL; @@ -875,16 +874,14 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in } /* }}} */ -/* {{{ pcre_get_compiled_regex_cache - */ +/* {{{ pcre_get_compiled_regex_cache */ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) { return pcre_get_compiled_regex_cache_ex(regex, 1); } /* }}} */ -/* {{{ pcre_get_compiled_regex - */ +/* {{{ pcre_get_compiled_regex */ PHPAPI pcre2_code *pcre_get_compiled_regex(zend_string *regex, uint32_t *capture_count) { pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex); @@ -897,8 +894,7 @@ PHPAPI pcre2_code *pcre_get_compiled_regex(zend_string *regex, uint32_t *capture } /* }}} */ -/* {{{ pcre_get_compiled_regex_ex - */ +/* {{{ pcre_get_compiled_regex_ex */ PHPAPI pcre2_code* pcre_get_compiled_regex_ex(zend_string *regex, uint32_t *capture_count, uint32_t *preg_options, uint32_t *compile_options) { pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex); @@ -1468,24 +1464,21 @@ error: } /* }}} */ -/* {{{ proto int preg_match(string pattern, string subject [, array &subpatterns [, int flags [, int offset]]]) - Perform a Perl-style regular expression match */ +/* {{{ Perform a Perl-style regular expression match */ PHP_FUNCTION(preg_match) { php_do_pcre_match(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int preg_match_all(string pattern, string subject [, array &subpatterns [, int flags [, int offset]]]) - Perform a Perl-style global regular expression match */ +/* {{{ Perform a Perl-style global regular expression match */ PHP_FUNCTION(preg_match_all) { php_do_pcre_match(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ preg_get_backref - */ +/* {{{ preg_get_backref */ static int preg_get_backref(char **str, int *backref) { register char in_brace = 0; @@ -1523,8 +1516,7 @@ static int preg_get_backref(char **str, int *backref) } /* }}} */ -/* {{{ preg_do_repl_func - */ +/* {{{ preg_do_repl_func */ static zend_string *preg_do_repl_func(zend_fcall_info *fci, zend_fcall_info_cache *fcc, const char *subject, PCRE2_SIZE *offsets, zend_string **subpat_names, uint32_t num_subpats, int count, const PCRE2_SPTR mark, zend_long flags) { zend_string *result_str; @@ -1560,8 +1552,7 @@ static zend_string *preg_do_repl_func(zend_fcall_info *fci, zend_fcall_info_cach } /* }}} */ -/* {{{ php_pcre_replace - */ +/* {{{ php_pcre_replace */ PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, const char *subject, size_t subject_len, @@ -2046,8 +2037,7 @@ error: } /* }}} */ -/* {{{ php_pcre_replace_func - */ +/* {{{ php_pcre_replace_func */ static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex, zend_string *subject_str, zend_fcall_info *fci, zend_fcall_info_cache *fcc, @@ -2070,8 +2060,7 @@ static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex, } /* }}} */ -/* {{{ php_pcre_replace_array - */ +/* {{{ php_pcre_replace_array */ static zend_string *php_pcre_replace_array(HashTable *regex, zval *replace, zend_string *subject_str, size_t limit, size_t *replace_count) { zval *regex_entry; @@ -2154,8 +2143,7 @@ static zend_string *php_pcre_replace_array(HashTable *regex, zval *replace, zend } /* }}} */ -/* {{{ php_replace_in_subject - */ +/* {{{ php_replace_in_subject */ static zend_always_inline zend_string *php_replace_in_subject(zval *regex, zval *replace, zval *subject, size_t limit, size_t *replace_count) { zend_string *result; @@ -2181,8 +2169,7 @@ static zend_always_inline zend_string *php_replace_in_subject(zval *regex, zval } /* }}} */ -/* {{{ php_replace_in_subject_func - */ +/* {{{ php_replace_in_subject_func */ static zend_string *php_replace_in_subject_func(zval *regex, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *subject, size_t limit, size_t *replace_count, zend_long flags) { zend_string *result; @@ -2221,8 +2208,7 @@ static zend_string *php_replace_in_subject_func(zval *regex, zend_fcall_info *fc } /* }}} */ -/* {{{ preg_replace_func_impl - */ +/* {{{ preg_replace_func_impl */ static size_t preg_replace_func_impl(zval *return_value, zval *regex, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *subject, zend_long limit_val, zend_long flags) { zend_string *result; @@ -2269,8 +2255,7 @@ static size_t preg_replace_func_impl(zval *return_value, zval *regex, zend_fcall } /* }}} */ -/* {{{ preg_replace_common - */ +/* {{{ preg_replace_common */ static void preg_replace_common(INTERNAL_FUNCTION_PARAMETERS, int is_filter) { zval *regex, *replace, *subject, *zcount = NULL; @@ -2357,16 +2342,14 @@ static void preg_replace_common(INTERNAL_FUNCTION_PARAMETERS, int is_filter) } /* }}} */ -/* {{{ proto mixed preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, int &count]]) - Perform Perl-style regular expression replacement. */ +/* {{{ Perform Perl-style regular expression replacement. */ PHP_FUNCTION(preg_replace) { preg_replace_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto mixed preg_replace_callback(mixed regex, mixed callback, mixed subject [, int limit [, int &count]]) - Perform Perl-style regular expression replacement using replacement callback. */ +/* {{{ Perform Perl-style regular expression replacement using replacement callback. */ PHP_FUNCTION(preg_replace_callback) { zval *regex, *subject, *zcount = NULL; @@ -2393,8 +2376,7 @@ PHP_FUNCTION(preg_replace_callback) } /* }}} */ -/* {{{ proto mixed preg_replace_callback_array(array pattern, mixed subject [, int limit [, int &count]]) - Perform Perl-style regular expression replacement using replacement callback. */ +/* {{{ Perform Perl-style regular expression replacement using replacement callback. */ PHP_FUNCTION(preg_replace_callback_array) { zval regex, zv, *replace, *subject, *pattern, *zcount = NULL; @@ -2461,16 +2443,14 @@ PHP_FUNCTION(preg_replace_callback_array) } /* }}} */ -/* {{{ proto mixed preg_filter(mixed regex, mixed replace, mixed subject [, int limit [, int &count]]) - Perform Perl-style regular expression replacement and only return matches. */ +/* {{{ Perform Perl-style regular expression replacement and only return matches. */ PHP_FUNCTION(preg_filter) { preg_replace_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto array preg_split(string pattern, string subject [, int limit [, int flags]]) - Split string into an array using a perl-style regular expression as a delimiter */ +/* {{{ Split string into an array using a perl-style regular expression as a delimiter */ PHP_FUNCTION(preg_split) { zend_string *regex; /* Regular expression */ @@ -2499,8 +2479,7 @@ PHP_FUNCTION(preg_split) } /* }}} */ -/* {{{ php_pcre_split - */ +/* {{{ php_pcre_split */ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str, zval *return_value, zend_long limit_val, zend_long flags) { @@ -2690,8 +2669,7 @@ last: } /* }}} */ -/* {{{ proto string preg_quote(string str [, string delim_char]) - Quote regular expression characters plus an optional character */ +/* {{{ Quote regular expression characters plus an optional character */ PHP_FUNCTION(preg_quote) { zend_string *str; /* Input string argument */ @@ -2827,8 +2805,7 @@ PHP_FUNCTION(preg_quote) } /* }}} */ -/* {{{ proto array preg_grep(string regex, array input [, int flags]) - Searches array and returns entries which match regex */ +/* {{{ Searches array and returns entries which match regex */ PHP_FUNCTION(preg_grep) { zend_string *regex; /* Regular expression */ @@ -2944,8 +2921,7 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return } /* }}} */ -/* {{{ proto int preg_last_error() - Returns the error code of the last regexp execution. */ +/* {{{ Returns the error code of the last regexp execution. */ PHP_FUNCTION(preg_last_error) { ZEND_PARSE_PARAMETERS_NONE(); @@ -2954,8 +2930,7 @@ PHP_FUNCTION(preg_last_error) } /* }}} */ -/* {{{ proto string preg_last_error_msg() - Returns the error message of the last regexp execution. */ +/* {{{ Returns the error message of the last regexp execution. */ PHP_FUNCTION(preg_last_error_msg) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 2729c27ce6..9b97ba1416 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -79,8 +79,7 @@ PDO_API zend_class_entry *php_pdo_get_exception_base(int root) /* {{{ */ } /* }}} */ -/* {{{ proto array pdo_drivers() - Return array of available PDO drivers */ +/* {{{ Return array of available PDO drivers */ PHP_FUNCTION(pdo_drivers) { pdo_driver_t *pdriver; diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index e1d8c5b92c..b80bdf60d4 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -190,7 +190,7 @@ static char *dsn_from_uri(char *uri, char *buf, size_t buflen) /* {{{ */ } /* }}} */ -/* {{{ proto PDO::__construct(string dsn[, string username[, string passwd [, array options]]]) */ +/* {{{ */ PHP_METHOD(PDO, __construct) { zval *object = ZEND_THIS; @@ -454,8 +454,7 @@ static void pdo_stmt_construct(zend_execute_data *execute_data, pdo_stmt_t *stmt } /* }}} */ -/* {{{ proto object PDO::prepare(string statement [, array options]) - Prepares a statement for execution and returns a statement object */ +/* {{{ Prepares a statement for execution and returns a statement object */ PHP_METHOD(PDO, prepare) { pdo_stmt_t *stmt; @@ -553,8 +552,7 @@ PHP_METHOD(PDO, prepare) } /* }}} */ -/* {{{ proto bool PDO::beginTransaction() - Initiates a transaction */ +/* {{{ Initiates a transaction */ PHP_METHOD(PDO, beginTransaction) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -585,8 +583,7 @@ PHP_METHOD(PDO, beginTransaction) } /* }}} */ -/* {{{ proto bool PDO::commit() - Commit a transaction */ +/* {{{ Commit a transaction */ PHP_METHOD(PDO, commit) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -610,8 +607,7 @@ PHP_METHOD(PDO, commit) } /* }}} */ -/* {{{ proto bool PDO::rollBack() - roll back a transaction */ +/* {{{ roll back a transaction */ PHP_METHOD(PDO, rollBack) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -635,8 +631,7 @@ PHP_METHOD(PDO, rollBack) } /* }}} */ -/* {{{ proto bool PDO::inTransaction() - determine if inside a transaction */ +/* {{{ determine if inside a transaction */ PHP_METHOD(PDO, inTransaction) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -807,8 +802,7 @@ fail: } /* }}} */ -/* {{{ proto bool PDO::setAttribute(int attribute, mixed value) - Set an attribute */ +/* {{{ Set an attribute */ PHP_METHOD(PDO, setAttribute) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -830,8 +824,7 @@ PHP_METHOD(PDO, setAttribute) } /* }}} */ -/* {{{ proto mixed PDO::getAttribute(int attribute) - Get an attribute */ +/* {{{ Get an attribute */ PHP_METHOD(PDO, getAttribute) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -895,8 +888,7 @@ PHP_METHOD(PDO, getAttribute) } /* }}} */ -/* {{{ proto int PDO::exec(string statement) - Execute a statement that does not return a row set, returning the number of affected rows */ +/* {{{ Execute a statement that does not return a row set, returning the number of affected rows */ PHP_METHOD(PDO, exec) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -924,8 +916,7 @@ PHP_METHOD(PDO, exec) } /* }}} */ -/* {{{ proto string PDO::lastInsertId([string name]) - Returns the id of the last row that we affected on this connection. Some databases require a sequence or table name to be passed in. Not always meaningful. */ +/* {{{ Returns the id of the last row that we affected on this connection. Some databases require a sequence or table name to be passed in. Not always meaningful. */ PHP_METHOD(PDO, lastInsertId) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -958,8 +949,7 @@ PHP_METHOD(PDO, lastInsertId) } /* }}} */ -/* {{{ proto string PDO::errorCode() - Fetch the error code associated with the last operation on the database handle */ +/* {{{ Fetch the error code associated with the last operation on the database handle */ PHP_METHOD(PDO, errorCode) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -984,8 +974,7 @@ PHP_METHOD(PDO, errorCode) } /* }}} */ -/* {{{ proto array PDO::errorInfo() - Fetch extended error information associated with the last operation on the database handle */ +/* {{{ Fetch extended error information associated with the last operation on the database handle */ PHP_METHOD(PDO, errorInfo) { int error_count; @@ -1031,8 +1020,7 @@ fill_array: } /* }}} */ -/* {{{ proto object PDO::query(string sql [, PDOStatement::setFetchMode() args]) - Prepare and execute $sql; returns the statement object for iteration */ +/* {{{ Prepare and execute $sql; returns the statement object for iteration */ PHP_METHOD(PDO, query) { pdo_stmt_t *stmt; @@ -1111,8 +1099,7 @@ PHP_METHOD(PDO, query) } /* }}} */ -/* {{{ proto string PDO::quote(string string [, int paramtype]) - quotes string for use in a query. The optional paramtype acts as a hint for drivers that have alternate quoting styles. The default value is PDO_PARAM_STR */ +/* {{{ quotes string for use in a query. The optional paramtype acts as a hint for drivers that have alternate quoting styles. The default value is PDO_PARAM_STR */ PHP_METHOD(PDO, quote) { pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); @@ -1145,8 +1132,7 @@ PHP_METHOD(PDO, quote) } /* }}} */ -/* {{{ proto array PDO::getAvailableDrivers() - Return array of available PDO drivers */ +/* {{{ Return array of available PDO drivers */ PHP_METHOD(PDO, getAvailableDrivers) { pdo_driver_t *pdriver; diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 5f0f4c74e7..5a49491e32 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -336,8 +336,7 @@ static int really_register_bound_param(struct pdo_bound_param_data *param, pdo_s } /* }}} */ -/* {{{ proto bool PDOStatement::execute([array $bound_input_params]) - Execute a prepared statement, optionally binding parameters */ +/* {{{ Execute a prepared statement, optionally binding parameters */ PHP_METHOD(PDOStatement, execute) { zval *input_params = NULL; @@ -1159,8 +1158,7 @@ static int pdo_stmt_verify_mode(pdo_stmt_t *stmt, zend_long mode, int fetch_all) } /* }}} */ -/* {{{ proto mixed PDOStatement::fetch([int $how = PDO_FETCH_BOTH [, int $orientation [, int $offset]]]) - Fetches the next row and returns it, or false if there are no more rows */ +/* {{{ Fetches the next row and returns it, or false if there are no more rows */ PHP_METHOD(PDOStatement, fetch) { zend_long how = PDO_FETCH_USE_DEFAULT; @@ -1188,8 +1186,7 @@ PHP_METHOD(PDOStatement, fetch) } /* }}} */ -/* {{{ proto mixed PDOStatement::fetchObject([string class_name [, NULL|array ctor_args]]) - Fetches the next row and returns it as an object. */ +/* {{{ Fetches the next row and returns it as an object. */ PHP_METHOD(PDOStatement, fetchObject) { zend_long how = PDO_FETCH_CLASS; @@ -1255,8 +1252,7 @@ PHP_METHOD(PDOStatement, fetchObject) } /* }}} */ -/* {{{ proto string PDOStatement::fetchColumn([int column_number]) - Returns a data of the specified column in the result set. */ +/* {{{ Returns a data of the specified column in the result set. */ PHP_METHOD(PDOStatement, fetchColumn) { zend_long col_n = 0; @@ -1278,8 +1274,7 @@ PHP_METHOD(PDOStatement, fetchColumn) } /* }}} */ -/* {{{ proto array PDOStatement::fetchAll([int $how = PDO_FETCH_BOTH [, string class_name [, NULL|array ctor_args]]]) - Returns an array of all of the results. */ +/* {{{ Returns an array of all of the results. */ PHP_METHOD(PDOStatement, fetchAll) { zend_long how = PDO_FETCH_USE_DEFAULT; @@ -1484,8 +1479,7 @@ static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, return 1; } /* }}} */ -/* {{{ proto bool PDOStatement::bindValue(mixed $paramno, mixed $param [, int $type ]) - bind an input parameter to the value of a PHP variable. $paramno is the 1-based position of the placeholder in the SQL statement (but can be the parameter name for drivers that support named placeholders). It should be called prior to execute(). */ +/* {{{ bind an input parameter to the value of a PHP variable. $paramno is the 1-based position of the placeholder in the SQL statement (but can be the parameter name for drivers that support named placeholders). It should be called prior to execute(). */ PHP_METHOD(PDOStatement, bindValue) { struct pdo_bound_param_data param; @@ -1525,8 +1519,7 @@ PHP_METHOD(PDOStatement, bindValue) } /* }}} */ -/* {{{ proto bool PDOStatement::bindParam(mixed $paramno, mixed &$param [, int $type [, int $maxlen [, mixed $driverdata]]]) - bind a parameter to a PHP variable. $paramno is the 1-based position of the placeholder in the SQL statement (but can be the parameter name for drivers that support named placeholders). This isn't supported by all drivers. It should be called prior to execute(). */ +/* {{{ bind a parameter to a PHP variable. $paramno is the 1-based position of the placeholder in the SQL statement (but can be the parameter name for drivers that support named placeholders). This isn't supported by all drivers. It should be called prior to execute(). */ PHP_METHOD(PDOStatement, bindParam) { PHP_STMT_GET_OBJ; @@ -1534,8 +1527,7 @@ PHP_METHOD(PDOStatement, bindParam) } /* }}} */ -/* {{{ proto bool PDOStatement::bindColumn(mixed $column, mixed &$param [, int $type [, int $maxlen [, mixed $driverdata]]]) - bind a column to a PHP variable. On each row fetch $param will contain the value of the corresponding column. $column is the 1-based offset of the column, or the column name. For portability, don't call this before execute(). */ +/* {{{ bind a column to a PHP variable. On each row fetch $param will contain the value of the corresponding column. $column is the 1-based offset of the column, or the column name. For portability, don't call this before execute(). */ PHP_METHOD(PDOStatement, bindColumn) { PHP_STMT_GET_OBJ; @@ -1543,8 +1535,7 @@ PHP_METHOD(PDOStatement, bindColumn) } /* }}} */ -/* {{{ proto int PDOStatement::rowCount() - Returns the number of rows in a result set, or the number of rows affected by the last execute(). It is not always meaningful. */ +/* {{{ Returns the number of rows in a result set, or the number of rows affected by the last execute(). It is not always meaningful. */ PHP_METHOD(PDOStatement, rowCount) { PHP_STMT_GET_OBJ; @@ -1555,8 +1546,7 @@ PHP_METHOD(PDOStatement, rowCount) } /* }}} */ -/* {{{ proto string PDOStatement::errorCode() - Fetch the error code associated with the last operation on the statement handle */ +/* {{{ Fetch the error code associated with the last operation on the statement handle */ PHP_METHOD(PDOStatement, errorCode) { PHP_STMT_GET_OBJ; @@ -1571,8 +1561,7 @@ PHP_METHOD(PDOStatement, errorCode) } /* }}} */ -/* {{{ proto array PDOStatement::errorInfo() - Fetch extended error information associated with the last operation on the statement handle */ +/* {{{ Fetch extended error information associated with the last operation on the statement handle */ PHP_METHOD(PDOStatement, errorInfo) { int error_count; @@ -1603,8 +1592,7 @@ PHP_METHOD(PDOStatement, errorInfo) } /* }}} */ -/* {{{ proto bool PDOStatement::setAttribute(long attribute, mixed value) - Set an attribute */ +/* {{{ Set an attribute */ PHP_METHOD(PDOStatement, setAttribute) { zend_long attr; @@ -1635,8 +1623,7 @@ fail: } /* }}} */ -/* {{{ proto mixed PDOStatement::getAttribute(long attribute) - Get an attribute */ +/* {{{ Get an attribute */ static int generic_stmt_attr_get(pdo_stmt_t *stmt, zval *return_value, zend_long attr) { @@ -1687,8 +1674,7 @@ PHP_METHOD(PDOStatement, getAttribute) } /* }}} */ -/* {{{ proto int PDOStatement::columnCount() - Returns the number of columns in the result set */ +/* {{{ Returns the number of columns in the result set */ PHP_METHOD(PDOStatement, columnCount) { PHP_STMT_GET_OBJ; @@ -1699,8 +1685,7 @@ PHP_METHOD(PDOStatement, columnCount) } /* }}} */ -/* {{{ proto array PDOStatement::getColumnMeta(int $column) - Returns meta data for a numbered column */ +/* {{{ Returns meta data for a numbered column */ PHP_METHOD(PDOStatement, getColumnMeta) { zend_long colno; @@ -1739,8 +1724,7 @@ PHP_METHOD(PDOStatement, getColumnMeta) } /* }}} */ -/* {{{ proto bool PDOStatement::setFetchMode(int mode [, mixed* params]) - Changes the default fetch mode for subsequent fetches (params have different meaning for different fetch modes) */ +/* {{{ Changes the default fetch mode for subsequent fetches (params have different meaning for different fetch modes) */ int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip) { @@ -1921,8 +1905,7 @@ PHP_METHOD(PDOStatement, setFetchMode) } /* }}} */ -/* {{{ proto bool PDOStatement::nextRowset() - Advances to the next rowset in a multi-rowset statement handle. Returns true if it succeeded, false otherwise */ +/* {{{ Advances to the next rowset in a multi-rowset statement handle. Returns true if it succeeded, false otherwise */ static int pdo_stmt_do_next_rowset(pdo_stmt_t *stmt) { @@ -1974,8 +1957,7 @@ PHP_METHOD(PDOStatement, nextRowset) } /* }}} */ -/* {{{ proto bool PDOStatement::closeCursor() - Closes the cursor, leaving the statement ready for re-execution. */ +/* {{{ Closes the cursor, leaving the statement ready for re-execution. */ PHP_METHOD(PDOStatement, closeCursor) { PHP_STMT_GET_OBJ; @@ -2011,8 +1993,7 @@ PHP_METHOD(PDOStatement, closeCursor) } /* }}} */ -/* {{{ proto void PDOStatement::debugDumpParams() - A utility for internals hackers to debug parameter internals */ +/* {{{ A utility for internals hackers to debug parameter internals */ PHP_METHOD(PDOStatement, debugDumpParams) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index d8e55957f2..2af4b89724 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -31,8 +31,7 @@ static const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ }; /* }}} */ -/* {{{ pdo_firebird_deps - */ +/* {{{ pdo_firebird_deps */ static const zend_module_dep pdo_firebird_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 1821e247ae..f3310cde41 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -85,8 +85,7 @@ static const MYSQLND_REVERSE_API pdo_mysql_reverse_api = { #endif -/* {{{ PHP_INI_BEGIN -*/ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() #ifndef PHP_WIN32 STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateStringUnempty, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals) @@ -99,8 +98,7 @@ PHP_INI_END() /* true global environment */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(pdo_mysql) { REGISTER_INI_ENTRIES(); @@ -138,8 +136,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(pdo_mysql) { php_pdo_unregister_driver(&pdo_mysql_driver); @@ -151,8 +148,7 @@ static PHP_MSHUTDOWN_FUNCTION(pdo_mysql) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(pdo_mysql) { php_info_print_table_start(); @@ -170,8 +166,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql) #if defined(PDO_USE_MYSQLND) && PDO_DBG_ENABLED -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(pdo_mysql) { if (PDO_MYSQL_G(debug)) { @@ -187,8 +182,7 @@ static PHP_RINIT_FUNCTION(pdo_mysql) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ static PHP_RSHUTDOWN_FUNCTION(pdo_mysql) { MYSQLND_DEBUG *dbg = PDO_MYSQL_G(dbg); @@ -204,8 +198,7 @@ static PHP_RSHUTDOWN_FUNCTION(pdo_mysql) /* }}} */ #endif -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(pdo_mysql) { #if defined(COMPILE_DL_PDO_MYSQL) && defined(ZTS) diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index 3cbfb2179c..1a49ed001f 100644 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -84,8 +84,7 @@ OCIEnv *pdo_oci_Env = NULL; static MUTEX_T pdo_oci_env_mutex; #endif -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pdo_oci) { REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_ACTION", (zend_long)PDO_OCI_ATTR_ACTION); @@ -107,8 +106,7 @@ PHP_MINIT_FUNCTION(pdo_oci) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(pdo_oci) { if (!pdo_oci_Env) { @@ -132,8 +130,7 @@ PHP_RINIT_FUNCTION(pdo_oci) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo_oci) { php_pdo_unregister_driver(&pdo_oci_driver); @@ -150,8 +147,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_oci) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pdo_oci) { php_info_print_table_start(); diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 51af17055c..875936672f 100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -112,8 +112,7 @@ PHP_MINIT_FUNCTION(pdo_odbc) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo_odbc) { php_pdo_unregister_driver(&pdo_odbc_driver); @@ -121,8 +120,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_odbc) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pdo_odbc) { php_info_print_table_start(); diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index 047329d3cb..d809ee50cb 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -32,8 +32,7 @@ static const zend_function_entry pdo_pgsql_functions[] = { }; /* }}} */ -/* {{{ pdo_sqlite_deps - */ +/* {{{ pdo_sqlite_deps */ static const zend_module_dep pdo_pgsql_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END @@ -62,8 +61,7 @@ ZEND_GET_MODULE(pdo_pgsql) /* true global environment */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pdo_pgsql) { REGISTER_PDO_CLASS_CONST_LONG("PGSQL_ATTR_DISABLE_PREPARES", PDO_PGSQL_ATTR_DISABLE_PREPARES); @@ -78,8 +76,7 @@ PHP_MINIT_FUNCTION(pdo_pgsql) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo_pgsql) { php_pdo_unregister_driver(&pdo_pgsql_driver); @@ -87,8 +84,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_pgsql) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pdo_pgsql) { char buf[16]; diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 31d1bf59f7..a6292b909a 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -544,8 +544,7 @@ static int pgsql_handle_rollback(pdo_dbh_t *dbh) return pdo_pgsql_transaction_cmd("ROLLBACK", dbh); } -/* {{{ proto string PDO::pgsqlCopyFromArray(string $table_name , array $rows [, string $delimiter [, string $null_as ] [, string $fields]) - Returns true if the copy worked fine or false if error */ +/* {{{ Returns true if the copy worked fine or false if error */ static PHP_METHOD(PDO, pgsqlCopyFromArray) { pdo_dbh_t *dbh; @@ -658,8 +657,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromArray) } /* }}} */ -/* {{{ proto string PDO::pgsqlCopyFromFile(string $table_name , string $filename [, string $delimiter [, string $null_as ] [, string $fields]) - Returns true if the copy worked fine or false if error */ +/* {{{ Returns true if the copy worked fine or false if error */ static PHP_METHOD(PDO, pgsqlCopyFromFile) { pdo_dbh_t *dbh; @@ -757,8 +755,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromFile) /* }}} */ -/* {{{ proto string PDO::pgsqlCopyToFile(string $table_name , string $filename, [string $delimiter [, string $null_as [, string $fields]]]) - Returns true if the copy worked fine or false if error */ +/* {{{ Returns true if the copy worked fine or false if error */ static PHP_METHOD(PDO, pgsqlCopyToFile) { pdo_dbh_t *dbh; @@ -852,8 +849,7 @@ static PHP_METHOD(PDO, pgsqlCopyToFile) } /* }}} */ -/* {{{ proto string PDO::pgsqlCopyToArray(string $table_name , [string $delimiter [, string $null_as [, string $fields]]]) - Returns true if the copy worked fine or false if error */ +/* {{{ Returns true if the copy worked fine or false if error */ static PHP_METHOD(PDO, pgsqlCopyToArray) { pdo_dbh_t *dbh; @@ -929,8 +925,7 @@ static PHP_METHOD(PDO, pgsqlCopyToArray) /* }}} */ -/* {{{ proto string PDO::pgsqlLOBCreate() - Creates a new large object, returning its identifier. Must be called inside a transaction. */ +/* {{{ Creates a new large object, returning its identifier. Must be called inside a transaction. */ static PHP_METHOD(PDO, pgsqlLOBCreate) { pdo_dbh_t *dbh; @@ -958,8 +953,7 @@ static PHP_METHOD(PDO, pgsqlLOBCreate) } /* }}} */ -/* {{{ proto resource PDO::pgsqlLOBOpen(string oid [, string mode = 'rb']) - Opens an existing large object stream. Must be called inside a transaction. */ +/* {{{ Opens an existing large object stream. Must be called inside a transaction. */ static PHP_METHOD(PDO, pgsqlLOBOpen) { pdo_dbh_t *dbh; @@ -1010,8 +1004,7 @@ static PHP_METHOD(PDO, pgsqlLOBOpen) } /* }}} */ -/* {{{ proto bool PDO::pgsqlLOBUnlink(string oid) - Deletes the large object identified by oid. Must be called inside a transaction. */ +/* {{{ Deletes the large object identified by oid. Must be called inside a transaction. */ static PHP_METHOD(PDO, pgsqlLOBUnlink) { pdo_dbh_t *dbh; @@ -1046,8 +1039,7 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink) } /* }}} */ -/* {{{ proto mixed PDO::pgsqlGetNotify([ int $result_type = PDO::FETCH_USE_DEFAULT] [, int $ms_timeout = 0 ]]) - Get asynchronous notification */ +/* {{{ Get asynchronous notification */ static PHP_METHOD(PDO, pgsqlGetNotify) { pdo_dbh_t *dbh; @@ -1127,8 +1119,7 @@ static PHP_METHOD(PDO, pgsqlGetNotify) } /* }}} */ -/* {{{ proto int PDO::pgsqlGetPid() - Get backend(server) pid */ +/* {{{ Get backend(server) pid */ static PHP_METHOD(PDO, pgsqlGetPid) { pdo_dbh_t *dbh; diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index 4f932cc969..7410c06757 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -33,16 +33,14 @@ static const zend_function_entry pdo_sqlite_functions[] = { }; /* }}} */ -/* {{{ pdo_sqlite_deps - */ +/* {{{ pdo_sqlite_deps */ static const zend_module_dep pdo_sqlite_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END }; /* }}} */ -/* {{{ pdo_sqlite_module_entry - */ +/* {{{ pdo_sqlite_module_entry */ zend_module_entry pdo_sqlite_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, pdo_sqlite_deps, @@ -88,8 +86,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_sqlite) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pdo_sqlite) { php_info_print_table_start(); diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 5a4cfd6f2c..442d09af04 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -544,8 +544,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_select, 0, 0, 3) ZEND_END_ARG_INFO() /* }}} */ -/* {{{ pgsql_functions[] - */ +/* {{{ pgsql_functions[] */ static const zend_function_entry pgsql_functions[] = { /* connection functions */ PHP_FE(pg_connect, arginfo_pg_connect) @@ -676,8 +675,7 @@ static const zend_function_entry pgsql_functions[] = { }; /* }}} */ -/* {{{ pgsql_module_entry - */ +/* {{{ pgsql_module_entry */ zend_module_entry pgsql_module_entry = { STANDARD_MODULE_HEADER, "pgsql", @@ -744,8 +742,7 @@ static inline char * _php_pgsql_trim_result(PGconn * pgsql, char **buf) efree(msgbuf); \ } \ -/* {{{ php_pgsql_set_default_link - */ +/* {{{ php_pgsql_set_default_link */ static void php_pgsql_set_default_link(zend_resource *res) { GC_ADDREF(res); @@ -758,8 +755,7 @@ static void php_pgsql_set_default_link(zend_resource *res) } /* }}} */ -/* {{{ _close_pgsql_link - */ +/* {{{ _close_pgsql_link */ static void _close_pgsql_link(zend_resource *rsrc) { PGconn *link = (PGconn *)rsrc->ptr; @@ -781,8 +777,7 @@ static void _close_pgsql_link(zend_resource *rsrc) } /* }}} */ -/* {{{ _close_pgsql_plink - */ +/* {{{ _close_pgsql_plink */ static void _close_pgsql_plink(zend_resource *rsrc) { PGconn *link = (PGconn *)rsrc->ptr; @@ -797,8 +792,7 @@ static void _close_pgsql_plink(zend_resource *rsrc) } /* }}} */ -/* {{{ _php_pgsql_notice_handler - */ +/* {{{ _php_pgsql_notice_handler */ static void _php_pgsql_notice_handler(void *resource_id, const char *message) { zval *notices; @@ -823,8 +817,7 @@ static void _php_pgsql_notice_handler(void *resource_id, const char *message) } /* }}} */ -/* {{{ _rollback_transactions - */ +/* {{{ _rollback_transactions */ static int _rollback_transactions(zval *el) { PGconn *link; @@ -856,8 +849,7 @@ static int _rollback_transactions(zval *el) } /* }}} */ -/* {{{ _free_ptr - */ +/* {{{ _free_ptr */ static void _free_ptr(zend_resource *rsrc) { pgLofp *lofp = (pgLofp *)rsrc->ptr; @@ -865,8 +857,7 @@ static void _free_ptr(zend_resource *rsrc) } /* }}} */ -/* {{{ _free_result - */ +/* {{{ _free_result */ static void _free_result(zend_resource *rsrc) { pgsql_result_handle *pg_result = (pgsql_result_handle *)rsrc->ptr; @@ -900,8 +891,7 @@ static int _php_pgsql_detect_identifier_escape(const char *identifier, size_t le } /* }}} */ -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN( "pgsql.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateBool, allow_persistent, zend_pgsql_globals, pgsql_globals) STD_PHP_INI_ENTRY_EX("pgsql.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_pgsql_globals, pgsql_globals, display_link_numbers) @@ -912,8 +902,7 @@ STD_PHP_INI_BOOLEAN( "pgsql.log_notice", "0", PHP_INI_ALL, OnUpda PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(pgsql) { #if defined(COMPILE_DL_PGSQL) && defined(ZTS) @@ -940,8 +929,7 @@ static void php_libpq_version(char *buf, size_t len) } } -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pgsql) { char buf[16]; @@ -1060,8 +1048,7 @@ PHP_MINIT_FUNCTION(pgsql) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pgsql) { UNREGISTER_INI_ENTRIES(); @@ -1072,8 +1059,7 @@ PHP_MSHUTDOWN_FUNCTION(pgsql) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(pgsql) { PGG(default_link) = NULL; @@ -1082,8 +1068,7 @@ PHP_RINIT_FUNCTION(pgsql) } /* }}} */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(pgsql) { /* clean up notice messages */ @@ -1095,8 +1080,7 @@ PHP_RSHUTDOWN_FUNCTION(pgsql) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pgsql) { char buf[256]; @@ -1120,8 +1104,7 @@ PHP_MINFO_FUNCTION(pgsql) } /* }}} */ -/* {{{ php_pgsql_do_connect - */ +/* {{{ php_pgsql_do_connect */ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *host=NULL,*port=NULL,*options=NULL,*tty=NULL,*dbname=NULL,*connstring=NULL; @@ -1357,16 +1340,14 @@ err: } /* }}} */ -/* {{{ proto resource pg_connect(string connection_string[, int connect_type] | [string host, string port [, string options [, string tty,]]] string database) - Open a PostgreSQL connection */ +/* {{{ Open a PostgreSQL connection */ PHP_FUNCTION(pg_connect) { php_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); } /* }}} */ -/* {{{ proto resource pg_connect_poll(resource connection) - Poll the status of an in-progress async PostgreSQL connection attempt*/ +/* {{{ Poll the status of an in-progress async PostgreSQL connection attempt*/ PHP_FUNCTION(pg_connect_poll) { zval *pgsql_link; @@ -1387,16 +1368,14 @@ PHP_FUNCTION(pg_connect_poll) } /* }}} */ -/* {{{ proto resource pg_pconnect(string connection_string | [string host, string port [, string options [, string tty,]]] string database) - Open a persistent PostgreSQL connection */ +/* {{{ Open a persistent PostgreSQL connection */ PHP_FUNCTION(pg_pconnect) { php_pgsql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1); } /* }}} */ -/* {{{ proto bool pg_close([resource connection]) - Close a PostgreSQL connection */ +/* {{{ Close a PostgreSQL connection */ PHP_FUNCTION(pg_close) { zval *pgsql_link = NULL; @@ -1437,8 +1416,7 @@ PHP_FUNCTION(pg_close) #define PHP_PG_HOST 6 #define PHP_PG_VERSION 7 -/* {{{ php_pgsql_get_link_info - */ +/* {{{ php_pgsql_get_link_info */ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zend_resource *link; @@ -1522,64 +1500,56 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type } /* }}} */ -/* {{{ proto string pg_dbname([resource connection]) - Get the database name */ +/* {{{ Get the database name */ PHP_FUNCTION(pg_dbname) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_DBNAME); } /* }}} */ -/* {{{ proto string pg_last_error([resource connection]) - Get the error message string */ +/* {{{ Get the error message string */ PHP_FUNCTION(pg_last_error) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_ERROR_MESSAGE); } /* }}} */ -/* {{{ proto string pg_options([resource connection]) - Get the options associated with the connection */ +/* {{{ Get the options associated with the connection */ PHP_FUNCTION(pg_options) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_OPTIONS); } /* }}} */ -/* {{{ proto int pg_port([resource connection]) - Return the port number associated with the connection */ +/* {{{ Return the port number associated with the connection */ PHP_FUNCTION(pg_port) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_PORT); } /* }}} */ -/* {{{ proto string pg_tty([resource connection]) - Return the tty name associated with the connection */ +/* {{{ Return the tty name associated with the connection */ PHP_FUNCTION(pg_tty) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_TTY); } /* }}} */ -/* {{{ proto string pg_host([resource connection]) - Returns the host name associated with the connection */ +/* {{{ Returns the host name associated with the connection */ PHP_FUNCTION(pg_host) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_HOST); } /* }}} */ -/* {{{ proto array pg_version([resource connection]) - Returns an array with client, protocol and server version (when available) */ +/* {{{ Returns an array with client, protocol and server version (when available) */ PHP_FUNCTION(pg_version) { php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_VERSION); } /* }}} */ -/* {{{ proto string|false pg_parameter_status([resource connection,] string param_name) - Returns the value of a server parameter */ +/* {{{ Returns the value of a server parameter */ PHP_FUNCTION(pg_parameter_status) { zval *pgsql_link = NULL; @@ -1612,8 +1582,7 @@ PHP_FUNCTION(pg_parameter_status) } /* }}} */ -/* {{{ proto bool pg_ping([resource connection]) - Ping database. If connection is bad, try to reconnect. */ +/* {{{ Ping database. If connection is bad, try to reconnect. */ PHP_FUNCTION(pg_ping) { zval *pgsql_link; @@ -1649,8 +1618,7 @@ PHP_FUNCTION(pg_ping) } /* }}} */ -/* {{{ proto resource pg_query([resource connection,] string query) - Execute a query */ +/* {{{ Execute a query */ PHP_FUNCTION(pg_query) { zval *pgsql_link = NULL; @@ -1745,8 +1713,7 @@ static void _php_pgsql_free_params(char **params, int num_params) } /* }}} */ -/* {{{ proto resource pg_query_params([resource connection,] string query, array params) - Execute a query */ +/* {{{ Execute a query */ PHP_FUNCTION(pg_query_params) { zval *pgsql_link = NULL; @@ -1862,8 +1829,7 @@ PHP_FUNCTION(pg_query_params) } /* }}} */ -/* {{{ proto resource pg_prepare([resource connection,] string stmtname, string query) - Prepare a query for future execution */ +/* {{{ Prepare a query for future execution */ PHP_FUNCTION(pg_prepare) { zval *pgsql_link = NULL; @@ -1944,8 +1910,7 @@ PHP_FUNCTION(pg_prepare) } /* }}} */ -/* {{{ proto resource pg_execute([resource connection,] string stmtname, array params) - Execute a prepared query */ +/* {{{ Execute a prepared query */ PHP_FUNCTION(pg_execute) { zval *pgsql_link = NULL; @@ -2059,8 +2024,7 @@ PHP_FUNCTION(pg_execute) #define PHP_PG_NUM_FIELDS 2 #define PHP_PG_CMD_TUPLES 3 -/* {{{ php_pgsql_get_result_info - */ +/* {{{ php_pgsql_get_result_info */ static void php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result; @@ -2093,32 +2057,28 @@ static void php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAMETERS, int entry_ty } /* }}} */ -/* {{{ proto int pg_num_rows(resource result) - Return the number of rows in the result */ +/* {{{ Return the number of rows in the result */ PHP_FUNCTION(pg_num_rows) { php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_NUM_ROWS); } /* }}} */ -/* {{{ proto int pg_num_fields(resource result) - Return the number of fields in the result */ +/* {{{ Return the number of fields in the result */ PHP_FUNCTION(pg_num_fields) { php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_NUM_FIELDS); } /* }}} */ -/* {{{ proto int pg_affected_rows(resource result) - Returns the number of affected tuples */ +/* {{{ Returns the number of affected tuples */ PHP_FUNCTION(pg_affected_rows) { php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_CMD_TUPLES); } /* }}} */ -/* {{{ proto mixed pg_last_notice(resource connection [, int option]) - Returns the last notice set by the backend */ +/* {{{ Returns the last notice set by the backend */ PHP_FUNCTION(pg_last_notice) { zval *pgsql_link = NULL; @@ -2170,8 +2130,7 @@ PHP_FUNCTION(pg_last_notice) } /* }}} */ -/* {{{ get_field_name - */ +/* {{{ get_field_name */ static char *get_field_name(PGconn *pgsql, Oid oid, HashTable *list) { smart_str str = {0}; @@ -2231,8 +2190,7 @@ static char *get_field_name(PGconn *pgsql, Oid oid, HashTable *list) } /* }}} */ -/* {{{ proto mixed pg_field_table(resource result, int field_number[, bool oid_only]) - Returns the name of the table field belongs to, or table's oid if oid_only is true */ +/* {{{ Returns the name of the table field belongs to, or table's oid if oid_only is true */ PHP_FUNCTION(pg_field_table) { zval *result; @@ -2326,8 +2284,7 @@ PHP_FUNCTION(pg_field_table) #define PHP_PG_FIELD_TYPE 3 #define PHP_PG_FIELD_TYPE_OID 4 -/* {{{ php_pgsql_get_field_info - */ +/* {{{ php_pgsql_get_field_info */ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result; @@ -2386,40 +2343,35 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ } /* }}} */ -/* {{{ proto string pg_field_name(resource result, int field_number) - Returns the name of the field */ +/* {{{ Returns the name of the field */ PHP_FUNCTION(pg_field_name) { php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_NAME); } /* }}} */ -/* {{{ proto int pg_field_size(resource result, int field_number) - Returns the internal size of the field */ +/* {{{ Returns the internal size of the field */ PHP_FUNCTION(pg_field_size) { php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_SIZE); } /* }}} */ -/* {{{ proto string pg_field_type(resource result, int field_number) - Returns the type name for the given field */ +/* {{{ Returns the type name for the given field */ PHP_FUNCTION(pg_field_type) { php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_TYPE); } /* }}} */ -/* {{{ proto string pg_field_type_oid(resource result, int field_number) - Returns the type oid for the given field */ +/* {{{ Returns the type oid for the given field */ PHP_FUNCTION(pg_field_type_oid) { php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_TYPE_OID); } /* }}} */ -/* {{{ proto int pg_field_num(resource result, string field_name) - Returns the field number of the named field */ +/* {{{ Returns the field number of the named field */ PHP_FUNCTION(pg_field_num) { zval *result; @@ -2442,8 +2394,7 @@ PHP_FUNCTION(pg_field_num) } /* }}} */ -/* {{{ proto mixed pg_fetch_result(resource result, [int row_number,] mixed field_name) - Returns values from a result identifier */ +/* {{{ Returns values from a result identifier */ PHP_FUNCTION(pg_fetch_result) { zval *result, *field=NULL; @@ -2667,16 +2618,14 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_ } /* }}} */ -/* {{{ proto array pg_fetch_row(resource result [, int row [, int result_type]]) - Get a row as an enumerated array */ +/* {{{ Get a row as an enumerated array */ PHP_FUNCTION(pg_fetch_row) { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, PGSQL_NUM, 0); } /* }}} */ -/* {{{ proto array pg_fetch_assoc(resource result [, int row]) - Fetch a row as an assoc array */ +/* {{{ Fetch a row as an assoc array */ PHP_FUNCTION(pg_fetch_assoc) { /* pg_fetch_assoc() is added from PHP 4.3.0. It should raise error, when @@ -2687,16 +2636,14 @@ PHP_FUNCTION(pg_fetch_assoc) } /* }}} */ -/* {{{ proto array pg_fetch_array(resource result [, int row [, int result_type]]) - Fetch a row as an array */ +/* {{{ Fetch a row as an array */ PHP_FUNCTION(pg_fetch_array) { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, PGSQL_BOTH, 0); } /* }}} */ -/* {{{ proto object pg_fetch_object(resource result [, int row [, string class_name [, NULL|array ctor_params]]]) - Fetch a row as an object */ +/* {{{ Fetch a row as an object */ PHP_FUNCTION(pg_fetch_object) { /* pg_fetch_object() allowed result_type used to be. 3rd parameter @@ -2705,8 +2652,7 @@ PHP_FUNCTION(pg_fetch_object) } /* }}} */ -/* {{{ proto array pg_fetch_all(resource result [, int result_type]) - Fetch all rows into array */ +/* {{{ Fetch all rows into array */ PHP_FUNCTION(pg_fetch_all) { zval *result; @@ -2736,8 +2682,7 @@ PHP_FUNCTION(pg_fetch_all) } /* }}} */ -/* {{{ proto array pg_fetch_all_columns(resource result [, int column_number]) - Fetch all rows into array */ +/* {{{ Fetch all rows into array */ PHP_FUNCTION(pg_fetch_all_columns) { zval *result; @@ -2779,8 +2724,7 @@ PHP_FUNCTION(pg_fetch_all_columns) } /* }}} */ -/* {{{ proto bool pg_result_seek(resource result, int offset) - Set internal row offset */ +/* {{{ Set internal row offset */ PHP_FUNCTION(pg_result_seek) { zval *result; @@ -2808,8 +2752,7 @@ PHP_FUNCTION(pg_result_seek) #define PHP_PG_DATA_LENGTH 1 #define PHP_PG_DATA_ISNULL 2 -/* {{{ php_pgsql_data_info - */ +/* {{{ php_pgsql_data_info */ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result, *field; @@ -2879,24 +2822,21 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } /* }}} */ -/* {{{ proto int pg_field_prtlen(resource result, [int row,] mixed field_name_or_number) - Returns the printed length */ +/* {{{ Returns the printed length */ PHP_FUNCTION(pg_field_prtlen) { php_pgsql_data_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_PG_DATA_LENGTH); } /* }}} */ -/* {{{ proto int pg_field_is_null(resource result, [int row,] mixed field_name_or_number) - Test if a field is NULL */ +/* {{{ Test if a field is NULL */ PHP_FUNCTION(pg_field_is_null) { php_pgsql_data_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_PG_DATA_ISNULL); } /* }}} */ -/* {{{ proto bool pg_free_result(resource result) - Free result memory */ +/* {{{ Free result memory */ PHP_FUNCTION(pg_free_result) { zval *result; @@ -2915,8 +2855,7 @@ PHP_FUNCTION(pg_free_result) } /* }}} */ -/* {{{ proto string pg_last_oid(resource result) - Returns the last object identifier */ +/* {{{ Returns the last object identifier */ PHP_FUNCTION(pg_last_oid) { zval *result; @@ -2941,8 +2880,7 @@ PHP_FUNCTION(pg_last_oid) } /* }}} */ -/* {{{ proto bool pg_trace(string filename [, string mode [, resource connection]]) - Enable tracing a PostgreSQL connection */ +/* {{{ Enable tracing a PostgreSQL connection */ PHP_FUNCTION(pg_trace) { char *z_filename, *mode = "w"; @@ -2985,8 +2923,7 @@ PHP_FUNCTION(pg_trace) } /* }}} */ -/* {{{ proto bool pg_untrace([resource connection]) - Disable tracing of a PostgreSQL connection */ +/* {{{ Disable tracing of a PostgreSQL connection */ PHP_FUNCTION(pg_untrace) { zval *pgsql_link = NULL; @@ -3014,8 +2951,7 @@ PHP_FUNCTION(pg_untrace) } /* }}} */ -/* {{{ proto mixed pg_lo_create([resource connection],[mixed large_object_oid]) - Create a large object */ +/* {{{ Create a large object */ PHP_FUNCTION(pg_lo_create) { zval *pgsql_link = NULL, *oid = NULL; @@ -3087,8 +3023,7 @@ PHP_FUNCTION(pg_lo_create) } /* }}} */ -/* {{{ proto bool pg_lo_unlink([resource connection,] string large_object_oid) - Delete a large object */ +/* {{{ Delete a large object */ PHP_FUNCTION(pg_lo_unlink) { zval *pgsql_link = NULL; @@ -3158,8 +3093,7 @@ PHP_FUNCTION(pg_lo_unlink) } /* }}} */ -/* {{{ proto resource pg_lo_open([resource connection,] int large_object_oid, string mode) - Open a large object and return fd */ +/* {{{ Open a large object and return fd */ PHP_FUNCTION(pg_lo_open) { zval *pgsql_link = NULL; @@ -3280,8 +3214,7 @@ PHP_FUNCTION(pg_lo_open) } /* }}} */ -/* {{{ proto bool pg_lo_close(resource large_object) - Close a large object */ +/* {{{ Close a large object */ PHP_FUNCTION(pg_lo_close) { zval *pgsql_lofp; @@ -3309,8 +3242,7 @@ PHP_FUNCTION(pg_lo_close) #define PGSQL_LO_READ_BUF_SIZE 8192 -/* {{{ proto string pg_lo_read(resource large_object [, int len]) - Read a large object */ +/* {{{ Read a large object */ PHP_FUNCTION(pg_lo_read) { zval *pgsql_id; @@ -3344,8 +3276,7 @@ PHP_FUNCTION(pg_lo_read) } /* }}} */ -/* {{{ proto int pg_lo_write(resource large_object, string buf [, int len]) - Write a large object */ +/* {{{ Write a large object */ PHP_FUNCTION(pg_lo_write) { zval *pgsql_id; @@ -3387,8 +3318,7 @@ PHP_FUNCTION(pg_lo_write) } /* }}} */ -/* {{{ proto int pg_lo_read_all(resource large_object) - Read a large object and send straight to browser */ +/* {{{ Read a large object and send straight to browser */ PHP_FUNCTION(pg_lo_read_all) { zval *pgsql_id; @@ -3414,8 +3344,7 @@ PHP_FUNCTION(pg_lo_read_all) } /* }}} */ -/* {{{ proto int pg_lo_import([resource connection, ] string filename [, mixed oid]) - Import large object direct from filesystem */ +/* {{{ Import large object direct from filesystem */ PHP_FUNCTION(pg_lo_import) { zval *pgsql_link = NULL, *oid = NULL; @@ -3497,8 +3426,7 @@ PHP_FUNCTION(pg_lo_import) } /* }}} */ -/* {{{ proto bool pg_lo_export([resource connection, ] int objoid, string filename) - Export large object direct to filesystem */ +/* {{{ Export large object direct to filesystem */ PHP_FUNCTION(pg_lo_export) { zval *pgsql_link = NULL; @@ -3592,8 +3520,7 @@ PHP_FUNCTION(pg_lo_export) } /* }}} */ -/* {{{ proto bool pg_lo_seek(resource large_object, int offset [, int whence]) - Seeks position of large object */ +/* {{{ Seeks position of large object */ PHP_FUNCTION(pg_lo_seek) { zval *pgsql_id = NULL; @@ -3630,8 +3557,7 @@ PHP_FUNCTION(pg_lo_seek) } /* }}} */ -/* {{{ proto int pg_lo_tell(resource large_object) - Returns current position of large object */ +/* {{{ Returns current position of large object */ PHP_FUNCTION(pg_lo_tell) { zval *pgsql_id = NULL; @@ -3660,8 +3586,7 @@ PHP_FUNCTION(pg_lo_tell) } /* }}} */ -/* {{{ proto bool pg_lo_truncate(resource large_object, int size) - Truncate large object to size */ +/* {{{ Truncate large object to size */ PHP_FUNCTION(pg_lo_truncate) { zval *pgsql_id = NULL; @@ -3695,8 +3620,7 @@ PHP_FUNCTION(pg_lo_truncate) } /* }}} */ -/* {{{ proto int pg_set_error_verbosity([resource connection,] int verbosity) - Set error verbosity */ +/* {{{ Set error verbosity */ PHP_FUNCTION(pg_set_error_verbosity) { zval *pgsql_link = NULL; @@ -3730,8 +3654,7 @@ PHP_FUNCTION(pg_set_error_verbosity) } /* }}} */ -/* {{{ proto int pg_set_client_encoding([resource connection,] string encoding) - Set client encoding */ +/* {{{ Set client encoding */ PHP_FUNCTION(pg_set_client_encoding) { char *encoding; @@ -3762,8 +3685,7 @@ PHP_FUNCTION(pg_set_client_encoding) } /* }}} */ -/* {{{ proto string pg_client_encoding([resource connection]) - Get the current client encoding */ +/* {{{ Get the current client encoding */ PHP_FUNCTION(pg_client_encoding) { zval *pgsql_link = NULL; @@ -3792,8 +3714,7 @@ PHP_FUNCTION(pg_client_encoding) } /* }}} */ -/* {{{ proto bool pg_end_copy([resource connection]) - Sync with backend. Completes the Copy command */ +/* {{{ Sync with backend. Completes the Copy command */ PHP_FUNCTION(pg_end_copy) { zval *pgsql_link = NULL; @@ -3827,8 +3748,7 @@ PHP_FUNCTION(pg_end_copy) } /* }}} */ -/* {{{ proto bool pg_put_line([resource connection,] string query) - Send null-terminated string to backend server*/ +/* {{{ Send null-terminated string to backend server*/ PHP_FUNCTION(pg_put_line) { char *query; @@ -3864,8 +3784,7 @@ PHP_FUNCTION(pg_put_line) } /* }}} */ -/* {{{ proto array pg_copy_to(resource connection, string table_name [, string delimiter [, string null_as]]) - Copy table to array */ +/* {{{ Copy table to array */ PHP_FUNCTION(pg_copy_to) { zval *pgsql_link; @@ -3955,8 +3874,7 @@ PHP_FUNCTION(pg_copy_to) } /* }}} */ -/* {{{ proto bool pg_copy_from(resource connection, string table_name , array rows [, string delimiter [, string null_as]]) - Copy table from array */ +/* {{{ Copy table from array */ PHP_FUNCTION(pg_copy_from) { zval *pgsql_link = NULL, *pg_rows; @@ -4059,8 +3977,7 @@ PHP_FUNCTION(pg_copy_from) } /* }}} */ -/* {{{ proto string pg_escape_string([resource connection,] string data) - Escape string for text/char type */ +/* {{{ Escape string for text/char type */ PHP_FUNCTION(pg_escape_string) { zend_string *from = NULL, *to = NULL; @@ -4099,8 +4016,7 @@ PHP_FUNCTION(pg_escape_string) } /* }}} */ -/* {{{ proto string pg_escape_bytea([resource connection,] string data) - Escape binary for bytea type */ +/* {{{ Escape binary for bytea type */ PHP_FUNCTION(pg_escape_bytea) { char *from = NULL, *to = NULL; @@ -4138,8 +4054,7 @@ PHP_FUNCTION(pg_escape_bytea) } /* }}} */ -/* {{{ proto string pg_unescape_bytea(string data) - Unescape binary for bytea type */ +/* {{{ Unescape binary for bytea type */ PHP_FUNCTION(pg_unescape_bytea) { char *from = NULL, *to = NULL, *tmp = NULL; @@ -4211,24 +4126,21 @@ static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_l } /* }}} */ -/* {{{ proto string pg_escape_literal([resource connection,] string data) - Escape parameter as string literal (i.e. parameter) */ +/* {{{ Escape parameter as string literal (i.e. parameter) */ PHP_FUNCTION(pg_escape_literal) { php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string pg_escape_identifier([resource connection,] string data) - Escape identifier (i.e. table name, field name) */ +/* {{{ Escape identifier (i.e. table name, field name) */ PHP_FUNCTION(pg_escape_identifier) { php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string pg_result_error(resource result) - Get error message associated with result */ +/* {{{ Get error message associated with result */ PHP_FUNCTION(pg_result_error) { zval *result; @@ -4254,8 +4166,7 @@ PHP_FUNCTION(pg_result_error) } /* }}} */ -/* {{{ proto string pg_result_error_field(resource result, int fieldcode) - Get error message field associated with result */ +/* {{{ Get error message field associated with result */ PHP_FUNCTION(pg_result_error_field) { zval *result; @@ -4299,8 +4210,7 @@ PHP_FUNCTION(pg_result_error_field) } /* }}} */ -/* {{{ proto int pg_connection_status(resource connection) - Get connection status */ +/* {{{ Get connection status */ PHP_FUNCTION(pg_connection_status) { zval *pgsql_link = NULL; @@ -4320,8 +4230,7 @@ PHP_FUNCTION(pg_connection_status) /* }}} */ -/* {{{ proto int pg_transaction_status(resource connection) - Get transaction status */ +/* {{{ Get transaction status */ PHP_FUNCTION(pg_transaction_status) { zval *pgsql_link = NULL; @@ -4341,8 +4250,7 @@ PHP_FUNCTION(pg_transaction_status) /* }}} */ -/* {{{ proto bool pg_connection_reset(resource connection) - Reset connection (reconnect) */ +/* {{{ Reset connection (reconnect) */ PHP_FUNCTION(pg_connection_reset) { zval *pgsql_link; @@ -4368,8 +4276,7 @@ PHP_FUNCTION(pg_connection_reset) #define PHP_PG_ASYNC_IS_BUSY 1 #define PHP_PG_ASYNC_REQUEST_CANCEL 2 -/* {{{ php_pgsql_flush_query - */ +/* {{{ php_pgsql_flush_query */ static int php_pgsql_flush_query(PGconn *pgsql) { PGresult *res; @@ -4388,8 +4295,7 @@ static int php_pgsql_flush_query(PGconn *pgsql) } /* }}} */ -/* {{{ php_pgsql_do_async - */ +/* {{{ php_pgsql_do_async */ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *pgsql_link; @@ -4431,16 +4337,14 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } /* }}} */ -/* {{{ proto bool pg_cancel_query(resource connection) - Cancel request */ +/* {{{ Cancel request */ PHP_FUNCTION(pg_cancel_query) { php_pgsql_do_async(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_PG_ASYNC_REQUEST_CANCEL); } /* }}} */ -/* {{{ proto bool pg_connection_busy(resource connection) - Get connection is busy or not */ +/* {{{ Get connection is busy or not */ PHP_FUNCTION(pg_connection_busy) { php_pgsql_do_async(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_PG_ASYNC_IS_BUSY); @@ -4458,8 +4362,7 @@ static int _php_pgsql_link_has_results(PGconn *pgsql) /* {{{ */ } /* }}} */ -/* {{{ proto bool pg_send_query(resource connection, string query) - Send asynchronous query */ +/* {{{ Send asynchronous query */ PHP_FUNCTION(pg_send_query) { zval *pgsql_link; @@ -4528,8 +4431,7 @@ PHP_FUNCTION(pg_send_query) } /* }}} */ -/* {{{ proto bool pg_send_query_params(resource connection, string query, array params) - Send asynchronous parameterized query */ +/* {{{ Send asynchronous parameterized query */ PHP_FUNCTION(pg_send_query_params) { zval *pgsql_link, *pv_param_arr, *tmp; @@ -4624,8 +4526,7 @@ PHP_FUNCTION(pg_send_query_params) } /* }}} */ -/* {{{ proto bool pg_send_prepare(resource connection, string stmtname, string query) - Asynchronously prepare a query for future execution */ +/* {{{ Asynchronously prepare a query for future execution */ PHP_FUNCTION(pg_send_prepare) { zval *pgsql_link; @@ -4694,8 +4595,7 @@ PHP_FUNCTION(pg_send_prepare) } /* }}} */ -/* {{{ proto bool pg_send_execute(resource connection, string stmtname, array params) - Executes prevriously prepared stmtname asynchronously */ +/* {{{ Executes prevriously prepared stmtname asynchronously */ PHP_FUNCTION(pg_send_execute) { zval *pgsql_link; @@ -4792,8 +4692,7 @@ PHP_FUNCTION(pg_send_execute) } /* }}} */ -/* {{{ proto resource pg_get_result(resource connection) - Get asynchronous query result */ +/* {{{ Get asynchronous query result */ PHP_FUNCTION(pg_get_result) { zval *pgsql_link; @@ -4822,8 +4721,7 @@ PHP_FUNCTION(pg_get_result) } /* }}} */ -/* {{{ proto mixed pg_result_status(resource result[, int result_type]) - Get status of query result */ +/* {{{ Get status of query result */ PHP_FUNCTION(pg_result_status) { zval *result; @@ -4856,8 +4754,7 @@ PHP_FUNCTION(pg_result_status) } /* }}} */ -/* {{{ proto mixed pg_get_notify([resource connection[, int result_type]]) - Get asynchronous notification */ +/* {{{ Get asynchronous notification */ PHP_FUNCTION(pg_get_notify) { zval *pgsql_link; @@ -4904,8 +4801,7 @@ PHP_FUNCTION(pg_get_notify) } /* }}} */ -/* {{{ proto int pg_get_pid([resource connection) - Get backend(server) pid */ +/* {{{ Get backend(server) pid */ PHP_FUNCTION(pg_get_pid) { zval *pgsql_link; @@ -4983,8 +4879,7 @@ static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret) /* {{{ } /* }}} */ -/* {{{ proto resource pg_socket(resource connection) - Get a read-only handle to the socket underlying the pgsql connection */ +/* {{{ Get a read-only handle to the socket underlying the pgsql connection */ PHP_FUNCTION(pg_socket) { zval *pgsql_link; @@ -5010,8 +4905,7 @@ PHP_FUNCTION(pg_socket) } /* }}} */ -/* {{{ proto bool pg_consume_input(resource connection) - Reads input on the connection */ +/* {{{ Reads input on the connection */ PHP_FUNCTION(pg_consume_input) { zval *pgsql_link; @@ -5029,8 +4923,7 @@ PHP_FUNCTION(pg_consume_input) } /* }}} */ -/* {{{ proto mixed pg_flush(resource connection) - Flush outbound query data on the connection */ +/* {{{ Flush outbound query data on the connection */ PHP_FUNCTION(pg_flush) { zval *pgsql_link; @@ -5181,8 +5074,7 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z /* }}} */ -/* {{{ proto array pg_meta_data(resource db, string table [, bool extended]) - Get meta_data */ +/* {{{ Get meta_data */ PHP_FUNCTION(pg_meta_data) { zval *pgsql_link; @@ -5208,8 +5100,7 @@ PHP_FUNCTION(pg_meta_data) } /* }}} */ -/* {{{ php_pgsql_get_data_type - */ +/* {{{ php_pgsql_get_data_type */ static php_pgsql_data_type php_pgsql_get_data_type(const char *type_name, size_t len) { /* This is stupid way to do. I'll fix it when I decied how to support @@ -6046,8 +5937,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con } /* }}} */ -/* {{{ proto array pg_convert(resource db, string table, array values[, int options]) - Check and convert values for PostgreSQL SQL statement */ +/* {{{ Check and convert values for PostgreSQL SQL statement */ PHP_FUNCTION(pg_convert) { zval *pgsql_link, *values; @@ -6139,8 +6029,7 @@ static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const c } /* }}} */ -/* {{{ php_pgsql_insert - */ +/* {{{ php_pgsql_insert */ PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var_array, zend_ulong opt, zend_string **sql) { zval *val, converted; @@ -6255,8 +6144,7 @@ cleanup: } /* }}} */ -/* {{{ proto mixed pg_insert(resource db, string table, array values[, int options]) - Insert values (filed=>value) to table */ +/* {{{ Insert values (filed=>value) to table */ PHP_FUNCTION(pg_insert) { zval *pgsql_link, *values; @@ -6401,8 +6289,7 @@ static inline int build_assignment_string(PGconn *pg_link, smart_str *querystr, } /* }}} */ -/* {{{ php_pgsql_update - */ +/* {{{ php_pgsql_update */ PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *var_array, zval *ids_array, zend_ulong opt, zend_string **sql) { zval var_converted, ids_converted; @@ -6469,8 +6356,7 @@ cleanup: } /* }}} */ -/* {{{ proto mixed pg_update(resource db, string table, array fields, array ids[, int options]) - Update table using values (field=>value) and ids (id=>value) */ +/* {{{ Update table using values (field=>value) and ids (id=>value) */ PHP_FUNCTION(pg_update) { zval *pgsql_link, *values, *ids; @@ -6507,8 +6393,7 @@ PHP_FUNCTION(pg_update) } /* }}} */ -/* {{{ php_pgsql_delete - */ +/* {{{ php_pgsql_delete */ PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids_array, zend_ulong opt, zend_string **sql) { zval ids_converted; @@ -6561,8 +6446,7 @@ cleanup: } /* }}} */ -/* {{{ proto mixed pg_delete(resource db, string table, array ids[, int options]) - Delete records has ids (id=>value) */ +/* {{{ Delete records has ids (id=>value) */ PHP_FUNCTION(pg_delete) { zval *pgsql_link, *ids; @@ -6599,8 +6483,7 @@ PHP_FUNCTION(pg_delete) } /* }}} */ -/* {{{ php_pgsql_result2array - */ +/* {{{ php_pgsql_result2array */ PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array, long result_type) { zval row; @@ -6643,8 +6526,7 @@ PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array, l } /* }}} */ -/* {{{ php_pgsql_select - */ +/* {{{ php_pgsql_select */ PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids_array, zval *ret_array, zend_ulong opt, long result_type, zend_string **sql) { zval ids_converted; @@ -6701,8 +6583,7 @@ cleanup: } /* }}} */ -/* {{{ proto mixed pg_select(resource db, string table, array ids[, int options [, int result_type]) - Select records that has ids (id=>value) */ +/* {{{ Select records that has ids (id=>value) */ PHP_FUNCTION(pg_select) { zval *pgsql_link, *ids; diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index f0389bf205..b3eea43ec8 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -432,8 +432,7 @@ skip_phar: #define IS_ABLE_CHECK(__t) ((__t) == FS_IS_R || (__t) == FS_IS_W || (__t) == FS_IS_X) #define IS_ACCESS_CHECK(__t) (IS_ABLE_CHECK(type) || (__t) == FS_EXISTS) -/* {{{ php_stat - */ +/* {{{ php_stat */ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value) { zval stat_dev, stat_ino, stat_mode, stat_nlink, stat_uid, stat_gid, stat_rdev, @@ -773,73 +772,59 @@ ZEND_NAMED_FUNCTION(fname) { \ } /* }}} */ -/* {{{ proto int fileperms(string filename) - Get file permissions */ +/* {{{ Get file permissions */ PharFileFunction(phar_fileperms, FS_PERMS, orig_fileperms) /* }}} */ -/* {{{ proto int fileinode(string filename) - Get file inode */ +/* {{{ Get file inode */ PharFileFunction(phar_fileinode, FS_INODE, orig_fileinode) /* }}} */ -/* {{{ proto int filesize(string filename) - Get file size */ +/* {{{ Get file size */ PharFileFunction(phar_filesize, FS_SIZE, orig_filesize) /* }}} */ -/* {{{ proto int fileowner(string filename) - Get file owner */ +/* {{{ Get file owner */ PharFileFunction(phar_fileowner, FS_OWNER, orig_fileowner) /* }}} */ -/* {{{ proto int filegroup(string filename) - Get file group */ +/* {{{ Get file group */ PharFileFunction(phar_filegroup, FS_GROUP, orig_filegroup) /* }}} */ -/* {{{ proto int fileatime(string filename) - Get last access time of file */ +/* {{{ Get last access time of file */ PharFileFunction(phar_fileatime, FS_ATIME, orig_fileatime) /* }}} */ -/* {{{ proto int filemtime(string filename) - Get last modification time of file */ +/* {{{ Get last modification time of file */ PharFileFunction(phar_filemtime, FS_MTIME, orig_filemtime) /* }}} */ -/* {{{ proto int filectime(string filename) - Get inode modification time of file */ +/* {{{ Get inode modification time of file */ PharFileFunction(phar_filectime, FS_CTIME, orig_filectime) /* }}} */ -/* {{{ proto string filetype(string filename) - Get file type */ +/* {{{ Get file type */ PharFileFunction(phar_filetype, FS_TYPE, orig_filetype) /* }}} */ -/* {{{ proto bool is_writable(string filename) - Returns true if file can be written */ +/* {{{ Returns true if file can be written */ PharFileFunction(phar_is_writable, FS_IS_W, orig_is_writable) /* }}} */ -/* {{{ proto bool is_readable(string filename) - Returns true if file can be read */ +/* {{{ Returns true if file can be read */ PharFileFunction(phar_is_readable, FS_IS_R, orig_is_readable) /* }}} */ -/* {{{ proto bool is_executable(string filename) - Returns true if file is executable */ +/* {{{ Returns true if file is executable */ PharFileFunction(phar_is_executable, FS_IS_X, orig_is_executable) /* }}} */ -/* {{{ proto bool file_exists(string filename) - Returns true if filename exists */ +/* {{{ Returns true if filename exists */ PharFileFunction(phar_file_exists, FS_EXISTS, orig_file_exists) /* }}} */ -/* {{{ proto bool is_dir(string filename) - Returns true if file is directory */ +/* {{{ Returns true if file is directory */ PharFileFunction(phar_is_dir, FS_IS_DIR, orig_is_dir) /* }}} */ @@ -975,13 +960,11 @@ skip_phar: } /* }}} */ -/* {{{ proto array lstat(string filename) - Give information about a file or symbolic link */ +/* {{{ Give information about a file or symbolic link */ PharFileFunction(phar_lstat, FS_LSTAT, orig_lstat) /* }}} */ -/* {{{ proto array stat(string filename) - Give information about a file */ +/* {{{ Give information about a file */ PharFileFunction(phar_stat, FS_STAT, orig_stat) /* }}} */ diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 9b21eb7e2a..71ec884281 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3558,8 +3558,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */ } /* }}} */ -/* {{{ phar_module_entry - */ +/* {{{ phar_module_entry */ static const zend_module_dep phar_deps[] = { ZEND_MOD_OPTIONAL("apc") ZEND_MOD_OPTIONAL("bz2") diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 3c8ba60cf6..4766c2be1d 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -388,8 +388,7 @@ static void phar_postprocess_ru_web(char *fname, size_t fname_len, char **entry, } /* }}} */ -/* {{{ proto void Phar::running([bool retphar = true]) - * return the name of the currently running phar archive. If the optional parameter +/* {{{ return the name of the currently running phar archive. If the optional parameter * is set to true, return the phar:// URL to the currently running phar */ PHP_METHOD(Phar, running) @@ -423,8 +422,7 @@ PHP_METHOD(Phar, running) } /* }}} */ -/* {{{ proto void Phar::mount(string pharpath, string externalfile) - * mount an external file or path to a location within the phar. This maps +/* {{{ mount an external file or path to a location within the phar. This maps * an external file or directory to a location within the phar archive, allowing * reference to an external location as if it were within the phar archive. This * is useful for writable temp files like databases @@ -531,8 +529,7 @@ finish: ; } /* }}} */ -/* {{{ proto void Phar::webPhar([string alias, [string index, [string f404, [array mimetypes, [callback rewrites]]]]]) - * mapPhar for web-based phars. Reads the currently executed file (a phar) +/* {{{ mapPhar for web-based phars. Reads the currently executed file (a phar) * and registers its manifest. When executed in the CLI or CGI command-line sapi, * this works exactly like mapPhar(). When executed by a web-based sapi, this * reads $_SERVER['REQUEST_URI'] (the actual original value) and parses out the @@ -858,8 +855,7 @@ cleanup_fail: } /* }}} */ -/* {{{ proto void Phar::mungServer(array munglist) - * Defines a list of up to 4 $_SERVER variables that should be modified for execution +/* {{{ Defines a list of up to 4 $_SERVER variables that should be modified for execution * to mask the presence of the phar archive. This should be used in conjunction with * Phar::webPhar(), and has no effect otherwise * SCRIPT_NAME, PHP_SELF, REQUEST_URI and SCRIPT_FILENAME @@ -911,8 +907,7 @@ PHP_METHOD(Phar, mungServer) } /* }}} */ -/* {{{ proto void Phar::interceptFileFuncs() - * instructs phar to intercept fopen, file_get_contents, opendir, and all of the stat-related functions +/* {{{ instructs phar to intercept fopen, file_get_contents, opendir, and all of the stat-related functions * and return stat on files within the phar for relative paths * * Once called, this cannot be reversed, and continue until the end of the request. @@ -928,8 +923,7 @@ PHP_METHOD(Phar, interceptFileFuncs) } /* }}} */ -/* {{{ proto array Phar::createDefaultStub([string indexfile[, string webindexfile]]) - * Return a stub that can be used to run a phar-based archive without the phar extension +/* {{{ Return a stub that can be used to run a phar-based archive without the phar extension * indexfile is the CLI startup filename, which defaults to "index.php", webindexfile * is the web startup filename, and also defaults to "index.php" */ @@ -954,8 +948,7 @@ PHP_METHOD(Phar, createDefaultStub) } /* }}} */ -/* {{{ proto mixed Phar::mapPhar([string alias, [int dataoffset]]) - * Reads the currently executed file (a phar) and registers its manifest */ +/* {{{ Reads the currently executed file (a phar) and registers its manifest */ PHP_METHOD(Phar, mapPhar) { char *alias = NULL, *error; @@ -976,8 +969,7 @@ PHP_METHOD(Phar, mapPhar) } } /* }}} */ -/* {{{ proto mixed Phar::loadPhar(string filename [, string alias]) - * Loads any phar archive with an alias */ +/* {{{ Loads any phar archive with an alias */ PHP_METHOD(Phar, loadPhar) { char *fname, *alias = NULL, *error; @@ -997,8 +989,7 @@ PHP_METHOD(Phar, loadPhar) } } /* }}} */ -/* {{{ proto string Phar::apiVersion() - * Returns the api version */ +/* {{{ Returns the api version */ PHP_METHOD(Phar, apiVersion) { if (zend_parse_parameters_none() == FAILURE) { @@ -1008,8 +999,7 @@ PHP_METHOD(Phar, apiVersion) } /* }}}*/ -/* {{{ proto bool Phar::canCompress([int method]) - * Returns whether phar extension supports compression using zlib/bzip2 */ +/* {{{ Returns whether phar extension supports compression using zlib/bzip2 */ PHP_METHOD(Phar, canCompress) { zend_long method = 0; @@ -1042,8 +1032,7 @@ PHP_METHOD(Phar, canCompress) } /* }}} */ -/* {{{ proto bool Phar::canWrite() - * Returns whether phar extension supports writing and creating phars */ +/* {{{ Returns whether phar extension supports writing and creating phars */ PHP_METHOD(Phar, canWrite) { if (zend_parse_parameters_none() == FAILURE) { @@ -1053,8 +1042,7 @@ PHP_METHOD(Phar, canWrite) } /* }}} */ -/* {{{ proto bool Phar::isValidPharFilename(string filename[, bool executable = true]) - * Returns whether the given filename is a valid phar filename */ +/* {{{ Returns whether the given filename is a valid phar filename */ PHP_METHOD(Phar, isValidPharFilename) { char *fname; @@ -1106,8 +1094,7 @@ static const spl_other_handler phar_spl_foreign_handler = { phar_spl_foreign_clone }; -/* {{{ proto Phar::__construct(string fname [, int flags [, string alias]]) - * Construct a Phar archive object +/* {{{ Construct a Phar archive object * * proto PharData::__construct(string fname [[, int flags [, string alias]], int file format = Phar::TAR]) * Construct a PharData archive object @@ -1245,9 +1232,7 @@ PHP_METHOD(Phar, __construct) } /* }}} */ -/* {{{ proto array Phar::getSupportedSignatures() - * Return array of supported signature types - */ +/* {{{ Return array of supported signature types */ PHP_METHOD(Phar, getSupportedSignatures) { if (zend_parse_parameters_none() == FAILURE) { @@ -1270,9 +1255,7 @@ PHP_METHOD(Phar, getSupportedSignatures) } /* }}} */ -/* {{{ proto array Phar::getSupportedCompression() - * Return array of supported comparession algorithms - */ +/* {{{ Return array of supported comparession algorithms */ PHP_METHOD(Phar, getSupportedCompression) { if (zend_parse_parameters_none() == FAILURE) { @@ -1292,9 +1275,7 @@ PHP_METHOD(Phar, getSupportedCompression) } /* }}} */ -/* {{{ proto array Phar::unlinkArchive(string archive) - * Completely remove a phar archive from memory and disk - */ +/* {{{ Completely remove a phar archive from memory and disk */ PHP_METHOD(Phar, unlinkArchive) { char *fname, *error, *zname, *arch, *entry; @@ -1367,9 +1348,7 @@ PHP_METHOD(Phar, unlinkArchive) RETURN_THROWS(); \ } -/* {{{ proto Phar::__destruct() - * if persistent, remove from the cache - */ +/* {{{ if persistent, remove from the cache */ PHP_METHOD(Phar, __destruct) { zval *zobj = ZEND_THIS; @@ -1711,8 +1690,7 @@ after_open_fp: } /* }}} */ -/* {{{ proto array Phar::buildFromDirectory(string base_dir[, string regex]) - * Construct a phar archive from an existing directory, recursively. +/* {{{ Construct a phar archive from an existing directory, recursively. * Optional second parameter is a regular expression for filtering directory contents. * * Return value is an array mapping phar index to actual files added. @@ -1843,8 +1821,7 @@ PHP_METHOD(Phar, buildFromDirectory) } /* }}} */ -/* {{{ proto array Phar::buildFromIterator(Iterator iter[, string base_directory]) - * Construct a phar archive from an iterator. The iterator must return a series of strings +/* {{{ Construct a phar archive from an iterator. The iterator must return a series of strings * that are full paths to files that should be added to the phar. The iterator key should * be the path that the file will have within the phar archive. * @@ -1909,9 +1886,7 @@ PHP_METHOD(Phar, buildFromIterator) } /* }}} */ -/* {{{ proto int Phar::count() - * Returns the number of entries in the Phar archive - */ +/* {{{ Returns the number of entries in the Phar archive */ PHP_METHOD(Phar, count) { /* mode can be ignored, maximum depth is 1 */ @@ -1926,8 +1901,7 @@ PHP_METHOD(Phar, count) } /* }}} */ -/* {{{ proto bool Phar::isFileFormat(int format) - * Returns true if the phar archive is based on the tar/zip/phar file format depending +/* {{{ Returns true if the phar archive is based on the tar/zip/phar file format depending * on whether Phar::TAR, Phar::ZIP or Phar::PHAR was passed in */ PHP_METHOD(Phar, isFileFormat) @@ -2362,8 +2336,7 @@ no_copy: } /* }}} */ -/* {{{ proto object Phar::convertToExecutable([int format[, int compression [, string file_ext]]]) - * Convert a phar.tar or phar.zip archive to the phar file format. The +/* {{{ Convert a phar.tar or phar.zip archive to the phar file format. The * optional parameter allows the user to determine the new * filename extension (default is phar). */ @@ -2466,8 +2439,7 @@ PHP_METHOD(Phar, convertToExecutable) } /* }}} */ -/* {{{ proto object Phar::convertToData([int format[, int compression [, string file_ext]]]) - * Convert an archive to a non-executable .tar or .zip. +/* {{{ Convert an archive to a non-executable .tar or .zip. * The optional parameter allows the user to determine the new * filename extension (default is .zip or .tar). */ @@ -2569,8 +2541,7 @@ PHP_METHOD(Phar, convertToData) } /* }}} */ -/* {{{ proto int|false Phar::isCompressed() - * Returns Phar::GZ or PHAR::BZ2 if the entire archive is compressed +/* {{{ Returns Phar::GZ or PHAR::BZ2 if the entire archive is compressed * (.tar.gz/tar.bz2 and so on), or FALSE otherwise. */ PHP_METHOD(Phar, isCompressed) @@ -2593,9 +2564,7 @@ PHP_METHOD(Phar, isCompressed) } /* }}} */ -/* {{{ proto bool Phar::isWritable() - * Returns true if phar.readonly=0 or phar is a PharData AND the actual file is writable. - */ +/* {{{ Returns true if phar.readonly=0 or phar is a PharData AND the actual file is writable. */ PHP_METHOD(Phar, isWritable) { php_stream_statbuf ssb; @@ -2621,9 +2590,7 @@ PHP_METHOD(Phar, isWritable) } /* }}} */ -/* {{{ proto bool Phar::delete(string entry) - * Deletes a named file within the archive. - */ +/* {{{ Deletes a named file within the archive. */ PHP_METHOD(Phar, delete) { char *fname; @@ -2673,9 +2640,7 @@ PHP_METHOD(Phar, delete) } /* }}} */ -/* {{{ proto int Phar::getAlias() - * Returns the alias for the Phar or NULL. - */ +/* {{{ Returns the alias for the Phar or NULL. */ PHP_METHOD(Phar, getAlias) { PHAR_ARCHIVE_OBJECT(); @@ -2690,9 +2655,7 @@ PHP_METHOD(Phar, getAlias) } /* }}} */ -/* {{{ proto int Phar::getPath() - * Returns the real path to the phar archive on disk - */ +/* {{{ Returns the real path to the phar archive on disk */ PHP_METHOD(Phar, getPath) { PHAR_ARCHIVE_OBJECT(); @@ -2705,8 +2668,7 @@ PHP_METHOD(Phar, getPath) } /* }}} */ -/* {{{ proto bool Phar::setAlias(string alias) - * Sets the alias for a Phar archive. The default value is the full path +/* {{{ Sets the alias for a Phar archive. The default value is the full path * to the archive. */ PHP_METHOD(Phar, setAlias) @@ -2807,9 +2769,7 @@ valid_alias: } /* }}} */ -/* {{{ proto string Phar::getVersion() - * Return version info of Phar archive - */ +/* {{{ Return version info of Phar archive */ PHP_METHOD(Phar, getVersion) { PHAR_ARCHIVE_OBJECT(); @@ -2822,9 +2782,7 @@ PHP_METHOD(Phar, getVersion) } /* }}} */ -/* {{{ proto void Phar::startBuffering() - * Do not flush a writeable phar (save its contents) until explicitly requested - */ +/* {{{ Do not flush a writeable phar (save its contents) until explicitly requested */ PHP_METHOD(Phar, startBuffering) { PHAR_ARCHIVE_OBJECT(); @@ -2837,9 +2795,7 @@ PHP_METHOD(Phar, startBuffering) } /* }}} */ -/* {{{ proto bool Phar::isBuffering() - * Returns whether write operations are flushing to disk immediately. - */ +/* {{{ Returns whether write operations are flushing to disk immediately. */ PHP_METHOD(Phar, isBuffering) { PHAR_ARCHIVE_OBJECT(); @@ -2852,9 +2808,7 @@ PHP_METHOD(Phar, isBuffering) } /* }}} */ -/* {{{ proto bool Phar::stopBuffering() - * Saves the contents of a modified archive to disk. - */ +/* {{{ Saves the contents of a modified archive to disk. */ PHP_METHOD(Phar, stopBuffering) { char *error; @@ -2881,8 +2835,7 @@ PHP_METHOD(Phar, stopBuffering) } /* }}} */ -/* {{{ proto bool Phar::setStub(string|stream stub [, int len]) - * Change the stub in a phar, phar.tar or phar.zip archive to something other +/* {{{ Change the stub in a phar, phar.tar or phar.zip archive to something other * than the default. The stub *must* end with a call to __HALT_COMPILER(). */ PHP_METHOD(Phar, setStub) @@ -2952,8 +2905,7 @@ PHP_METHOD(Phar, setStub) } /* }}} */ -/* {{{ proto bool Phar::setDefaultStub([string index[, string webindex]]) - * In a pure phar archive, sets a stub that can be used to run the archive +/* {{{ In a pure phar archive, sets a stub that can be used to run the archive * regardless of whether the phar extension is available. The first parameter * is the CLI startup filename, which defaults to "index.php". The second * parameter is the web startup filename and also defaults to "index.php" @@ -3034,8 +2986,7 @@ PHP_METHOD(Phar, setDefaultStub) } /* }}} */ -/* {{{ proto array Phar::setSignatureAlgorithm(int sigtype[, string privatekey]) - * Sets the signature algorithm for a phar and applies it. The signature +/* {{{ Sets the signature algorithm for a phar and applies it. The signature * algorithm must be one of Phar::MD5, Phar::SHA1, Phar::SHA256, * Phar::SHA512, or Phar::OPENSSL. Note that zip- based phar archives * cannot support signatures. @@ -3086,9 +3037,7 @@ PHP_METHOD(Phar, setSignatureAlgorithm) } /* }}} */ -/* {{{ proto array|false Phar::getSignature() - * Returns a hash signature, or FALSE if the archive is unsigned. - */ +/* {{{ Returns a hash signature, or FALSE if the archive is unsigned. */ PHP_METHOD(Phar, getSignature) { PHAR_ARCHIVE_OBJECT(); @@ -3129,9 +3078,7 @@ PHP_METHOD(Phar, getSignature) } /* }}} */ -/* {{{ proto bool Phar::getModified() - * Return whether phar was modified - */ +/* {{{ Return whether phar was modified */ PHP_METHOD(Phar, getModified) { PHAR_ARCHIVE_OBJECT(); @@ -3201,8 +3148,7 @@ static int pharobj_cancompress(HashTable *manifest) /* {{{ */ } /* }}} */ -/* {{{ proto object Phar::compress(int method[, string extension]) - * Compress a .tar, or .phar.tar with whole-file compression +/* {{{ Compress a .tar, or .phar.tar with whole-file compression * The parameter can be one of Phar::GZ or Phar::BZ2 to specify * the kind of compression desired */ @@ -3272,9 +3218,7 @@ PHP_METHOD(Phar, compress) } /* }}} */ -/* {{{ proto object Phar::decompress([string extension]) - * Decompress a .tar, or .phar.tar with whole-file compression - */ +/* {{{ Decompress a .tar, or .phar.tar with whole-file compression */ PHP_METHOD(Phar, decompress) { char *ext = NULL; @@ -3312,8 +3256,7 @@ PHP_METHOD(Phar, decompress) } /* }}} */ -/* {{{ proto object Phar::compressFiles(int method) - * Compress all files within a phar or zip archive using the specified compression +/* {{{ Compress all files within a phar or zip archive using the specified compression * The parameter can be one of Phar::GZ or Phar::BZ2 to specify * the kind of compression desired */ @@ -3390,9 +3333,7 @@ PHP_METHOD(Phar, compressFiles) } /* }}} */ -/* {{{ proto bool Phar::decompressFiles() - * decompress every file - */ +/* {{{ decompress every file */ PHP_METHOD(Phar, decompressFiles) { char *error; @@ -3436,9 +3377,7 @@ PHP_METHOD(Phar, decompressFiles) } /* }}} */ -/* {{{ proto bool Phar::copy(string oldfile, string newfile) - * copy a file internal to the phar archive to another new file within the phar - */ +/* {{{ copy a file internal to the phar archive to another new file within the phar */ PHP_METHOD(Phar, copy) { char *oldfile, *newfile, *error; @@ -3537,9 +3476,7 @@ PHP_METHOD(Phar, copy) } /* }}} */ -/* {{{ proto bool Phar::offsetExists(string entry) - * determines whether a file exists in the phar - */ +/* {{{ determines whether a file exists in the phar */ PHP_METHOD(Phar, offsetExists) { char *fname; @@ -3574,9 +3511,7 @@ PHP_METHOD(Phar, offsetExists) } /* }}} */ -/* {{{ proto PharFileInfo Phar::offsetGet(string entry) - * get a PharFileInfo object for a specific file - */ +/* {{{ get a PharFileInfo object for a specific file */ PHP_METHOD(Phar, offsetGet) { char *fname, *error; @@ -3622,8 +3557,7 @@ PHP_METHOD(Phar, offsetGet) } /* }}} */ -/* {{{ add a file within the phar archive from a string or resource - */ +/* {{{ add a file within the phar archive from a string or resource */ static void phar_add_file(phar_archive_data **pphar, char *filename, size_t filename_len, char *cont_str, size_t cont_len, zval *zresource) { size_t start_pos=0; @@ -3718,8 +3652,7 @@ finish: ; } /* }}} */ -/* {{{ create a directory within the phar archive - */ +/* {{{ create a directory within the phar archive */ static void phar_mkdir(phar_archive_data **pphar, char *dirname, size_t dirname_len) { char *error; @@ -3754,9 +3687,7 @@ static void phar_mkdir(phar_archive_data **pphar, char *dirname, size_t dirname_ } /* }}} */ -/* {{{ proto void Phar::offsetSet(string entry, string value) - * set the contents of an internal file to those of an external file - */ +/* {{{ set the contents of an internal file to those of an external file */ PHP_METHOD(Phar, offsetSet) { char *fname, *cont_str = NULL; @@ -3792,9 +3723,7 @@ PHP_METHOD(Phar, offsetSet) } /* }}} */ -/* {{{ proto bool Phar::offsetUnset(string entry) - * remove a file from a phar - */ +/* {{{ remove a file from a phar */ PHP_METHOD(Phar, offsetUnset) { char *fname, *error; @@ -3844,9 +3773,7 @@ PHP_METHOD(Phar, offsetUnset) } /* }}} */ -/* {{{ proto string Phar::addEmptyDir(string dirname) - * Adds an empty directory to the phar archive - */ +/* {{{ Adds an empty directory to the phar archive */ PHP_METHOD(Phar, addEmptyDir) { char *dirname; @@ -3867,9 +3794,7 @@ PHP_METHOD(Phar, addEmptyDir) } /* }}} */ -/* {{{ proto string Phar::addFile(string filename[, string localname]) - * Adds a file to the archive using the filename, or the second parameter as the name within the archive - */ +/* {{{ Adds a file to the archive using the filename, or the second parameter as the name within the archive */ PHP_METHOD(Phar, addFile) { char *fname, *localname = NULL; @@ -3904,9 +3829,7 @@ PHP_METHOD(Phar, addFile) } /* }}} */ -/* {{{ proto string Phar::addFromString(string localname, string contents) - * Adds a file to the archive using its contents as a string - */ +/* {{{ Adds a file to the archive using its contents as a string */ PHP_METHOD(Phar, addFromString) { char *localname, *cont_str; @@ -3922,9 +3845,7 @@ PHP_METHOD(Phar, addFromString) } /* }}} */ -/* {{{ proto string Phar::getStub() - * Returns the stub at the head of a phar archive as a string. - */ +/* {{{ Returns the stub at the head of a phar archive as a string. */ PHP_METHOD(Phar, getStub) { size_t len; @@ -4021,9 +3942,7 @@ carry_on: } /* }}}*/ -/* {{{ proto int Phar::hasMetaData() - * Returns TRUE if the phar has global metadata, FALSE otherwise. - */ +/* {{{ Returns TRUE if the phar has global metadata, FALSE otherwise. */ PHP_METHOD(Phar, hasMetadata) { PHAR_ARCHIVE_OBJECT(); @@ -4036,9 +3955,7 @@ PHP_METHOD(Phar, hasMetadata) } /* }}} */ -/* {{{ proto int Phar::getMetaData() - * Returns the global metadata of the phar - */ +/* {{{ Returns the global metadata of the phar */ PHP_METHOD(Phar, getMetadata) { PHAR_ARCHIVE_OBJECT(); @@ -4060,9 +3977,7 @@ PHP_METHOD(Phar, getMetadata) } /* }}} */ -/* {{{ proto int Phar::setMetaData(mixed $metadata) - * Sets the global metadata of the phar - */ +/* {{{ Sets the global metadata of the phar */ PHP_METHOD(Phar, setMetadata) { char *error; @@ -4099,9 +4014,7 @@ PHP_METHOD(Phar, setMetadata) } /* }}} */ -/* {{{ proto int Phar::delMetadata() - * Deletes the global metadata of the phar - */ +/* {{{ Deletes the global metadata of the phar */ PHP_METHOD(Phar, delMetadata) { char *error; @@ -4348,9 +4261,7 @@ static int extract_helper(phar_archive_data *archive, zend_string *search, char } /* }}} */ -/* {{{ proto bool Phar::extractTo(string pathto[[, mixed files], bool overwrite]) - * Extract one or more file from a phar archive, optionally overwriting existing files - */ +/* {{{ Extract one or more file from a phar archive, optionally overwriting existing files */ PHP_METHOD(Phar, extractTo) { php_stream *fp; @@ -4466,9 +4377,7 @@ PHP_METHOD(Phar, extractTo) /* }}} */ -/* {{{ proto PharFileInfo::__construct(string entry) - * Construct a Phar entry object - */ +/* {{{ Construct a Phar entry object */ PHP_METHOD(PharFileInfo, __construct) { char *fname, *arch, *entry, *error; @@ -4541,9 +4450,7 @@ PHP_METHOD(PharFileInfo, __construct) RETURN_THROWS(); \ } -/* {{{ proto PharFileInfo::__destruct() - * clean up directory-based entry objects - */ +/* {{{ clean up directory-based entry objects */ PHP_METHOD(PharFileInfo, __destruct) { zval *zobj = ZEND_THIS; @@ -4561,9 +4468,7 @@ PHP_METHOD(PharFileInfo, __destruct) } /* }}} */ -/* {{{ proto int PharFileInfo::getCompressedSize() - * Returns the compressed size - */ +/* {{{ Returns the compressed size */ PHP_METHOD(PharFileInfo, getCompressedSize) { PHAR_ENTRY_OBJECT(); @@ -4576,9 +4481,7 @@ PHP_METHOD(PharFileInfo, getCompressedSize) } /* }}} */ -/* {{{ proto bool PharFileInfo::isCompressed([int compression_type]) - * Returns whether the entry is compressed, and whether it is compressed with Phar::GZ or Phar::BZ2 if specified - */ +/* {{{ Returns whether the entry is compressed, and whether it is compressed with Phar::GZ or Phar::BZ2 if specified */ PHP_METHOD(PharFileInfo, isCompressed) { /* a number that is not Phar::GZ or Phar::BZ2 */ @@ -4603,9 +4506,7 @@ PHP_METHOD(PharFileInfo, isCompressed) } /* }}} */ -/* {{{ proto int PharFileInfo::getCRC32() - * Returns CRC32 code or throws an exception if not CRC checked - */ +/* {{{ Returns CRC32 code or throws an exception if not CRC checked */ PHP_METHOD(PharFileInfo, getCRC32) { PHAR_ENTRY_OBJECT(); @@ -4629,9 +4530,7 @@ PHP_METHOD(PharFileInfo, getCRC32) } /* }}} */ -/* {{{ proto int PharFileInfo::isCRCChecked() - * Returns whether file entry is CRC checked - */ +/* {{{ Returns whether file entry is CRC checked */ PHP_METHOD(PharFileInfo, isCRCChecked) { PHAR_ENTRY_OBJECT(); @@ -4644,9 +4543,7 @@ PHP_METHOD(PharFileInfo, isCRCChecked) } /* }}} */ -/* {{{ proto int PharFileInfo::getPharFlags() - * Returns the Phar file entry flags - */ +/* {{{ Returns the Phar file entry flags */ PHP_METHOD(PharFileInfo, getPharFlags) { PHAR_ENTRY_OBJECT(); @@ -4659,9 +4556,7 @@ PHP_METHOD(PharFileInfo, getPharFlags) } /* }}} */ -/* {{{ proto int PharFileInfo::chmod() - * set the file permissions for the Phar. This only allows setting execution bit, read/write - */ +/* {{{ set the file permissions for the Phar. This only allows setting execution bit, read/write */ PHP_METHOD(PharFileInfo, chmod) { char *error; @@ -4722,9 +4617,7 @@ PHP_METHOD(PharFileInfo, chmod) } /* }}} */ -/* {{{ proto int PharFileInfo::hasMetaData() - * Returns the metadata of the entry - */ +/* {{{ Returns the metadata of the entry */ PHP_METHOD(PharFileInfo, hasMetadata) { PHAR_ENTRY_OBJECT(); @@ -4737,9 +4630,7 @@ PHP_METHOD(PharFileInfo, hasMetadata) } /* }}} */ -/* {{{ proto int PharFileInfo::getMetaData() - * Returns the metadata of the entry - */ +/* {{{ Returns the metadata of the entry */ PHP_METHOD(PharFileInfo, getMetadata) { PHAR_ENTRY_OBJECT(); @@ -4761,9 +4652,7 @@ PHP_METHOD(PharFileInfo, getMetadata) } /* }}} */ -/* {{{ proto int PharFileInfo::setMetaData(mixed $metadata) - * Sets the metadata of the entry - */ +/* {{{ Sets the metadata of the entry */ PHP_METHOD(PharFileInfo, setMetadata) { char *error; @@ -4814,9 +4703,7 @@ PHP_METHOD(PharFileInfo, setMetadata) } /* }}} */ -/* {{{ proto bool PharFileInfo::delMetaData() - * Deletes the metadata of the entry - */ +/* {{{ Deletes the metadata of the entry */ PHP_METHOD(PharFileInfo, delMetadata) { char *error; @@ -4870,9 +4757,7 @@ PHP_METHOD(PharFileInfo, delMetadata) } /* }}} */ -/* {{{ proto string PharFileInfo::getContent() - * return the complete file contents of the entry (like file_get_contents) - */ +/* {{{ return the complete file contents of the entry (like file_get_contents) */ PHP_METHOD(PharFileInfo, getContent) { char *error; @@ -4921,9 +4806,7 @@ PHP_METHOD(PharFileInfo, getContent) } /* }}} */ -/* {{{ proto int PharFileInfo::compress(int compression_type) - * Instructs the Phar class to compress the current file using zlib or bzip2 compression - */ +/* {{{ Instructs the Phar class to compress the current file using zlib or bzip2 compression */ PHP_METHOD(PharFileInfo, compress) { zend_long method; @@ -5049,9 +4932,7 @@ PHP_METHOD(PharFileInfo, compress) } /* }}} */ -/* {{{ proto int PharFileInfo::decompress() - * Instructs the Phar class to decompress the current file - */ +/* {{{ Instructs the Phar class to decompress the current file */ PHP_METHOD(PharFileInfo, decompress) { char *error; diff --git a/ext/posix/posix.c b/ext/posix/posix.c index a697c0c467..cc3dd42cbc 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -50,8 +50,7 @@ ZEND_DECLARE_MODULE_GLOBALS(posix) static PHP_MINFO_FUNCTION(posix); -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); @@ -69,8 +68,7 @@ static PHP_GINIT_FUNCTION(posix) /* {{{ */ } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION(posix) - */ +/* {{{ PHP_MINIT_FUNCTION(posix) */ static PHP_MINIT_FUNCTION(posix) { REGISTER_LONG_CONSTANT("POSIX_F_OK", F_OK, CONST_CS | CONST_PERSISTENT); @@ -147,8 +145,7 @@ static PHP_MINIT_FUNCTION(posix) } /* }}} */ -/* {{{ posix_module_entry - */ +/* {{{ posix_module_entry */ zend_module_entry posix_module_entry = { STANDARD_MODULE_HEADER, "posix", @@ -189,8 +186,7 @@ ZEND_GET_MODULE(posix) } \ RETURN_TRUE; -/* {{{ proto bool posix_kill(int pid, int sig) - Send a signal to a process (POSIX.1, 3.3.2) */ +/* {{{ Send a signal to a process (POSIX.1, 3.3.2) */ PHP_FUNCTION(posix_kill) { @@ -210,72 +206,63 @@ PHP_FUNCTION(posix_kill) } /* }}} */ -/* {{{ proto int posix_getpid(void) - Get the current process id (POSIX.1, 4.1.1) */ +/* {{{ Get the current process id (POSIX.1, 4.1.1) */ PHP_FUNCTION(posix_getpid) { PHP_POSIX_RETURN_LONG_FUNC(getpid); } /* }}} */ -/* {{{ proto int posix_getppid(void) - Get the parent process id (POSIX.1, 4.1.1) */ +/* {{{ Get the parent process id (POSIX.1, 4.1.1) */ PHP_FUNCTION(posix_getppid) { PHP_POSIX_RETURN_LONG_FUNC(getppid); } /* }}} */ -/* {{{ proto int posix_getuid(void) - Get the current user id (POSIX.1, 4.2.1) */ +/* {{{ Get the current user id (POSIX.1, 4.2.1) */ PHP_FUNCTION(posix_getuid) { PHP_POSIX_RETURN_LONG_FUNC(getuid); } /* }}} */ -/* {{{ proto int posix_getgid(void) - Get the current group id (POSIX.1, 4.2.1) */ +/* {{{ Get the current group id (POSIX.1, 4.2.1) */ PHP_FUNCTION(posix_getgid) { PHP_POSIX_RETURN_LONG_FUNC(getgid); } /* }}} */ -/* {{{ proto int posix_geteuid(void) - Get the current effective user id (POSIX.1, 4.2.1) */ +/* {{{ Get the current effective user id (POSIX.1, 4.2.1) */ PHP_FUNCTION(posix_geteuid) { PHP_POSIX_RETURN_LONG_FUNC(geteuid); } /* }}} */ -/* {{{ proto int posix_getegid(void) - Get the current effective group id (POSIX.1, 4.2.1) */ +/* {{{ Get the current effective group id (POSIX.1, 4.2.1) */ PHP_FUNCTION(posix_getegid) { PHP_POSIX_RETURN_LONG_FUNC(getegid); } /* }}} */ -/* {{{ proto bool posix_setuid(int uid) - Set user id (POSIX.1, 4.2.2) */ +/* {{{ Set user id (POSIX.1, 4.2.2) */ PHP_FUNCTION(posix_setuid) { PHP_POSIX_SINGLE_ARG_FUNC(setuid); } /* }}} */ -/* {{{ proto bool posix_setgid(int uid) - Set group id (POSIX.1, 4.2.2) */ +/* {{{ Set group id (POSIX.1, 4.2.2) */ PHP_FUNCTION(posix_setgid) { PHP_POSIX_SINGLE_ARG_FUNC(setgid); } /* }}} */ -/* {{{ proto bool posix_seteuid(int uid) - Set effective user id */ +/* {{{ Set effective user id */ #ifdef HAVE_SETEUID PHP_FUNCTION(posix_seteuid) { @@ -284,8 +271,7 @@ PHP_FUNCTION(posix_seteuid) #endif /* }}} */ -/* {{{ proto bool posix_setegid(int uid) - Set effective group id */ +/* {{{ Set effective group id */ #ifdef HAVE_SETEGID PHP_FUNCTION(posix_setegid) { @@ -294,8 +280,7 @@ PHP_FUNCTION(posix_setegid) #endif /* }}} */ -/* {{{ proto array posix_getgroups(void) - Get supplementary group id's (POSIX.1, 4.2.3) */ +/* {{{ Get supplementary group id's (POSIX.1, 4.2.3) */ #ifdef HAVE_GETGROUPS PHP_FUNCTION(posix_getgroups) { @@ -319,8 +304,7 @@ PHP_FUNCTION(posix_getgroups) #endif /* }}} */ -/* {{{ proto string posix_getlogin(void) - Get user name (POSIX.1, 4.2.4) */ +/* {{{ Get user name (POSIX.1, 4.2.4) */ #ifdef HAVE_GETLOGIN PHP_FUNCTION(posix_getlogin) { @@ -338,16 +322,14 @@ PHP_FUNCTION(posix_getlogin) #endif /* }}} */ -/* {{{ proto int posix_getpgrp(void) - Get current process group id (POSIX.1, 4.3.1) */ +/* {{{ Get current process group id (POSIX.1, 4.3.1) */ PHP_FUNCTION(posix_getpgrp) { PHP_POSIX_RETURN_LONG_FUNC(getpgrp); } /* }}} */ -/* {{{ proto int posix_setsid(void) - Create session and set process group id (POSIX.1, 4.3.2) */ +/* {{{ Create session and set process group id (POSIX.1, 4.3.2) */ #ifdef HAVE_SETSID PHP_FUNCTION(posix_setsid) { @@ -356,8 +338,7 @@ PHP_FUNCTION(posix_setsid) #endif /* }}} */ -/* {{{ proto bool posix_setpgid(int pid, int pgid) - Set process group id for job control (POSIX.1, 4.3.3) */ +/* {{{ Set process group id for job control (POSIX.1, 4.3.3) */ PHP_FUNCTION(posix_setpgid) { zend_long pid, pgid; @@ -376,8 +357,7 @@ PHP_FUNCTION(posix_setpgid) } /* }}} */ -/* {{{ proto int posix_getpgid(void) - Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) */ +/* {{{ Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) */ #ifdef HAVE_GETPGID PHP_FUNCTION(posix_getpgid) { @@ -396,8 +376,7 @@ PHP_FUNCTION(posix_getpgid) #endif /* }}} */ -/* {{{ proto int posix_getsid(void) - Get process group id of session leader (This is not a POSIX function, but a SVR4ism, so be compile conditionally) */ +/* {{{ Get process group id of session leader (This is not a POSIX function, but a SVR4ism, so be compile conditionally) */ #ifdef HAVE_GETSID PHP_FUNCTION(posix_getsid) { @@ -416,8 +395,7 @@ PHP_FUNCTION(posix_getsid) #endif /* }}} */ -/* {{{ proto array posix_uname(void) - Get system name (POSIX.1, 4.4.1) */ +/* {{{ Get system name (POSIX.1, 4.4.1) */ PHP_FUNCTION(posix_uname) { struct utsname u; @@ -447,8 +425,7 @@ PHP_FUNCTION(posix_uname) already covered by PHP */ -/* {{{ proto array posix_times(void) - Get process times (POSIX.1, 4.5.2) */ +/* {{{ Get process times (POSIX.1, 4.5.2) */ PHP_FUNCTION(posix_times) { struct tms t; @@ -475,8 +452,7 @@ PHP_FUNCTION(posix_times) already covered by PHP */ -/* {{{ proto string posix_ctermid(void) - Generate terminal path name (POSIX.1, 4.7.1) */ +/* {{{ Generate terminal path name (POSIX.1, 4.7.1) */ #ifdef HAVE_CTERMID PHP_FUNCTION(posix_ctermid) { @@ -520,8 +496,7 @@ static int php_posix_stream_get_fd(zval *zfp, int *fd) /* {{{ */ } /* }}} */ -/* {{{ proto string posix_ttyname(int fd) - Determine terminal device name (POSIX.1, 4.7.2) */ +/* {{{ Determine terminal device name (POSIX.1, 4.7.2) */ PHP_FUNCTION(posix_ttyname) { zval *z_fd; @@ -568,8 +543,7 @@ PHP_FUNCTION(posix_ttyname) } /* }}} */ -/* {{{ proto bool posix_isatty(int fd) - Determine if filedesc is a tty (POSIX.1, 4.7.1) */ +/* {{{ Determine if filedesc is a tty (POSIX.1, 4.7.1) */ PHP_FUNCTION(posix_isatty) { zval *z_fd; @@ -606,8 +580,7 @@ PHP_FUNCTION(posix_isatty) already supported by PHP */ -/* {{{ proto string posix_getcwd(void) - Get working directory pathname (POSIX.1, 5.2.2) */ +/* {{{ Get working directory pathname (POSIX.1, 5.2.2) */ PHP_FUNCTION(posix_getcwd) { char buffer[MAXPATHLEN]; @@ -631,8 +604,7 @@ PHP_FUNCTION(posix_getcwd) already supported by PHP. */ -/* {{{ proto bool posix_mkfifo(string pathname, int mode) - Make a FIFO special file (POSIX.1, 5.4.2) */ +/* {{{ Make a FIFO special file (POSIX.1, 5.4.2) */ #ifdef HAVE_MKFIFO PHP_FUNCTION(posix_mkfifo) { @@ -660,8 +632,7 @@ PHP_FUNCTION(posix_mkfifo) #endif /* }}} */ -/* {{{ proto bool posix_mknod(string pathname, int mode [, int major [, int minor]]) - Make a special or ordinary file (POSIX.1) */ +/* {{{ Make a special or ordinary file (POSIX.1) */ #ifdef HAVE_MKNOD PHP_FUNCTION(posix_mknod) { @@ -756,8 +727,7 @@ int php_posix_group_to_array(struct group *g, zval *array_group) /* {{{ */ POSIX.1, 5.6.x stat(), chmod(), utime() already supported by PHP. */ -/* {{{ proto bool posix_access(string file [, int mode]) - Determine accessibility of a file (POSIX.1 5.6.3) */ +/* {{{ Determine accessibility of a file (POSIX.1 5.6.3) */ PHP_FUNCTION(posix_access) { zend_long mode = 0; @@ -801,8 +771,7 @@ PHP_FUNCTION(posix_access) POSIX.1, 9.x system database access */ -/* {{{ proto array posix_getgrnam(string groupname) - Group database access (POSIX.1, 9.2.1) */ +/* {{{ Group database access (POSIX.1, 9.2.1) */ PHP_FUNCTION(posix_getgrnam) { char *name; @@ -856,8 +825,7 @@ try_again: } /* }}} */ -/* {{{ proto array posix_getgrgid(int gid) - Group database access (POSIX.1, 9.2.1) */ +/* {{{ Group database access (POSIX.1, 9.2.1) */ PHP_FUNCTION(posix_getgrgid) { zend_long gid; @@ -933,8 +901,7 @@ int php_posix_passwd_to_array(struct passwd *pw, zval *return_value) /* {{{ */ } /* }}} */ -/* {{{ proto array posix_getpwnam(string groupname) - User database access (POSIX.1, 9.2.2) */ +/* {{{ User database access (POSIX.1, 9.2.2) */ PHP_FUNCTION(posix_getpwnam) { struct passwd *pw; @@ -988,8 +955,7 @@ try_again: } /* }}} */ -/* {{{ proto array posix_getpwuid(int uid) - User database access (POSIX.1, 9.2.2) */ +/* {{{ User database access (POSIX.1, 9.2.2) */ PHP_FUNCTION(posix_getpwuid) { zend_long uid; @@ -1050,8 +1016,7 @@ try_again: #define UNLIMITED_STRING "unlimited" -/* {{{ posix_addlimit - */ +/* {{{ posix_addlimit */ static int posix_addlimit(int limit, const char *name, zval *return_value) { int result; struct rlimit rl; @@ -1083,8 +1048,7 @@ static int posix_addlimit(int limit, const char *name, zval *return_value) { } /* }}} */ -/* {{{ limits[] - */ +/* {{{ limits[] */ static const struct limitlist { int limit; const char *name; @@ -1142,8 +1106,7 @@ static const struct limitlist { /* }}} */ -/* {{{ proto array posix_getrlimit(void) - Get system resource consumption limits (This is not a POSIX function, but a BSDism and a SVR4ism. We compile conditionally) */ +/* {{{ Get system resource consumption limits (This is not a POSIX function, but a BSDism and a SVR4ism. We compile conditionally) */ PHP_FUNCTION(posix_getrlimit) { const struct limitlist *l = NULL; @@ -1164,8 +1127,7 @@ PHP_FUNCTION(posix_getrlimit) #endif /* HAVE_GETRLIMIT */ #ifdef HAVE_SETRLIMIT -/* {{{ proto bool posix_setrlimit(int resource, int softlimit, int hardlimit) - Set system resource consumption limits (POSIX.1-2001) */ +/* {{{ Set system resource consumption limits (POSIX.1-2001) */ PHP_FUNCTION(posix_setrlimit) { struct rlimit rl; @@ -1192,8 +1154,7 @@ PHP_FUNCTION(posix_setrlimit) #endif /* HAVE_SETRLIMIT */ -/* {{{ proto int posix_get_last_error(void) - Retrieve the error number set by the last posix function which failed. */ +/* {{{ Retrieve the error number set by the last posix function which failed. */ PHP_FUNCTION(posix_get_last_error) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1202,8 +1163,7 @@ PHP_FUNCTION(posix_get_last_error) } /* }}} */ -/* {{{ proto string posix_strerror(int errno) - Retrieve the system error message associated with the given errno. */ +/* {{{ Retrieve the system error message associated with the given errno. */ PHP_FUNCTION(posix_strerror) { zend_long error; @@ -1219,8 +1179,7 @@ PHP_FUNCTION(posix_strerror) #endif #ifdef HAVE_INITGROUPS -/* {{{ proto bool posix_initgroups(string name, int base_group_id) - Calculate the group access list for the user specified in name. */ +/* {{{ Calculate the group access list for the user specified in name. */ PHP_FUNCTION(posix_initgroups) { zend_long basegid; diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c index 00a20c86a1..6712784b31 100644 --- a/ext/pspell/pspell.c +++ b/ext/pspell/pspell.c @@ -91,8 +91,7 @@ static void php_pspell_close_config(zend_resource *rsrc) manager = (PspellManager *)Z_RES_P(res)->ptr; \ } while (0); -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(pspell) { REGISTER_LONG_CONSTANT("PSPELL_FAST", PSPELL_FAST, CONST_PERSISTENT | CONST_CS); @@ -105,8 +104,7 @@ static PHP_MINIT_FUNCTION(pspell) } /* }}} */ -/* {{{ proto int pspell_new(string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary */ +/* {{{ Load a dictionary */ PHP_FUNCTION(pspell_new) { char *language, *spelling = NULL, *jargon = NULL, *encoding = NULL; @@ -202,8 +200,7 @@ PHP_FUNCTION(pspell_new) } /* }}} */ -/* {{{ proto int pspell_new_personal(string personal, string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary with a personal wordlist*/ +/* {{{ Load a dictionary with a personal wordlist*/ PHP_FUNCTION(pspell_new_personal) { char *personal, *language, *spelling = NULL, *jargon = NULL, *encoding = NULL; @@ -307,8 +304,7 @@ PHP_FUNCTION(pspell_new_personal) } /* }}} */ -/* {{{ proto int pspell_new_config(int config) - Load a dictionary based on the given config */ +/* {{{ Load a dictionary based on the given config */ PHP_FUNCTION(pspell_new_config) { zend_long conf; @@ -337,8 +333,7 @@ PHP_FUNCTION(pspell_new_config) } /* }}} */ -/* {{{ proto bool pspell_check(int pspell, string word) - Returns true if word is valid */ +/* {{{ Returns true if word is valid */ PHP_FUNCTION(pspell_check) { size_t word_len; @@ -360,8 +355,7 @@ PHP_FUNCTION(pspell_check) } /* }}} */ -/* {{{ proto array pspell_suggest(int pspell, string word) - Returns array of suggestions */ +/* {{{ Returns array of suggestions */ PHP_FUNCTION(pspell_suggest) { zend_long scin; @@ -393,8 +387,7 @@ PHP_FUNCTION(pspell_suggest) } /* }}} */ -/* {{{ proto bool pspell_store_replacement(int pspell, string misspell, string correct) - Notify the dictionary of a user-selected replacement */ +/* {{{ Notify the dictionary of a user-selected replacement */ PHP_FUNCTION(pspell_store_replacement) { size_t miss_len, corr_len; @@ -418,8 +411,7 @@ PHP_FUNCTION(pspell_store_replacement) } /* }}} */ -/* {{{ proto bool pspell_add_to_personal(int pspell, string word) - Adds a word to a personal list */ +/* {{{ Adds a word to a personal list */ PHP_FUNCTION(pspell_add_to_personal) { size_t word_len; @@ -448,8 +440,7 @@ PHP_FUNCTION(pspell_add_to_personal) } /* }}} */ -/* {{{ proto bool pspell_add_to_session(int pspell, string word) - Adds a word to the current session */ +/* {{{ Adds a word to the current session */ PHP_FUNCTION(pspell_add_to_session) { size_t word_len; @@ -478,8 +469,7 @@ PHP_FUNCTION(pspell_add_to_session) } /* }}} */ -/* {{{ proto bool pspell_clear_session(int pspell) - Clears the current session */ +/* {{{ Clears the current session */ PHP_FUNCTION(pspell_clear_session) { zend_long scin; @@ -501,8 +491,7 @@ PHP_FUNCTION(pspell_clear_session) } /* }}} */ -/* {{{ proto bool pspell_save_wordlist(int pspell) - Saves the current (personal) wordlist */ +/* {{{ Saves the current (personal) wordlist */ PHP_FUNCTION(pspell_save_wordlist) { zend_long scin; @@ -526,8 +515,7 @@ PHP_FUNCTION(pspell_save_wordlist) } /* }}} */ -/* {{{ proto int pspell_config_create(string language [, string spelling [, string jargon [, string encoding]]]) - Create a new config to be used later to create a manager */ +/* {{{ Create a new config to be used later to create a manager */ PHP_FUNCTION(pspell_config_create) { char *language, *spelling = NULL, *jargon = NULL, *encoding = NULL; @@ -594,8 +582,7 @@ PHP_FUNCTION(pspell_config_create) } /* }}} */ -/* {{{ proto bool pspell_config_runtogether(int conf, bool runtogether) - Consider run-together words as valid components */ +/* {{{ Consider run-together words as valid components */ PHP_FUNCTION(pspell_config_runtogether) { zend_long conf; @@ -614,8 +601,7 @@ PHP_FUNCTION(pspell_config_runtogether) } /* }}} */ -/* {{{ proto bool pspell_config_mode(int conf, int mode) - Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ +/* {{{ Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ PHP_FUNCTION(pspell_config_mode) { zend_long conf, mode; @@ -640,8 +626,7 @@ PHP_FUNCTION(pspell_config_mode) } /* }}} */ -/* {{{ proto bool pspell_config_ignore(int conf, int ignore) - Ignore words <= n chars */ +/* {{{ Ignore words <= n chars */ PHP_FUNCTION(pspell_config_ignore) { char ignore_str[MAX_LENGTH_OF_LONG + 1]; @@ -683,32 +668,28 @@ static void pspell_config_path(INTERNAL_FUNCTION_PARAMETERS, char *option) RETURN_TRUE; } -/* {{{ proto bool pspell_config_personal(int conf, string personal) - Use a personal dictionary for this config */ +/* {{{ Use a personal dictionary for this config */ PHP_FUNCTION(pspell_config_personal) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "personal"); } /* }}} */ -/* {{{ proto bool pspell_config_dict_dir(int conf, string directory) - location of the main word list */ +/* {{{ location of the main word list */ PHP_FUNCTION(pspell_config_dict_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "dict-dir"); } /* }}} */ -/* {{{ proto bool pspell_config_data_dir(int conf, string directory) - location of language data files */ +/* {{{ location of language data files */ PHP_FUNCTION(pspell_config_data_dir) { pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "data-dir"); } /* }}} */ -/* {{{ proto bool pspell_config_repl(int conf, string repl) - Use a personal dictionary with replacement pairs for this config */ +/* {{{ Use a personal dictionary with replacement pairs for this config */ PHP_FUNCTION(pspell_config_repl) { zend_long conf; @@ -734,8 +715,7 @@ PHP_FUNCTION(pspell_config_repl) } /* }}} */ -/* {{{ proto bool pspell_config_save_repl(int conf, bool save) - Save replacement pairs when personal list is saved for this config */ +/* {{{ Save replacement pairs when personal list is saved for this config */ PHP_FUNCTION(pspell_config_save_repl) { zend_long conf; @@ -754,8 +734,7 @@ PHP_FUNCTION(pspell_config_save_repl) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(pspell) { php_info_print_table_start(); diff --git a/ext/readline/readline.c b/ext/readline/readline.c index d9cf8bd8a9..30eb8a3622 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -112,8 +112,7 @@ PHP_MINFO_FUNCTION(readline) /* }}} */ -/* {{{ proto string readline([string prompt]) - Reads a line */ +/* {{{ Reads a line */ PHP_FUNCTION(readline) { char *prompt = NULL; @@ -138,8 +137,7 @@ PHP_FUNCTION(readline) #define SAFE_STRING(s) ((s)?(char*)(s):"") -/* {{{ proto mixed readline_info([string varname [, string newvalue]]) - Gets/sets various internal readline variables. */ +/* {{{ Gets/sets various internal readline variables. */ PHP_FUNCTION(readline_info) { char *what = NULL; @@ -267,8 +265,7 @@ PHP_FUNCTION(readline_info) } /* }}} */ -/* {{{ proto bool readline_add_history(string prompt) - Adds a line to the history */ +/* {{{ Adds a line to the history */ PHP_FUNCTION(readline_add_history) { char *arg; @@ -284,8 +281,7 @@ PHP_FUNCTION(readline_add_history) } /* }}} */ -/* {{{ proto bool readline_clear_history(void) - Clears the history */ +/* {{{ Clears the history */ PHP_FUNCTION(readline_clear_history) { if (zend_parse_parameters_none() == FAILURE) { @@ -305,8 +301,7 @@ PHP_FUNCTION(readline_clear_history) /* }}} */ #ifdef HAVE_HISTORY_LIST -/* {{{ proto array readline_list_history(void) - Lists the history */ +/* {{{ Lists the history */ PHP_FUNCTION(readline_list_history) { HIST_ENTRY **history; @@ -359,8 +354,7 @@ PHP_FUNCTION(readline_list_history) /* }}} */ #endif -/* {{{ proto bool readline_read_history([string filename]) - Reads the history */ +/* {{{ Reads the history */ PHP_FUNCTION(readline_read_history) { char *arg = NULL; @@ -384,8 +378,7 @@ PHP_FUNCTION(readline_read_history) } /* }}} */ -/* {{{ proto bool readline_write_history([string filename]) - Writes the history */ +/* {{{ Writes the history */ PHP_FUNCTION(readline_write_history) { char *arg = NULL; @@ -407,8 +400,7 @@ PHP_FUNCTION(readline_write_history) } /* }}} */ -/* {{{ proto bool readline_completion_function(string funcname) - Readline completion function? */ +/* {{{ Readline completion function? */ static char *_readline_command_generator(const char *text, int state) { @@ -519,8 +511,7 @@ static void php_rl_callback_handler(char *the_line) zval_ptr_dtor(&dummy); } -/* {{{ proto void readline_callback_handler_install(string prompt, mixed callback) - Initializes the readline callback interface and terminal, prints the prompt and returns immediately */ +/* {{{ Initializes the readline callback interface and terminal, prints the prompt and returns immediately */ PHP_FUNCTION(readline_callback_handler_install) { zval *callback; @@ -551,8 +542,7 @@ PHP_FUNCTION(readline_callback_handler_install) } /* }}} */ -/* {{{ proto void readline_callback_read_char() - Informs the readline callback interface that a character is ready for input */ +/* {{{ Informs the readline callback interface that a character is ready for input */ PHP_FUNCTION(readline_callback_read_char) { if (zend_parse_parameters_none() == FAILURE) { @@ -565,8 +555,7 @@ PHP_FUNCTION(readline_callback_read_char) } /* }}} */ -/* {{{ proto bool readline_callback_handler_remove() - Removes a previously installed callback handler and restores terminal settings */ +/* {{{ Removes a previously installed callback handler and restores terminal settings */ PHP_FUNCTION(readline_callback_handler_remove) { if (zend_parse_parameters_none() == FAILURE) { @@ -583,8 +572,7 @@ PHP_FUNCTION(readline_callback_handler_remove) } /* }}} */ -/* {{{ proto void readline_redisplay(void) - Ask readline to redraw the display */ +/* {{{ Ask readline to redraw the display */ PHP_FUNCTION(readline_redisplay) { if (zend_parse_parameters_none() == FAILURE) { @@ -603,8 +591,7 @@ PHP_FUNCTION(readline_redisplay) #endif #if HAVE_RL_ON_NEW_LINE -/* {{{ proto void readline_on_new_line(void) - Inform readline that the cursor has moved to a new line */ +/* {{{ Inform readline that the cursor has moved to a new line */ PHP_FUNCTION(readline_on_new_line) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index e5ce3cf88d..4897fbb822 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1439,8 +1439,7 @@ ZEND_METHOD(ReflectionClass, __clone) } /* }}} */ -/* {{{ proto public static array Reflection::getModifierNames(int modifiers) - Returns an array of modifier names */ +/* {{{ Returns an array of modifier names */ ZEND_METHOD(Reflection, getModifierNames) { zend_long modifiers; @@ -1477,8 +1476,7 @@ ZEND_METHOD(Reflection, getModifierNames) } /* }}} */ -/* {{{ proto public void ReflectionFunction::__construct(string name) - Constructor. Throws an Exception in case the given function does not exist */ +/* {{{ Constructor. Throws an Exception in case the given function does not exist */ ZEND_METHOD(ReflectionFunction, __construct) { zval *object; @@ -1530,8 +1528,7 @@ ZEND_METHOD(ReflectionFunction, __construct) } /* }}} */ -/* {{{ proto public string ReflectionFunction::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionFunction, __toString) { reflection_object *intern; @@ -1547,8 +1544,7 @@ ZEND_METHOD(ReflectionFunction, __toString) } /* }}} */ -/* {{{ proto public string ReflectionFunction::getName() - Returns this function's name */ +/* {{{ Returns this function's name */ ZEND_METHOD(ReflectionFunctionAbstract, getName) { reflection_object *intern; @@ -1563,8 +1559,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getName) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isClosure() - Returns whether this is a closure */ +/* {{{ Returns whether this is a closure */ ZEND_METHOD(ReflectionFunctionAbstract, isClosure) { reflection_object *intern; @@ -1578,8 +1573,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, isClosure) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::getClosureThis() - Returns this pointer bound to closure */ +/* {{{ Returns this pointer bound to closure */ ZEND_METHOD(ReflectionFunctionAbstract, getClosureThis) { reflection_object *intern; @@ -1598,8 +1592,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getClosureThis) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionFunction::getClosureScopeClass() - Returns the scope associated to the closure */ +/* {{{ Returns the scope associated to the closure */ ZEND_METHOD(ReflectionFunctionAbstract, getClosureScopeClass) { reflection_object *intern; @@ -1618,8 +1611,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getClosureScopeClass) } /* }}} */ -/* {{{ proto public mixed ReflectionFunction::getClosure() - Returns a dynamically created closure for the function */ +/* {{{ Returns a dynamically created closure for the function */ ZEND_METHOD(ReflectionFunction, getClosure) { reflection_object *intern; @@ -1639,8 +1631,7 @@ ZEND_METHOD(ReflectionFunction, getClosure) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isInternal() - Returns whether this is an internal function */ +/* {{{ Returns whether this is an internal function */ ZEND_METHOD(ReflectionFunctionAbstract, isInternal) { reflection_object *intern; @@ -1654,8 +1645,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, isInternal) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isUserDefined() - Returns whether this is a user-defined function */ +/* {{{ Returns whether this is a user-defined function */ ZEND_METHOD(ReflectionFunctionAbstract, isUserDefined) { reflection_object *intern; @@ -1669,8 +1659,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, isUserDefined) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isDisabled() - Returns whether this function has been disabled or not */ +/* {{{ Returns whether this function has been disabled or not */ ZEND_METHOD(ReflectionFunction, isDisabled) { if (zend_parse_parameters_none() == FAILURE) { @@ -1682,8 +1671,7 @@ ZEND_METHOD(ReflectionFunction, isDisabled) } /* }}} */ -/* {{{ proto public string ReflectionFunction::getFileName() - Returns the filename of the file this function was declared in */ +/* {{{ Returns the filename of the file this function was declared in */ ZEND_METHOD(ReflectionFunctionAbstract, getFileName) { reflection_object *intern; @@ -1700,8 +1688,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getFileName) } /* }}} */ -/* {{{ proto public int ReflectionFunction::getStartLine() - Returns the line this function's declaration starts at */ +/* {{{ Returns the line this function's declaration starts at */ ZEND_METHOD(ReflectionFunctionAbstract, getStartLine) { reflection_object *intern; @@ -1718,8 +1705,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getStartLine) } /* }}} */ -/* {{{ proto public int ReflectionFunction::getEndLine() - Returns the line this function's declaration ends at */ +/* {{{ Returns the line this function's declaration ends at */ ZEND_METHOD(ReflectionFunctionAbstract, getEndLine) { reflection_object *intern; @@ -1736,8 +1722,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getEndLine) } /* }}} */ -/* {{{ proto public string ReflectionFunction::getDocComment() - Returns the doc comment for this function */ +/* {{{ Returns the doc comment for this function */ ZEND_METHOD(ReflectionFunctionAbstract, getDocComment) { reflection_object *intern; @@ -1754,8 +1739,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getDocComment) } /* }}} */ -/* {{{ proto public array ReflectionFunction::getAttributes([ string name, int flags ]) - Returns the attributes of this function */ +/* {{{ Returns the attributes of this function */ ZEND_METHOD(ReflectionFunctionAbstract, getAttributes) { reflection_object *intern; @@ -1774,8 +1758,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getAttributes) } /* }}} */ -/* {{{ proto public array ReflectionFunction::getStaticVariables() - Returns an associative array containing this function's static variables and their values */ +/* {{{ Returns an associative array containing this function's static variables and their values */ ZEND_METHOD(ReflectionFunctionAbstract, getStaticVariables) { reflection_object *intern; @@ -1810,8 +1793,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getStaticVariables) } /* }}} */ -/* {{{ proto public mixed ReflectionFunction::invoke([mixed* args]) - Invokes the function */ +/* {{{ Invokes the function */ ZEND_METHOD(ReflectionFunction, invoke) { zval retval; @@ -1862,8 +1844,7 @@ ZEND_METHOD(ReflectionFunction, invoke) } /* }}} */ -/* {{{ proto public mixed ReflectionFunction::invokeArgs(array args) - Invokes the function and pass its arguments as array. */ +/* {{{ Invokes the function and pass its arguments as array. */ ZEND_METHOD(ReflectionFunction, invokeArgs) { zval retval; @@ -1930,8 +1911,7 @@ ZEND_METHOD(ReflectionFunction, invokeArgs) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::returnsReference() - Gets whether this function returns a reference */ +/* {{{ Gets whether this function returns a reference */ ZEND_METHOD(ReflectionFunctionAbstract, returnsReference) { reflection_object *intern; @@ -1947,8 +1927,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, returnsReference) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::getNumberOfParameters() - Gets the number of parameters */ +/* {{{ Gets the number of parameters */ ZEND_METHOD(ReflectionFunctionAbstract, getNumberOfParameters) { reflection_object *intern; @@ -1970,8 +1949,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNumberOfParameters) } /* }}} */ -/* {{{ proto public bool ReflectionFunction::getNumberOfRequiredParameters() - Gets the number of required parameters */ +/* {{{ Gets the number of required parameters */ ZEND_METHOD(ReflectionFunctionAbstract, getNumberOfRequiredParameters) { reflection_object *intern; @@ -1987,8 +1965,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNumberOfRequiredParameters) } /* }}} */ -/* {{{ proto public ReflectionParameter[] ReflectionFunction::getParameters() - Returns an array of parameter objects for this function */ +/* {{{ Returns an array of parameter objects for this function */ ZEND_METHOD(ReflectionFunctionAbstract, getParameters) { reflection_object *intern; @@ -2031,8 +2008,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getParameters) } /* }}} */ -/* {{{ proto public ReflectionExtension|NULL ReflectionFunction::getExtension() - Returns NULL or the extension the function belongs to */ +/* {{{ Returns NULL or the extension the function belongs to */ ZEND_METHOD(ReflectionFunctionAbstract, getExtension) { reflection_object *intern; @@ -2058,8 +2034,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getExtension) } /* }}} */ -/* {{{ proto public string|false ReflectionFunction::getExtensionName() - Returns false or the name of the extension the function belongs to */ +/* {{{ Returns false or the name of the extension the function belongs to */ ZEND_METHOD(ReflectionFunctionAbstract, getExtensionName) { reflection_object *intern; @@ -2085,7 +2060,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getExtensionName) } /* }}} */ -/* {{{ proto public void ReflectionGenerator::__construct(object Generator) */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, __construct) { zval *generator, *object; @@ -2117,7 +2092,7 @@ ZEND_METHOD(ReflectionGenerator, __construct) RETURN_THROWS(); \ } -/* {{{ proto public array ReflectionGenerator::getTrace($options = DEBUG_BACKTRACE_PROVIDE_OBJECT) */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getTrace) { zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT; @@ -2153,7 +2128,7 @@ ZEND_METHOD(ReflectionGenerator, getTrace) } /* }}} */ -/* {{{ proto public int ReflectionGenerator::getExecutingLine() */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getExecutingLine) { zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(ZEND_THIS)->obj); @@ -2169,7 +2144,7 @@ ZEND_METHOD(ReflectionGenerator, getExecutingLine) } /* }}} */ -/* {{{ proto public string ReflectionGenerator::getExecutingFile() */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getExecutingFile) { zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(ZEND_THIS)->obj); @@ -2185,7 +2160,7 @@ ZEND_METHOD(ReflectionGenerator, getExecutingFile) } /* }}} */ -/* {{{ proto public ReflectionFunctionAbstract ReflectionGenerator::getFunction() */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getFunction) { zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(ZEND_THIS)->obj); @@ -2209,7 +2184,7 @@ ZEND_METHOD(ReflectionGenerator, getFunction) } /* }}} */ -/* {{{ proto public object ReflectionGenerator::getThis() */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getThis) { zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(ZEND_THIS)->obj); @@ -2229,7 +2204,7 @@ ZEND_METHOD(ReflectionGenerator, getThis) } /* }}} */ -/* {{{ proto public Generator ReflectionGenerator::getExecutingGenerator() */ +/* {{{ */ ZEND_METHOD(ReflectionGenerator, getExecutingGenerator) { zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(ZEND_THIS)->obj); @@ -2247,8 +2222,7 @@ ZEND_METHOD(ReflectionGenerator, getExecutingGenerator) } /* }}} */ -/* {{{ proto public void ReflectionParameter::__construct(mixed function, mixed parameter) - Constructor. Throws an Exception in case the given method does not exist */ +/* {{{ Constructor. Throws an Exception in case the given method does not exist */ ZEND_METHOD(ReflectionParameter, __construct) { parameter_reference *ref; @@ -2436,8 +2410,7 @@ failure: } /* }}} */ -/* {{{ proto public string ReflectionParameter::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionParameter, __toString) { reflection_object *intern; @@ -2454,8 +2427,7 @@ ZEND_METHOD(ReflectionParameter, __toString) /* }}} */ -/* {{{ proto public string ReflectionParameter::getName() - Returns this parameters's name */ +/* {{{ Returns this parameters's name */ ZEND_METHOD(ReflectionParameter, getName) { reflection_object *intern; @@ -2474,8 +2446,7 @@ ZEND_METHOD(ReflectionParameter, getName) } /* }}} */ -/* {{{ proto public ReflectionFunction ReflectionParameter::getDeclaringFunction() - Returns the ReflectionFunction for the function of this parameter */ +/* {{{ Returns the ReflectionFunction for the function of this parameter */ ZEND_METHOD(ReflectionParameter, getDeclaringFunction) { reflection_object *intern; @@ -2494,8 +2465,7 @@ ZEND_METHOD(ReflectionParameter, getDeclaringFunction) } /* }}} */ -/* {{{ proto public ReflectionClass|NULL ReflectionParameter::getDeclaringClass() - Returns in which class this parameter is defined (not the type of the parameter) */ +/* {{{ Returns in which class this parameter is defined (not the type of the parameter) */ ZEND_METHOD(ReflectionParameter, getDeclaringClass) { reflection_object *intern; @@ -2512,8 +2482,7 @@ ZEND_METHOD(ReflectionParameter, getDeclaringClass) } /* }}} */ -/* {{{ proto public ReflectionClass|NULL ReflectionParameter::getClass() - Returns this parameters's class hint or NULL if there is none */ +/* {{{ Returns this parameters's class hint or NULL if there is none */ ZEND_METHOD(ReflectionParameter, getClass) { reflection_object *intern; @@ -2575,8 +2544,7 @@ ZEND_METHOD(ReflectionParameter, getClass) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::hasType() - Returns whether parameter has a type */ +/* {{{ Returns whether parameter has a type */ ZEND_METHOD(ReflectionParameter, hasType) { reflection_object *intern; @@ -2591,8 +2559,7 @@ ZEND_METHOD(ReflectionParameter, hasType) } /* }}} */ -/* {{{ proto public ReflectionType ReflectionParameter::getType() - Returns the type associated with the parameter */ +/* {{{ Returns the type associated with the parameter */ ZEND_METHOD(ReflectionParameter, getType) { reflection_object *intern; @@ -2610,8 +2577,7 @@ ZEND_METHOD(ReflectionParameter, getType) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isArray() - Returns whether parameter MUST be an array */ +/* {{{ Returns whether parameter MUST be an array */ ZEND_METHOD(ReflectionParameter, isArray) { reflection_object *intern; @@ -2628,8 +2594,7 @@ ZEND_METHOD(ReflectionParameter, isArray) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isCallable() - Returns whether parameter MUST be callable */ +/* {{{ Returns whether parameter MUST be callable */ ZEND_METHOD(ReflectionParameter, isCallable) { reflection_object *intern; @@ -2646,8 +2611,7 @@ ZEND_METHOD(ReflectionParameter, isCallable) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::allowsNull() - Returns whether NULL is allowed as this parameters's value */ +/* {{{ Returns whether NULL is allowed as this parameters's value */ ZEND_METHOD(ReflectionParameter, allowsNull) { reflection_object *intern; @@ -2663,8 +2627,7 @@ ZEND_METHOD(ReflectionParameter, allowsNull) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isPassedByReference() - Returns whether this parameters is passed to by reference */ +/* {{{ Returns whether this parameters is passed to by reference */ ZEND_METHOD(ReflectionParameter, isPassedByReference) { reflection_object *intern; @@ -2679,8 +2642,7 @@ ZEND_METHOD(ReflectionParameter, isPassedByReference) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::canBePassedByValue() - Returns whether this parameter can be passed by value */ +/* {{{ Returns whether this parameter can be passed by value */ ZEND_METHOD(ReflectionParameter, canBePassedByValue) { reflection_object *intern; @@ -2696,8 +2658,7 @@ ZEND_METHOD(ReflectionParameter, canBePassedByValue) } /* }}} */ -/* {{{ proto public array ReflectionParameter::getAttributes([ string name, int flags ]) - Get parameter attributes. */ +/* {{{ Get parameter attributes. */ ZEND_METHOD(ReflectionParameter, getAttributes) { reflection_object *intern; @@ -2711,8 +2672,7 @@ ZEND_METHOD(ReflectionParameter, getAttributes) reflect_attributes(INTERNAL_FUNCTION_PARAM_PASSTHRU, attributes, param->offset + 1, scope, ZEND_ATTRIBUTE_TARGET_PARAMETER); } -/* {{{ proto public int ReflectionParameter::getPosition() - Returns whether this parameter is an optional parameter */ +/* {{{ Returns whether this parameter is an optional parameter */ ZEND_METHOD(ReflectionParameter, getPosition) { reflection_object *intern; @@ -2727,8 +2687,7 @@ ZEND_METHOD(ReflectionParameter, getPosition) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isOptional() - Returns whether this parameter is an optional parameter */ +/* {{{ Returns whether this parameter is an optional parameter */ ZEND_METHOD(ReflectionParameter, isOptional) { reflection_object *intern; @@ -2743,8 +2702,7 @@ ZEND_METHOD(ReflectionParameter, isOptional) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isDefaultValueAvailable() - Returns whether the default value of this parameter is available */ +/* {{{ Returns whether the default value of this parameter is available */ ZEND_METHOD(ReflectionParameter, isDefaultValueAvailable) { reflection_object *intern; @@ -2765,8 +2723,7 @@ ZEND_METHOD(ReflectionParameter, isDefaultValueAvailable) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::getDefaultValue() - Returns the default value of this parameter or throws an exception */ +/* {{{ Returns the default value of this parameter or throws an exception */ ZEND_METHOD(ReflectionParameter, getDefaultValue) { reflection_object *intern; @@ -2790,8 +2747,7 @@ ZEND_METHOD(ReflectionParameter, getDefaultValue) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isDefaultValueConstant() - Returns whether the default value of this parameter is constant */ +/* {{{ Returns whether the default value of this parameter is constant */ ZEND_METHOD(ReflectionParameter, isDefaultValueConstant) { reflection_object *intern; @@ -2821,8 +2777,7 @@ ZEND_METHOD(ReflectionParameter, isDefaultValueConstant) } /* }}} */ -/* {{{ proto public mixed ReflectionParameter::getDefaultValueConstantName() - Returns the default value's constant name if default value is constant or null */ +/* {{{ Returns the default value's constant name if default value is constant or null */ ZEND_METHOD(ReflectionParameter, getDefaultValueConstantName) { reflection_object *intern; @@ -2857,8 +2812,7 @@ ZEND_METHOD(ReflectionParameter, getDefaultValueConstantName) zval_ptr_dtor_nogc(&default_value); } -/* {{{ proto public bool ReflectionParameter::isVariadic() - Returns whether this parameter is a variadic parameter */ +/* {{{ Returns whether this parameter is a variadic parameter */ ZEND_METHOD(ReflectionParameter, isVariadic) { reflection_object *intern; @@ -2873,8 +2827,7 @@ ZEND_METHOD(ReflectionParameter, isVariadic) } /* }}} */ -/* {{{ proto public bool ReflectionParameter::isPromoted() - Returns this constructor parameter has been promoted to a property */ +/* {{{ Returns this constructor parameter has been promoted to a property */ ZEND_METHOD(ReflectionParameter, isPromoted) { reflection_object *intern; @@ -2889,8 +2842,7 @@ ZEND_METHOD(ReflectionParameter, isPromoted) } /* }}} */ -/* {{{ proto public bool ReflectionType::allowsNull() - Returns whether parameter MAY be null */ +/* {{{ Returns whether parameter MAY be null */ ZEND_METHOD(ReflectionType, allowsNull) { reflection_object *intern; @@ -2910,8 +2862,7 @@ static zend_string *zend_type_to_string_without_null(zend_type type) { return zend_type_to_string(type); } -/* {{{ proto public string ReflectionType::__toString() - Return the text of the type hint */ +/* {{{ Return the text of the type hint */ ZEND_METHOD(ReflectionType, __toString) { reflection_object *intern; @@ -2926,8 +2877,7 @@ ZEND_METHOD(ReflectionType, __toString) } /* }}} */ -/* {{{ proto public string ReflectionNamedType::getName() - Return the name of the type */ +/* {{{ Return the name of the type */ ZEND_METHOD(ReflectionNamedType, getName) { reflection_object *intern; @@ -2945,8 +2895,7 @@ ZEND_METHOD(ReflectionNamedType, getName) } /* }}} */ -/* {{{ proto public bool ReflectionNamedType::isBuiltin() - Returns whether type is a builtin type */ +/* {{{ Returns whether type is a builtin type */ ZEND_METHOD(ReflectionNamedType, isBuiltin) { reflection_object *intern; @@ -2973,8 +2922,7 @@ static void append_type_mask(zval *return_value, uint32_t type_mask) { append_type(return_value, (zend_type) ZEND_TYPE_INIT_MASK(type_mask)); } -/* {{{ proto public string ReflectionUnionType::getTypes() - Returns the types that are part of this union type */ +/* {{{ Returns the types that are part of this union type */ ZEND_METHOD(ReflectionUnionType, getTypes) { reflection_object *intern; @@ -3034,8 +2982,7 @@ ZEND_METHOD(ReflectionUnionType, getTypes) } /* }}} */ -/* {{{ proto public void ReflectionMethod::__construct(mixed class_or_method [, string name]) - Constructor. Throws an Exception in case the given method does not exist */ +/* {{{ Constructor. Throws an Exception in case the given method does not exist */ ZEND_METHOD(ReflectionMethod, __construct) { zval *classname; @@ -3126,8 +3073,7 @@ ZEND_METHOD(ReflectionMethod, __construct) } /* }}} */ -/* {{{ proto public string ReflectionMethod::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionMethod, __toString) { reflection_object *intern; @@ -3143,8 +3089,7 @@ ZEND_METHOD(ReflectionMethod, __toString) } /* }}} */ -/* {{{ proto public mixed ReflectionMethod::getClosure([mixed object]) - Invokes the function */ +/* {{{ Invokes the function */ ZEND_METHOD(ReflectionMethod, getClosure) { reflection_object *intern; @@ -3298,96 +3243,84 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic) } /* }}} */ -/* {{{ proto public mixed ReflectionMethod::invoke(mixed object, [mixed* args]) - Invokes the method. */ +/* {{{ Invokes the method. */ ZEND_METHOD(ReflectionMethod, invoke) { reflection_method_invoke(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto public mixed ReflectionMethod::invokeArgs(mixed object, array args) - Invokes the function and pass its arguments as array. */ +/* {{{ Invokes the function and pass its arguments as array. */ ZEND_METHOD(ReflectionMethod, invokeArgs) { reflection_method_invoke(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isFinal() - Returns whether this method is final */ +/* {{{ Returns whether this method is final */ ZEND_METHOD(ReflectionMethod, isFinal) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isAbstract() - Returns whether this method is abstract */ +/* {{{ Returns whether this method is abstract */ ZEND_METHOD(ReflectionMethod, isAbstract) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_ABSTRACT); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isPublic() - Returns whether this method is public */ +/* {{{ Returns whether this method is public */ ZEND_METHOD(ReflectionMethod, isPublic) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PUBLIC); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isPrivate() - Returns whether this method is private */ +/* {{{ Returns whether this method is private */ ZEND_METHOD(ReflectionMethod, isPrivate) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PRIVATE); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isProtected() - Returns whether this method is protected */ +/* {{{ Returns whether this method is protected */ ZEND_METHOD(ReflectionMethod, isProtected) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PROTECTED); } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isStatic() - Returns whether this method is static */ +/* {{{ Returns whether this method is static */ ZEND_METHOD(ReflectionMethod, isStatic) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_STATIC); } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isDeprecated() - Returns whether this function is deprecated */ +/* {{{ Returns whether this function is deprecated */ ZEND_METHOD(ReflectionFunctionAbstract, isDeprecated) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_DEPRECATED); } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isGenerator() - Returns whether this function is a generator */ +/* {{{ Returns whether this function is a generator */ ZEND_METHOD(ReflectionFunctionAbstract, isGenerator) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_GENERATOR); } /* }}} */ -/* {{{ proto public bool ReflectionFunction::isVariadic() - Returns whether this function is variadic */ +/* {{{ Returns whether this function is variadic */ ZEND_METHOD(ReflectionFunctionAbstract, isVariadic) { _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_VARIADIC); } /* }}} */ -/* {{{ proto public bool ReflectionFunction::inNamespace() - Returns whether this function is defined in namespace */ +/* {{{ Returns whether this function is defined in namespace */ ZEND_METHOD(ReflectionFunctionAbstract, inNamespace) { reflection_object *intern; @@ -3405,8 +3338,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, inNamespace) } /* }}} */ -/* {{{ proto public string ReflectionFunction::getNamespaceName() - Returns the name of namespace where this function is defined */ +/* {{{ Returns the name of namespace where this function is defined */ ZEND_METHOD(ReflectionFunctionAbstract, getNamespaceName) { reflection_object *intern; @@ -3427,8 +3359,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNamespaceName) } /* }}} */ -/* {{{ proto public string ReflectionFunction::getShortName() - Returns the short name of the function (without namespace part) */ +/* {{{ Returns the short name of the function (without namespace part) */ ZEND_METHOD(ReflectionFunctionAbstract, getShortName) { reflection_object *intern; @@ -3449,8 +3380,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getShortName) } /* }}} */ -/* {{{ proto public bool ReflectionFunctionAbstract:hasReturnType() - Return whether the function has a return type */ +/* {{{ Return whether the function has a return type */ ZEND_METHOD(ReflectionFunctionAbstract, hasReturnType) { reflection_object *intern; @@ -3466,8 +3396,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, hasReturnType) } /* }}} */ -/* {{{ proto public string ReflectionFunctionAbstract::getReturnType() - Returns the return type associated with the function */ +/* {{{ Returns the return type associated with the function */ ZEND_METHOD(ReflectionFunctionAbstract, getReturnType) { reflection_object *intern; @@ -3487,8 +3416,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getReturnType) } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isConstructor() - Returns whether this method is the constructor */ +/* {{{ Returns whether this method is the constructor */ ZEND_METHOD(ReflectionMethod, isConstructor) { reflection_object *intern; @@ -3505,8 +3433,7 @@ ZEND_METHOD(ReflectionMethod, isConstructor) } /* }}} */ -/* {{{ proto public bool ReflectionMethod::isDestructor() - Returns whether this method is a destructor */ +/* {{{ Returns whether this method is a destructor */ ZEND_METHOD(ReflectionMethod, isDestructor) { reflection_object *intern; @@ -3521,8 +3448,7 @@ ZEND_METHOD(ReflectionMethod, isDestructor) } /* }}} */ -/* {{{ proto public int ReflectionMethod::getModifiers() - Returns a bitfield of the access modifiers for this method */ +/* {{{ Returns a bitfield of the access modifiers for this method */ ZEND_METHOD(ReflectionMethod, getModifiers) { reflection_object *intern; @@ -3539,8 +3465,7 @@ ZEND_METHOD(ReflectionMethod, getModifiers) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionMethod::getDeclaringClass() - Get the declaring class */ +/* {{{ Get the declaring class */ ZEND_METHOD(ReflectionMethod, getDeclaringClass) { reflection_object *intern; @@ -3556,8 +3481,7 @@ ZEND_METHOD(ReflectionMethod, getDeclaringClass) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionMethod::getPrototype() - Get the prototype */ +/* {{{ Get the prototype */ ZEND_METHOD(ReflectionMethod, getPrototype) { reflection_object *intern; @@ -3579,8 +3503,7 @@ ZEND_METHOD(ReflectionMethod, getPrototype) } /* }}} */ -/* {{{ proto public void ReflectionMethod::setAccessible(bool visible) - Sets whether non-public methods can be invoked */ +/* {{{ Sets whether non-public methods can be invoked */ ZEND_METHOD(ReflectionMethod, setAccessible) { reflection_object *intern; @@ -3596,8 +3519,7 @@ ZEND_METHOD(ReflectionMethod, setAccessible) } /* }}} */ -/* {{{ proto public void ReflectionClassConstant::__construct(mixed class, string name) - Constructor. Throws an Exception in case the given class constant does not exist */ +/* {{{ Constructor. Throws an Exception in case the given class constant does not exist */ ZEND_METHOD(ReflectionClassConstant, __construct) { zval *classname, *object; @@ -3646,8 +3568,7 @@ ZEND_METHOD(ReflectionClassConstant, __construct) } /* }}} */ -/* {{{ proto public string ReflectionClassConstant::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionClassConstant, __toString) { reflection_object *intern; @@ -3666,8 +3587,7 @@ ZEND_METHOD(ReflectionClassConstant, __toString) } /* }}} */ -/* {{{ proto public string ReflectionClassConstant::getName() - Returns the constant' name */ +/* {{{ Returns the constant' name */ ZEND_METHOD(ReflectionClassConstant, getName) { if (zend_parse_parameters_none() == FAILURE) { @@ -3690,32 +3610,28 @@ static void _class_constant_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) / } /* }}} */ -/* {{{ proto public bool ReflectionClassConstant::isPublic() - Returns whether this constant is public */ +/* {{{ Returns whether this constant is public */ ZEND_METHOD(ReflectionClassConstant, isPublic) { _class_constant_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PUBLIC); } /* }}} */ -/* {{{ proto public bool ReflectionClassConstant::isPrivate() - Returns whether this constant is private */ +/* {{{ Returns whether this constant is private */ ZEND_METHOD(ReflectionClassConstant, isPrivate) { _class_constant_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PRIVATE); } /* }}} */ -/* {{{ proto public bool ReflectionClassConstant::isProtected() - Returns whether this constant is protected */ +/* {{{ Returns whether this constant is protected */ ZEND_METHOD(ReflectionClassConstant, isProtected) { _class_constant_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PROTECTED); } /* }}} */ -/* {{{ proto public int ReflectionClassConstant::getModifiers() - Returns a bitfield of the access modifiers for this constant */ +/* {{{ Returns a bitfield of the access modifiers for this constant */ ZEND_METHOD(ReflectionClassConstant, getModifiers) { reflection_object *intern; @@ -3730,8 +3646,7 @@ ZEND_METHOD(ReflectionClassConstant, getModifiers) } /* }}} */ -/* {{{ proto public mixed ReflectionClassConstant::getValue() - Returns this constant's value */ +/* {{{ Returns this constant's value */ ZEND_METHOD(ReflectionClassConstant, getValue) { reflection_object *intern; @@ -3749,8 +3664,7 @@ ZEND_METHOD(ReflectionClassConstant, getValue) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionClassConstant::getDeclaringClass() - Get the declaring class */ +/* {{{ Get the declaring class */ ZEND_METHOD(ReflectionClassConstant, getDeclaringClass) { reflection_object *intern; @@ -3765,8 +3679,7 @@ ZEND_METHOD(ReflectionClassConstant, getDeclaringClass) } /* }}} */ -/* {{{ proto public string ReflectionClassConstant::getDocComment() - Returns the doc comment for this constant */ +/* {{{ Returns the doc comment for this constant */ ZEND_METHOD(ReflectionClassConstant, getDocComment) { reflection_object *intern; @@ -3783,8 +3696,7 @@ ZEND_METHOD(ReflectionClassConstant, getDocComment) } /* }}} */ -/* {{{ proto public array ReflectionClassConstant::getAttributes([ string name, int flags ]) - Returns the attributes of this constant */ +/* {{{ Returns the attributes of this constant */ ZEND_METHOD(ReflectionClassConstant, getAttributes) { reflection_object *intern; @@ -3842,8 +3754,7 @@ static void reflection_class_object_ctor(INTERNAL_FUNCTION_PARAMETERS, int is_ob } /* }}} */ -/* {{{ proto public void ReflectionClass::__construct(mixed argument) throws ReflectionException - Constructor. Takes a string or an instance as an argument */ +/* {{{ Constructor. Takes a string or an instance as an argument */ ZEND_METHOD(ReflectionClass, __construct) { reflection_class_object_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -3890,8 +3801,7 @@ static void add_class_vars(zend_class_entry *ce, zend_bool statics, zval *return } /* }}} */ -/* {{{ proto public array ReflectionClass::getStaticProperties() - Returns an associative array containing all static property values of the class */ +/* {{{ Returns an associative array containing all static property values of the class */ ZEND_METHOD(ReflectionClass, getStaticProperties) { reflection_object *intern; @@ -3941,8 +3851,7 @@ ZEND_METHOD(ReflectionClass, getStaticProperties) } /* }}} */ -/* {{{ proto public mixed ReflectionClass::getStaticPropertyValue(string name [, mixed default]) - Returns the value of a static property */ +/* {{{ Returns the value of a static property */ ZEND_METHOD(ReflectionClass, getStaticPropertyValue) { reflection_object *intern; @@ -3979,8 +3888,7 @@ ZEND_METHOD(ReflectionClass, getStaticPropertyValue) } /* }}} */ -/* {{{ proto public void ReflectionClass::setStaticPropertyValue(string $name, mixed $value) - Sets the value of a static property */ +/* {{{ Sets the value of a static property */ ZEND_METHOD(ReflectionClass, setStaticPropertyValue) { reflection_object *intern; @@ -4028,8 +3936,7 @@ ZEND_METHOD(ReflectionClass, setStaticPropertyValue) } /* }}} */ -/* {{{ proto public array ReflectionClass::getDefaultProperties() - Returns an associative array containing copies of all default property values of the class */ +/* {{{ Returns an associative array containing copies of all default property values of the class */ ZEND_METHOD(ReflectionClass, getDefaultProperties) { reflection_object *intern; @@ -4048,8 +3955,7 @@ ZEND_METHOD(ReflectionClass, getDefaultProperties) } /* }}} */ -/* {{{ proto public string ReflectionClass::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionClass, __toString) { reflection_object *intern; @@ -4065,8 +3971,7 @@ ZEND_METHOD(ReflectionClass, __toString) } /* }}} */ -/* {{{ proto public string ReflectionClass::getName() - Returns the class' name */ +/* {{{ Returns the class' name */ ZEND_METHOD(ReflectionClass, getName) { reflection_object *intern; @@ -4081,8 +3986,7 @@ ZEND_METHOD(ReflectionClass, getName) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isInternal() - Returns whether this class is an internal class */ +/* {{{ Returns whether this class is an internal class */ ZEND_METHOD(ReflectionClass, isInternal) { reflection_object *intern; @@ -4096,8 +4000,7 @@ ZEND_METHOD(ReflectionClass, isInternal) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isUserDefined() - Returns whether this class is user-defined */ +/* {{{ Returns whether this class is user-defined */ ZEND_METHOD(ReflectionClass, isUserDefined) { reflection_object *intern; @@ -4111,8 +4014,7 @@ ZEND_METHOD(ReflectionClass, isUserDefined) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isAnonymous() - Returns whether this class is anonymous */ +/* {{{ Returns whether this class is anonymous */ ZEND_METHOD(ReflectionClass, isAnonymous) { reflection_object *intern; @@ -4126,8 +4028,7 @@ ZEND_METHOD(ReflectionClass, isAnonymous) } /* }}} */ -/* {{{ proto public string ReflectionClass::getFileName() - Returns the filename of the file this class was declared in */ +/* {{{ Returns the filename of the file this class was declared in */ ZEND_METHOD(ReflectionClass, getFileName) { reflection_object *intern; @@ -4144,8 +4045,7 @@ ZEND_METHOD(ReflectionClass, getFileName) } /* }}} */ -/* {{{ proto public int ReflectionClass::getStartLine() - Returns the line this class' declaration starts at */ +/* {{{ Returns the line this class' declaration starts at */ ZEND_METHOD(ReflectionClass, getStartLine) { reflection_object *intern; @@ -4162,8 +4062,7 @@ ZEND_METHOD(ReflectionClass, getStartLine) } /* }}} */ -/* {{{ proto public int ReflectionClass::getEndLine() - Returns the line this class' declaration ends at */ +/* {{{ Returns the line this class' declaration ends at */ ZEND_METHOD(ReflectionClass, getEndLine) { reflection_object *intern; @@ -4180,8 +4079,7 @@ ZEND_METHOD(ReflectionClass, getEndLine) } /* }}} */ -/* {{{ proto public string ReflectionClass::getDocComment() - Returns the doc comment for this class */ +/* {{{ Returns the doc comment for this class */ ZEND_METHOD(ReflectionClass, getDocComment) { reflection_object *intern; @@ -4198,8 +4096,7 @@ ZEND_METHOD(ReflectionClass, getDocComment) } /* }}} */ -/* {{{ proto public array ReflectionClass::getAttributes([ string name, int flags ]) - Returns the attributes for this class */ +/* {{{ Returns the attributes for this class */ ZEND_METHOD(ReflectionClass, getAttributes) { reflection_object *intern; @@ -4211,8 +4108,7 @@ ZEND_METHOD(ReflectionClass, getAttributes) } /* }}} */ -/* {{{ proto public ReflectionMethod ReflectionClass::getConstructor() - Returns the class' constructor if there is one, NULL otherwise */ +/* {{{ Returns the class' constructor if there is one, NULL otherwise */ ZEND_METHOD(ReflectionClass, getConstructor) { reflection_object *intern; @@ -4231,8 +4127,7 @@ ZEND_METHOD(ReflectionClass, getConstructor) } /* }}} */ -/* {{{ proto public bool ReflectionClass::hasMethod(string name) - Returns whether a method exists or not */ +/* {{{ Returns whether a method exists or not */ ZEND_METHOD(ReflectionClass, hasMethod) { reflection_object *intern; @@ -4250,8 +4145,7 @@ ZEND_METHOD(ReflectionClass, hasMethod) } /* }}} */ -/* {{{ proto public ReflectionMethod ReflectionClass::getMethod(string name) throws ReflectionException - Returns the class' method specified by its name */ +/* {{{ Returns the class' method specified by its name */ ZEND_METHOD(ReflectionClass, getMethod) { reflection_object *intern; @@ -4303,8 +4197,7 @@ static void _addmethod(zend_function *mptr, zend_class_entry *ce, zval *retval, } /* }}} */ -/* {{{ proto public ReflectionMethod[] ReflectionClass::getMethods([long $filter]) - Returns an array of this class' methods */ +/* {{{ Returns an array of this class' methods */ ZEND_METHOD(ReflectionClass, getMethods) { reflection_object *intern; @@ -4349,8 +4242,7 @@ ZEND_METHOD(ReflectionClass, getMethods) } /* }}} */ -/* {{{ proto public bool ReflectionClass::hasProperty(string name) - Returns whether a property exists or not */ +/* {{{ Returns whether a property exists or not */ ZEND_METHOD(ReflectionClass, hasProperty) { reflection_object *intern; @@ -4379,8 +4271,7 @@ ZEND_METHOD(ReflectionClass, hasProperty) } /* }}} */ -/* {{{ proto public ReflectionProperty ReflectionClass::getProperty(string name) throws ReflectionException - Returns the class' property specified by its name */ +/* {{{ Returns the class' property specified by its name */ ZEND_METHOD(ReflectionClass, getProperty) { reflection_object *intern; @@ -4482,8 +4373,7 @@ static void _adddynproperty(zval *ptr, zend_string *key, zend_class_entry *ce, z } /* }}} */ -/* {{{ proto public ReflectionProperty[] ReflectionClass::getProperties([long $filter]) - Returns an array of this class' properties */ +/* {{{ Returns an array of this class' properties */ ZEND_METHOD(ReflectionClass, getProperties) { reflection_object *intern; @@ -4518,8 +4408,7 @@ ZEND_METHOD(ReflectionClass, getProperties) } /* }}} */ -/* {{{ proto public bool ReflectionClass::hasConstant(string name) - Returns whether a constant exists or not */ +/* {{{ Returns whether a constant exists or not */ ZEND_METHOD(ReflectionClass, hasConstant) { reflection_object *intern; @@ -4539,8 +4428,7 @@ ZEND_METHOD(ReflectionClass, hasConstant) } /* }}} */ -/* {{{ proto public array ReflectionClass::getConstants([int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE]) - Returns an associative array containing this class' constants and their values */ +/* {{{ Returns an associative array containing this class' constants and their values */ ZEND_METHOD(ReflectionClass, getConstants) { reflection_object *intern; @@ -4571,8 +4459,7 @@ ZEND_METHOD(ReflectionClass, getConstants) } /* }}} */ -/* {{{ proto public ReflectionClassConstant[] ReflectionClass::getReflectionConstants([int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE]) - Returns an associative array containing this class' constants as ReflectionClassConstant objects */ +/* {{{ Returns an associative array containing this class' constants as ReflectionClassConstant objects */ ZEND_METHOD(ReflectionClass, getReflectionConstants) { reflection_object *intern; @@ -4598,8 +4485,7 @@ ZEND_METHOD(ReflectionClass, getReflectionConstants) } /* }}} */ -/* {{{ proto public mixed ReflectionClass::getConstant(string name) - Returns the class' constant specified by its name */ +/* {{{ Returns the class' constant specified by its name */ ZEND_METHOD(ReflectionClass, getConstant) { reflection_object *intern; @@ -4624,8 +4510,7 @@ ZEND_METHOD(ReflectionClass, getConstant) } /* }}} */ -/* {{{ proto public mixed ReflectionClass::getReflectionConstant(string name) - Returns the class' constant as ReflectionClassConstant objects */ +/* {{{ Returns the class' constant as ReflectionClassConstant objects */ ZEND_METHOD(ReflectionClass, getReflectionConstant) { reflection_object *intern; @@ -4659,8 +4544,7 @@ static void _class_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isInstantiable() - Returns whether this class is instantiable */ +/* {{{ Returns whether this class is instantiable */ ZEND_METHOD(ReflectionClass, isInstantiable) { reflection_object *intern; @@ -4684,8 +4568,7 @@ ZEND_METHOD(ReflectionClass, isInstantiable) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isCloneable() - Returns whether this class is cloneable */ +/* {{{ Returns whether this class is cloneable */ ZEND_METHOD(ReflectionClass, isCloneable) { reflection_object *intern; @@ -4721,40 +4604,35 @@ ZEND_METHOD(ReflectionClass, isCloneable) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isInterface() - Returns whether this is an interface or a class */ +/* {{{ Returns whether this is an interface or a class */ ZEND_METHOD(ReflectionClass, isInterface) { _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_INTERFACE); } /* }}} */ -/* {{{ proto public bool ReflectionClass::isTrait() - Returns whether this is a trait */ +/* {{{ Returns whether this is a trait */ ZEND_METHOD(ReflectionClass, isTrait) { _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT); } /* }}} */ -/* {{{ proto public bool ReflectionClass::isFinal() - Returns whether this class is final */ +/* {{{ Returns whether this class is final */ ZEND_METHOD(ReflectionClass, isFinal) { _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_FINAL); } /* }}} */ -/* {{{ proto public bool ReflectionClass::isAbstract() - Returns whether this class is abstract */ +/* {{{ Returns whether this class is abstract */ ZEND_METHOD(ReflectionClass, isAbstract) { _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); } /* }}} */ -/* {{{ proto public int ReflectionClass::getModifiers() - Returns a bitfield of the access modifiers for this class */ +/* {{{ Returns a bitfield of the access modifiers for this class */ ZEND_METHOD(ReflectionClass, getModifiers) { reflection_object *intern; @@ -4771,8 +4649,7 @@ ZEND_METHOD(ReflectionClass, getModifiers) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isInstance(stdclass object) - Returns whether the given object is an instance of this class */ +/* {{{ Returns whether the given object is an instance of this class */ ZEND_METHOD(ReflectionClass, isInstance) { reflection_object *intern; @@ -4787,8 +4664,7 @@ ZEND_METHOD(ReflectionClass, isInstance) } /* }}} */ -/* {{{ proto public object ReflectionClass::newInstance([mixed* args], ...) - Returns an instance of this class */ +/* {{{ Returns an instance of this class */ ZEND_METHOD(ReflectionClass, newInstance) { reflection_object *intern; @@ -4841,8 +4717,7 @@ ZEND_METHOD(ReflectionClass, newInstance) } /* }}} */ -/* {{{ proto public object ReflectionClass::newInstanceWithoutConstructor() - Returns an instance of this class without invoking its constructor */ +/* {{{ Returns an instance of this class without invoking its constructor */ ZEND_METHOD(ReflectionClass, newInstanceWithoutConstructor) { reflection_object *intern; @@ -4864,8 +4739,7 @@ ZEND_METHOD(ReflectionClass, newInstanceWithoutConstructor) } /* }}} */ -/* {{{ proto public object ReflectionClass::newInstanceArgs([array args]) - Returns an instance of this class */ +/* {{{ Returns an instance of this class */ ZEND_METHOD(ReflectionClass, newInstanceArgs) { zval *val; @@ -4931,8 +4805,7 @@ ZEND_METHOD(ReflectionClass, newInstanceArgs) } /* }}} */ -/* {{{ proto public ReflectionClass[] ReflectionClass::getInterfaces() - Returns an array of interfaces this class implements */ +/* {{{ Returns an array of interfaces this class implements */ ZEND_METHOD(ReflectionClass, getInterfaces) { reflection_object *intern; @@ -4959,8 +4832,7 @@ ZEND_METHOD(ReflectionClass, getInterfaces) } /* }}} */ -/* {{{ proto public String[] ReflectionClass::getInterfaceNames() - Returns an array of names of interfaces this class implements */ +/* {{{ Returns an array of names of interfaces this class implements */ ZEND_METHOD(ReflectionClass, getInterfaceNames) { reflection_object *intern; @@ -4986,8 +4858,7 @@ ZEND_METHOD(ReflectionClass, getInterfaceNames) } /* }}} */ -/* {{{ proto public ReflectionClass[] ReflectionClass::getTraits() - Returns an array of traits used by this class */ +/* {{{ Returns an array of traits used by this class */ ZEND_METHOD(ReflectionClass, getTraits) { reflection_object *intern; @@ -5018,8 +4889,7 @@ ZEND_METHOD(ReflectionClass, getTraits) } /* }}} */ -/* {{{ proto public String[] ReflectionClass::getTraitNames() - Returns an array of names of traits used by this class */ +/* {{{ Returns an array of names of traits used by this class */ ZEND_METHOD(ReflectionClass, getTraitNames) { reflection_object *intern; @@ -5043,8 +4913,7 @@ ZEND_METHOD(ReflectionClass, getTraitNames) } /* }}} */ -/* {{{ proto public array ReflectionClass::getTraitAliases() - Returns an array of trait aliases */ +/* {{{ Returns an array of trait aliases */ ZEND_METHOD(ReflectionClass, getTraitAliases) { reflection_object *intern; @@ -5078,8 +4947,7 @@ ZEND_METHOD(ReflectionClass, getTraitAliases) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionClass::getParentClass() - Returns the class' parent class, or, if none exists, FALSE */ +/* {{{ Returns the class' parent class, or, if none exists, FALSE */ ZEND_METHOD(ReflectionClass, getParentClass) { reflection_object *intern; @@ -5098,8 +4966,7 @@ ZEND_METHOD(ReflectionClass, getParentClass) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isSubclassOf(string|ReflectionClass class) - Returns whether this class is a subclass of another class */ +/* {{{ Returns whether this class is a subclass of another class */ ZEND_METHOD(ReflectionClass, isSubclassOf) { reflection_object *intern, *argument; @@ -5140,8 +5007,7 @@ ZEND_METHOD(ReflectionClass, isSubclassOf) } /* }}} */ -/* {{{ proto public bool ReflectionClass::implementsInterface(string|ReflectionClass interface_name) - Returns whether this class is a subclass of another class */ +/* {{{ Returns whether this class is a subclass of another class */ ZEND_METHOD(ReflectionClass, implementsInterface) { reflection_object *intern, *argument; @@ -5187,8 +5053,7 @@ ZEND_METHOD(ReflectionClass, implementsInterface) } /* }}} */ -/* {{{ proto public bool ReflectionClass::isIterable() - Returns whether this class is iterable (can be used inside foreach) */ +/* {{{ Returns whether this class is iterable (can be used inside foreach) */ ZEND_METHOD(ReflectionClass, isIterable) { reflection_object *intern; @@ -5209,8 +5074,7 @@ ZEND_METHOD(ReflectionClass, isIterable) } /* }}} */ -/* {{{ proto public ReflectionExtension|NULL ReflectionClass::getExtension() - Returns NULL or the extension the class belongs to */ +/* {{{ Returns NULL or the extension the class belongs to */ ZEND_METHOD(ReflectionClass, getExtension) { reflection_object *intern; @@ -5228,8 +5092,7 @@ ZEND_METHOD(ReflectionClass, getExtension) } /* }}} */ -/* {{{ proto public string|false ReflectionClass::getExtensionName() - Returns false or the name of the extension the class belongs to */ +/* {{{ Returns false or the name of the extension the class belongs to */ ZEND_METHOD(ReflectionClass, getExtensionName) { reflection_object *intern; @@ -5249,8 +5112,7 @@ ZEND_METHOD(ReflectionClass, getExtensionName) } /* }}} */ -/* {{{ proto public bool ReflectionClass::inNamespace() - Returns whether this class is defined in namespace */ +/* {{{ Returns whether this class is defined in namespace */ ZEND_METHOD(ReflectionClass, inNamespace) { reflection_object *intern; @@ -5268,8 +5130,7 @@ ZEND_METHOD(ReflectionClass, inNamespace) } /* }}} */ -/* {{{ proto public string ReflectionClass::getNamespaceName() - Returns the name of namespace where this class is defined */ +/* {{{ Returns the name of namespace where this class is defined */ ZEND_METHOD(ReflectionClass, getNamespaceName) { reflection_object *intern; @@ -5290,8 +5151,7 @@ ZEND_METHOD(ReflectionClass, getNamespaceName) } /* }}} */ -/* {{{ proto public string ReflectionClass::getShortName() - Returns the short name of the class (without namespace part) */ +/* {{{ Returns the short name of the class (without namespace part) */ ZEND_METHOD(ReflectionClass, getShortName) { reflection_object *intern; @@ -5312,16 +5172,14 @@ ZEND_METHOD(ReflectionClass, getShortName) } /* }}} */ -/* {{{ proto public void ReflectionObject::__construct(mixed argument) throws ReflectionException - Constructor. Takes an instance as an argument */ +/* {{{ Constructor. Takes an instance as an argument */ ZEND_METHOD(ReflectionObject, __construct) { reflection_class_object_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto public void ReflectionProperty::__construct(mixed class, string name) - Constructor. Throws an Exception in case the given property does not exist */ +/* {{{ Constructor. Throws an Exception in case the given property does not exist */ ZEND_METHOD(ReflectionProperty, __construct) { zval *classname; @@ -5392,8 +5250,7 @@ ZEND_METHOD(ReflectionProperty, __construct) } /* }}} */ -/* {{{ proto public string ReflectionProperty::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionProperty, __toString) { reflection_object *intern; @@ -5409,8 +5266,7 @@ ZEND_METHOD(ReflectionProperty, __toString) } /* }}} */ -/* {{{ proto public string ReflectionProperty::getName() - Returns the class' name */ +/* {{{ Returns the class' name */ ZEND_METHOD(ReflectionProperty, getName) { reflection_object *intern; @@ -5438,40 +5294,35 @@ static void _property_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) /* {{{ } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isPublic() - Returns whether this property is public */ +/* {{{ Returns whether this property is public */ ZEND_METHOD(ReflectionProperty, isPublic) { _property_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PUBLIC); } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isPrivate() - Returns whether this property is private */ +/* {{{ Returns whether this property is private */ ZEND_METHOD(ReflectionProperty, isPrivate) { _property_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PRIVATE); } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isProtected() - Returns whether this property is protected */ +/* {{{ Returns whether this property is protected */ ZEND_METHOD(ReflectionProperty, isProtected) { _property_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PROTECTED); } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isStatic() - Returns whether this property is static */ +/* {{{ Returns whether this property is static */ ZEND_METHOD(ReflectionProperty, isStatic) { _property_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_STATIC); } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isDefault() - Returns whether this property is default (declared at compilation time). */ +/* {{{ Returns whether this property is default (declared at compilation time). */ ZEND_METHOD(ReflectionProperty, isDefault) { reflection_object *intern; @@ -5485,16 +5336,14 @@ ZEND_METHOD(ReflectionProperty, isDefault) } /* }}} */ -/* {{{ proto public bool ReflectionProperty::isPromoted() - Returns whether this property has been promoted from a constructor */ +/* {{{ Returns whether this property has been promoted from a constructor */ ZEND_METHOD(ReflectionProperty, isPromoted) { _property_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_PROMOTED); } /* }}} */ -/* {{{ proto public int ReflectionProperty::getModifiers() - Returns a bitfield of the access modifiers for this property */ +/* {{{ Returns a bitfield of the access modifiers for this property */ ZEND_METHOD(ReflectionProperty, getModifiers) { reflection_object *intern; @@ -5510,8 +5359,7 @@ ZEND_METHOD(ReflectionProperty, getModifiers) } /* }}} */ -/* {{{ proto public mixed ReflectionProperty::getValue([stdclass object]) - Returns this property's value */ +/* {{{ Returns this property's value */ ZEND_METHOD(ReflectionProperty, getValue) { reflection_object *intern; @@ -5564,8 +5412,7 @@ ZEND_METHOD(ReflectionProperty, getValue) } /* }}} */ -/* {{{ proto public void ReflectionProperty::setValue([stdclass object,] mixed value) - Sets this property's value */ +/* {{{ Sets this property's value */ ZEND_METHOD(ReflectionProperty, setValue) { reflection_object *intern; @@ -5601,8 +5448,7 @@ ZEND_METHOD(ReflectionProperty, setValue) } /* }}} */ -/* {{{ proto public mixed ReflectionProperty::isInitialized([stdclass object]) - Returns this property's value */ +/* {{{ Returns this property's value */ ZEND_METHOD(ReflectionProperty, isInitialized) { reflection_object *intern; @@ -5654,8 +5500,7 @@ ZEND_METHOD(ReflectionProperty, isInitialized) } /* }}} */ -/* {{{ proto public ReflectionClass ReflectionProperty::getDeclaringClass() - Get the declaring class */ +/* {{{ Get the declaring class */ ZEND_METHOD(ReflectionProperty, getDeclaringClass) { reflection_object *intern; @@ -5672,8 +5517,7 @@ ZEND_METHOD(ReflectionProperty, getDeclaringClass) } /* }}} */ -/* {{{ proto public string ReflectionProperty::getDocComment() - Returns the doc comment for this property */ +/* {{{ Returns the doc comment for this property */ ZEND_METHOD(ReflectionProperty, getDocComment) { reflection_object *intern; @@ -5690,8 +5534,7 @@ ZEND_METHOD(ReflectionProperty, getDocComment) } /* }}} */ -/* {{{ proto public array ReflectionProperty::getAttributes([ string name, int flags ]) - Returns the attributes of this property */ +/* {{{ Returns the attributes of this property */ ZEND_METHOD(ReflectionProperty, getAttributes) { reflection_object *intern; @@ -5703,8 +5546,7 @@ ZEND_METHOD(ReflectionProperty, getAttributes) } /* }}} */ -/* {{{ proto public int ReflectionProperty::setAccessible(bool visible) - Sets whether non-public properties can be requested */ +/* {{{ Sets whether non-public properties can be requested */ ZEND_METHOD(ReflectionProperty, setAccessible) { reflection_object *intern; @@ -5720,8 +5562,7 @@ ZEND_METHOD(ReflectionProperty, setAccessible) } /* }}} */ -/* {{{ proto public ReflectionType ReflectionProperty::getType() - Returns the type associated with the property */ +/* {{{ Returns the type associated with the property */ ZEND_METHOD(ReflectionProperty, getType) { reflection_object *intern; @@ -5741,8 +5582,7 @@ ZEND_METHOD(ReflectionProperty, getType) } /* }}} */ -/* {{{ proto public bool ReflectionProperty::hasType() - Returns whether property has a type */ +/* {{{ Returns whether property has a type */ ZEND_METHOD(ReflectionProperty, hasType) { reflection_object *intern; @@ -5758,8 +5598,7 @@ ZEND_METHOD(ReflectionProperty, hasType) } /* }}} */ -/* {{{ proto public bool ReflectionProperty::hasDefaultValue() - Returns whether property has a default value */ +/* {{{ Returns whether property has a default value */ ZEND_METHOD(ReflectionProperty, hasDefaultValue) { reflection_object *intern; @@ -5784,8 +5623,7 @@ ZEND_METHOD(ReflectionProperty, hasDefaultValue) } /* }}} */ -/* {{{ proto public mixed ReflectionProperty::getDefaultValue() - Returns the default value of a property */ +/* {{{ Returns the default value of a property */ ZEND_METHOD(ReflectionProperty, getDefaultValue) { reflection_object *intern; @@ -5824,8 +5662,7 @@ ZEND_METHOD(ReflectionProperty, getDefaultValue) } /* }}} */ -/* {{{ proto public void ReflectionExtension::__construct(string name) - Constructor. Throws an Exception in case the given extension does not exist */ +/* {{{ Constructor. Throws an Exception in case the given extension does not exist */ ZEND_METHOD(ReflectionExtension, __construct) { zval *object; @@ -5858,8 +5695,7 @@ ZEND_METHOD(ReflectionExtension, __construct) } /* }}} */ -/* {{{ proto public string ReflectionExtension::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionExtension, __toString) { reflection_object *intern; @@ -5875,8 +5711,7 @@ ZEND_METHOD(ReflectionExtension, __toString) } /* }}} */ -/* {{{ proto public string ReflectionExtension::getName() - Returns this extension's name */ +/* {{{ Returns this extension's name */ ZEND_METHOD(ReflectionExtension, getName) { reflection_object *intern; @@ -5891,8 +5726,7 @@ ZEND_METHOD(ReflectionExtension, getName) } /* }}} */ -/* {{{ proto public string ReflectionExtension::getVersion() - Returns this extension's version */ +/* {{{ Returns this extension's version */ ZEND_METHOD(ReflectionExtension, getVersion) { reflection_object *intern; @@ -5912,8 +5746,7 @@ ZEND_METHOD(ReflectionExtension, getVersion) } /* }}} */ -/* {{{ proto public ReflectionFunction[] ReflectionExtension::getFunctions() - Returns an array of this extension's functions */ +/* {{{ Returns an array of this extension's functions */ ZEND_METHOD(ReflectionExtension, getFunctions) { reflection_object *intern; @@ -5937,8 +5770,7 @@ ZEND_METHOD(ReflectionExtension, getFunctions) } /* }}} */ -/* {{{ proto public array ReflectionExtension::getConstants() - Returns an associative array containing this extension's constants and their values */ +/* {{{ Returns an associative array containing this extension's constants and their values */ ZEND_METHOD(ReflectionExtension, getConstants) { reflection_object *intern; @@ -5976,8 +5808,7 @@ static void _addinientry(zend_ini_entry *ini_entry, zval *retval, int number) } /* }}} */ -/* {{{ proto public array ReflectionExtension::getINIEntries() - Returns an associative array containing this extension's INI entries and their values */ +/* {{{ Returns an associative array containing this extension's INI entries and their values */ ZEND_METHOD(ReflectionExtension, getINIEntries) { reflection_object *intern; @@ -6020,8 +5851,7 @@ static void add_extension_class(zend_class_entry *ce, zend_string *key, zval *cl } /* }}} */ -/* {{{ proto public ReflectionClass[] ReflectionExtension::getClasses() - Returns an array containing ReflectionClass objects for all classes of this extension */ +/* {{{ Returns an array containing ReflectionClass objects for all classes of this extension */ ZEND_METHOD(ReflectionExtension, getClasses) { reflection_object *intern; @@ -6041,8 +5871,7 @@ ZEND_METHOD(ReflectionExtension, getClasses) } /* }}} */ -/* {{{ proto public array ReflectionExtension::getClassNames() - Returns an array containing all names of all classes of this extension */ +/* {{{ Returns an array containing all names of all classes of this extension */ ZEND_METHOD(ReflectionExtension, getClassNames) { reflection_object *intern; @@ -6062,8 +5891,7 @@ ZEND_METHOD(ReflectionExtension, getClassNames) } /* }}} */ -/* {{{ proto public array ReflectionExtension::getDependencies() - Returns an array containing all names of all extensions this extension depends on */ +/* {{{ Returns an array containing all names of all extensions this extension depends on */ ZEND_METHOD(ReflectionExtension, getDependencies) { reflection_object *intern; @@ -6128,8 +5956,7 @@ ZEND_METHOD(ReflectionExtension, getDependencies) } /* }}} */ -/* {{{ proto public void ReflectionExtension::info() - Prints phpinfo block for the extension */ +/* {{{ Prints phpinfo block for the extension */ ZEND_METHOD(ReflectionExtension, info) { reflection_object *intern; @@ -6144,8 +5971,7 @@ ZEND_METHOD(ReflectionExtension, info) } /* }}} */ -/* {{{ proto public bool ReflectionExtension::isPersistent() - Returns whether this extension is persistent */ +/* {{{ Returns whether this extension is persistent */ ZEND_METHOD(ReflectionExtension, isPersistent) { reflection_object *intern; @@ -6160,8 +5986,7 @@ ZEND_METHOD(ReflectionExtension, isPersistent) } /* }}} */ -/* {{{ proto public bool ReflectionExtension::isTemporary() - Returns whether this extension is temporary */ +/* {{{ Returns whether this extension is temporary */ ZEND_METHOD(ReflectionExtension, isTemporary) { reflection_object *intern; @@ -6176,8 +6001,7 @@ ZEND_METHOD(ReflectionExtension, isTemporary) } /* }}} */ -/* {{{ proto public void ReflectionZendExtension::__construct(string name) - Constructor. Throws an Exception in case the given Zend extension does not exist */ +/* {{{ Constructor. Throws an Exception in case the given Zend extension does not exist */ ZEND_METHOD(ReflectionZendExtension, __construct) { zval *object; @@ -6206,8 +6030,7 @@ ZEND_METHOD(ReflectionZendExtension, __construct) } /* }}} */ -/* {{{ proto public string ReflectionZendExtension::__toString() - Returns a string representation */ +/* {{{ Returns a string representation */ ZEND_METHOD(ReflectionZendExtension, __toString) { reflection_object *intern; @@ -6223,8 +6046,7 @@ ZEND_METHOD(ReflectionZendExtension, __toString) } /* }}} */ -/* {{{ proto public string ReflectionZendExtension::getName() - Returns the name of this Zend extension */ +/* {{{ Returns the name of this Zend extension */ ZEND_METHOD(ReflectionZendExtension, getName) { reflection_object *intern; @@ -6239,8 +6061,7 @@ ZEND_METHOD(ReflectionZendExtension, getName) } /* }}} */ -/* {{{ proto public string ReflectionZendExtension::getVersion() - Returns the version information of this Zend extension */ +/* {{{ Returns the version information of this Zend extension */ ZEND_METHOD(ReflectionZendExtension, getVersion) { reflection_object *intern; @@ -6259,8 +6080,7 @@ ZEND_METHOD(ReflectionZendExtension, getVersion) } /* }}} */ -/* {{{ proto public void ReflectionZendExtension::getAuthor() - * Returns the name of this Zend extension's author */ +/* {{{ Returns the name of this Zend extension's author */ ZEND_METHOD(ReflectionZendExtension, getAuthor) { reflection_object *intern; @@ -6279,8 +6099,7 @@ ZEND_METHOD(ReflectionZendExtension, getAuthor) } /* }}} */ -/* {{{ proto public void ReflectionZendExtension::getURL() - Returns this Zend extension's URL*/ +/* {{{ Returns this Zend extension's URL*/ ZEND_METHOD(ReflectionZendExtension, getURL) { reflection_object *intern; @@ -6299,8 +6118,7 @@ ZEND_METHOD(ReflectionZendExtension, getURL) } /* }}} */ -/* {{{ proto public void ReflectionZendExtension::getCopyright() - Returns this Zend extension's copyright information */ +/* {{{ Returns this Zend extension's copyright information */ ZEND_METHOD(ReflectionZendExtension, getCopyright) { reflection_object *intern; @@ -6319,8 +6137,7 @@ ZEND_METHOD(ReflectionZendExtension, getCopyright) } /* }}} */ -/* {{{ proto public ReflectionReference::__construct() - * Dummy constructor -- always throws ReflectionExceptions. */ +/* {{{ Dummy constructor -- always throws ReflectionExceptions. */ ZEND_METHOD(ReflectionReference, __construct) { _DO_THROW( @@ -6340,8 +6157,7 @@ static zend_bool is_ignorable_reference(HashTable *ht, zval *ref) { return Z_TYPE_P(Z_REFVAL_P(ref)) != IS_ARRAY || Z_ARRVAL_P(Z_REFVAL_P(ref)) != ht; } -/* {{{ proto public ReflectionReference|null ReflectionReference::fromArrayElement(array array, mixed key) - * Create ReflectionReference for array item. Returns null if not a reference. */ +/* {{{ Create ReflectionReference for array item. Returns null if not a reference. */ ZEND_METHOD(ReflectionReference, fromArrayElement) { HashTable *ht; @@ -6377,8 +6193,7 @@ ZEND_METHOD(ReflectionReference, fromArrayElement) } /* }}} */ -/* {{{ proto public int|string ReflectionReference::getId() - * Returns a unique identifier for the reference. +/* {{{ Returns a unique identifier for the reference. * The format of the return value is unspecified and may change. */ ZEND_METHOD(ReflectionReference, getId) { @@ -6424,8 +6239,7 @@ ZEND_METHOD(ReflectionAttribute, __clone) _DO_THROW("Cannot clone object using __clone()"); } -/* {{{ proto public string ReflectionAttribute::getName() - * Returns the name of the attribute */ +/* {{{ * Returns the name of the attribute */ ZEND_METHOD(ReflectionAttribute, getName) { reflection_object *intern; @@ -6440,8 +6254,7 @@ ZEND_METHOD(ReflectionAttribute, getName) } /* }}} */ -/* {{{ proto public int ReflectionAttribute::getTarget() - * Returns the target of the attribute */ +/* {{{ * Returns the target of the attribute */ ZEND_METHOD(ReflectionAttribute, getTarget) { reflection_object *intern; @@ -6456,8 +6269,7 @@ ZEND_METHOD(ReflectionAttribute, getTarget) } /* }}} */ -/* {{{ proto public bool ReflectionAttribute::isRepeated() - * Returns true if the attribute is repeated */ +/* {{{ * Returns true if the attribute is repeated */ ZEND_METHOD(ReflectionAttribute, isRepeated) { reflection_object *intern; @@ -6472,8 +6284,7 @@ ZEND_METHOD(ReflectionAttribute, isRepeated) } /* }}} */ -/* {{{ proto public array ReflectionAttribute::getArguments() - * Returns the arguments passed to the attribute */ +/* {{{ * Returns the arguments passed to the attribute */ ZEND_METHOD(ReflectionAttribute, getArguments) { reflection_object *intern; @@ -6537,8 +6348,7 @@ static void attribute_ctor_cleanup(zval *obj, zval *args, uint32_t argc) /* {{{ } /* }}} */ -/* {{{ proto public object ReflectionAttribute::newInstance() - * Returns the attribute as an object */ +/* {{{ * Returns the attribute as an object */ ZEND_METHOD(ReflectionAttribute, newInstance) { reflection_object *intern; diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c index f1a9091251..4c40028b2f 100644 --- a/ext/session/mod_user_class.c +++ b/ext/session/mod_user_class.c @@ -34,8 +34,7 @@ RETURN_FALSE; \ } -/* {{{ proto bool SessionHandler::open(string save_path, string session_name) - Wraps the old open handler */ +/* {{{ Wraps the old open handler */ PHP_METHOD(SessionHandler, open) { char *save_path = NULL, *session_name = NULL; @@ -61,8 +60,7 @@ PHP_METHOD(SessionHandler, open) } /* }}} */ -/* {{{ proto bool SessionHandler::close() - Wraps the old close handler */ +/* {{{ Wraps the old close handler */ PHP_METHOD(SessionHandler, close) { int ret; @@ -86,8 +84,7 @@ PHP_METHOD(SessionHandler, close) } /* }}} */ -/* {{{ proto bool SessionHandler::read(string id) - Wraps the old read handler */ +/* {{{ Wraps the old read handler */ PHP_METHOD(SessionHandler, read) { zend_string *val; @@ -107,8 +104,7 @@ PHP_METHOD(SessionHandler, read) } /* }}} */ -/* {{{ proto bool SessionHandler::write(string id, string data) - Wraps the old write handler */ +/* {{{ Wraps the old write handler */ PHP_METHOD(SessionHandler, write) { zend_string *key, *val; @@ -123,8 +119,7 @@ PHP_METHOD(SessionHandler, write) } /* }}} */ -/* {{{ proto bool SessionHandler::destroy(string id) - Wraps the old destroy handler */ +/* {{{ Wraps the old destroy handler */ PHP_METHOD(SessionHandler, destroy) { zend_string *key; @@ -139,8 +134,7 @@ PHP_METHOD(SessionHandler, destroy) } /* }}} */ -/* {{{ proto bool SessionHandler::gc(int maxlifetime) - Wraps the old gc handler */ +/* {{{ Wraps the old gc handler */ PHP_METHOD(SessionHandler, gc) { zend_long maxlifetime; @@ -159,8 +153,7 @@ PHP_METHOD(SessionHandler, gc) } /* }}} */ -/* {{{ proto char SessionHandler::create_sid() - Wraps the old create_sid handler */ +/* {{{ Wraps the old create_sid handler */ PHP_METHOD(SessionHandler, create_sid) { zend_string *id; diff --git a/ext/session/session.c b/ext/session/session.c index ed31912382..658b7daf9b 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -781,8 +781,7 @@ static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */ return SUCCESS; } /* }}} */ -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("session.save_path", "", PHP_INI_ALL, OnUpdateSaveDir, save_path, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.name", "PHPSESSID", PHP_INI_ALL, OnUpdateName, session_name, php_ps_globals, ps_globals) @@ -1662,8 +1661,7 @@ PHPAPI void session_adapt_url(const char *url, size_t url_len, char **new_url, s * Userspace exported functions * ******************************** */ -/* {{{ proto bool session_set_cookie_params(int lifetime [, string path [, string domain [, bool secure[, bool httponly]]]]) - session_set_cookie_params(array options) +/* {{{ session_set_cookie_params(array options) Set session cookie parameters */ PHP_FUNCTION(session_set_cookie_params) { @@ -1822,8 +1820,7 @@ cleanup: } /* }}} */ -/* {{{ proto array session_get_cookie_params(void) - Return the session cookie parameters */ +/* {{{ Return the session cookie parameters */ PHP_FUNCTION(session_get_cookie_params) { if (zend_parse_parameters_none() == FAILURE) { @@ -1841,8 +1838,7 @@ PHP_FUNCTION(session_get_cookie_params) } /* }}} */ -/* {{{ proto string session_name([string newname]) - Return the current session name. If newname is given, the session name is replaced with newname */ +/* {{{ Return the current session name. If newname is given, the session name is replaced with newname */ PHP_FUNCTION(session_name) { zend_string *name = NULL; @@ -1872,8 +1868,7 @@ PHP_FUNCTION(session_name) } /* }}} */ -/* {{{ proto string session_module_name([string newname]) - Return the current module name used for accessing session data. If newname is given, the module name is replaced with newname */ +/* {{{ Return the current module name used for accessing session data. If newname is given, the module name is replaced with newname */ PHP_FUNCTION(session_module_name) { zend_string *name = NULL; @@ -1933,8 +1928,7 @@ static int save_handler_check_session() { return SUCCESS; } -/* {{{ proto bool session_set_save_handler(string open, string close, string read, string write, string destroy, string gc, string create_sid) - Sets user-level functions */ +/* {{{ Sets user-level functions */ PHP_FUNCTION(session_set_save_handler) { zval *args = NULL; @@ -2095,8 +2089,7 @@ PHP_FUNCTION(session_set_save_handler) } /* }}} */ -/* {{{ proto string session_save_path([string newname]) - Return the current save path passed to module_name. If newname is given, the save path is replaced with newname */ +/* {{{ Return the current save path passed to module_name. If newname is given, the save path is replaced with newname */ PHP_FUNCTION(session_save_path) { zend_string *name = NULL; @@ -2126,8 +2119,7 @@ PHP_FUNCTION(session_save_path) } /* }}} */ -/* {{{ proto string session_id([string newid]) - Return the current session id. If newid is given, the session id is replaced with newid */ +/* {{{ Return the current session id. If newid is given, the session id is replaced with newid */ PHP_FUNCTION(session_id) { zend_string *name = NULL; @@ -2169,8 +2161,7 @@ PHP_FUNCTION(session_id) } /* }}} */ -/* {{{ proto bool session_regenerate_id([bool delete_old_session]) - Update the current session id with a newly generated one. If delete_old_session is set to true, remove the old session. */ +/* {{{ Update the current session id with a newly generated one. If delete_old_session is set to true, remove the old session. */ PHP_FUNCTION(session_regenerate_id) { zend_bool del_ses = 0; @@ -2269,8 +2260,7 @@ PHP_FUNCTION(session_regenerate_id) } /* }}} */ -/* {{{ proto string session_create_id([string prefix]) - Generate new session ID. Intended for user save handlers. */ +/* {{{ Generate new session ID. Intended for user save handlers. */ /* This is not used yet */ PHP_FUNCTION(session_create_id) { @@ -2324,8 +2314,7 @@ PHP_FUNCTION(session_create_id) } /* }}} */ -/* {{{ proto string session_cache_limiter([string new_cache_limiter]) - Return the current cache limiter. If new_cache_limited is given, the current cache_limiter is replaced with new_cache_limiter */ +/* {{{ Return the current cache limiter. If new_cache_limited is given, the current cache_limiter is replaced with new_cache_limiter */ PHP_FUNCTION(session_cache_limiter) { zend_string *limiter = NULL; @@ -2355,8 +2344,7 @@ PHP_FUNCTION(session_cache_limiter) } /* }}} */ -/* {{{ proto int session_cache_expire([int new_cache_expire]) - Return the current cache expire. If new_cache_expire is given, the current cache_expire is replaced with new_cache_expire */ +/* {{{ Return the current cache expire. If new_cache_expire is given, the current cache_expire is replaced with new_cache_expire */ PHP_FUNCTION(session_cache_expire) { zend_long expires; @@ -2388,8 +2376,7 @@ PHP_FUNCTION(session_cache_expire) } /* }}} */ -/* {{{ proto string session_encode(void) - Serializes the current setup and returns the serialized representation */ +/* {{{ Serializes the current setup and returns the serialized representation */ PHP_FUNCTION(session_encode) { zend_string *enc; @@ -2407,8 +2394,7 @@ PHP_FUNCTION(session_encode) } /* }}} */ -/* {{{ proto bool session_decode(string data) - Deserializes data and reinitializes the variables */ +/* {{{ Deserializes data and reinitializes the variables */ PHP_FUNCTION(session_decode) { zend_string *str = NULL; @@ -2441,8 +2427,7 @@ static int php_session_start_set_ini(zend_string *varname, zend_string *new_valu return ret; } -/* {{{ proto bool session_start([array options]) -+ Begin session */ +/* {{{ + Begin session */ PHP_FUNCTION(session_start) { zval *options = NULL; @@ -2519,8 +2504,7 @@ PHP_FUNCTION(session_start) } /* }}} */ -/* {{{ proto bool session_destroy(void) - Destroy the current session and all data associated with it */ +/* {{{ Destroy the current session and all data associated with it */ PHP_FUNCTION(session_destroy) { if (zend_parse_parameters_none() == FAILURE) { @@ -2531,8 +2515,7 @@ PHP_FUNCTION(session_destroy) } /* }}} */ -/* {{{ proto bool session_unset(void) - Unset all registered variables */ +/* {{{ Unset all registered variables */ PHP_FUNCTION(session_unset) { if (zend_parse_parameters_none() == FAILURE) { @@ -2554,8 +2537,7 @@ PHP_FUNCTION(session_unset) } /* }}} */ -/* {{{ proto int session_gc(void) - Perform GC and return number of deleted sessions */ +/* {{{ Perform GC and return number of deleted sessions */ PHP_FUNCTION(session_gc) { zend_long num; @@ -2579,8 +2561,7 @@ PHP_FUNCTION(session_gc) /* }}} */ -/* {{{ proto bool session_write_close(void) - Write session data and end session */ +/* {{{ Write session data and end session */ PHP_FUNCTION(session_write_close) { if (zend_parse_parameters_none() == FAILURE) { @@ -2595,8 +2576,7 @@ PHP_FUNCTION(session_write_close) } /* }}} */ -/* {{{ proto bool session_abort(void) - Abort session and end session. Session data will not be written */ +/* {{{ Abort session and end session. Session data will not be written */ PHP_FUNCTION(session_abort) { if (zend_parse_parameters_none() == FAILURE) { @@ -2611,8 +2591,7 @@ PHP_FUNCTION(session_abort) } /* }}} */ -/* {{{ proto bool session_reset(void) - Reset session data from saved session data */ +/* {{{ Reset session data from saved session data */ PHP_FUNCTION(session_reset) { if (zend_parse_parameters_none() == FAILURE) { @@ -2627,8 +2606,7 @@ PHP_FUNCTION(session_reset) } /* }}} */ -/* {{{ proto int session_status(void) - Returns the current session status */ +/* {{{ Returns the current session status */ PHP_FUNCTION(session_status) { if (zend_parse_parameters_none() == FAILURE) { @@ -2639,8 +2617,7 @@ PHP_FUNCTION(session_status) } /* }}} */ -/* {{{ proto void session_register_shutdown(void) - Registers session_write_close() as a shutdown function */ +/* {{{ Registers session_write_close() as a shutdown function */ PHP_FUNCTION(session_register_shutdown) { php_shutdown_function_entry shutdown_function_entry; diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index 97e4491766..7cd66f8300 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -39,8 +39,7 @@ #include "ext/standard/info.h" -/* {{{ shmop_module_entry - */ +/* {{{ shmop_module_entry */ zend_module_entry shmop_module_entry = { STANDARD_MODULE_HEADER, "shmop", @@ -106,8 +105,7 @@ static void shmop_free_obj(zend_object *object) zend_object_std_dtor(&shmop->std); } -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(shmop) { zend_class_entry ce; @@ -128,8 +126,7 @@ PHP_MINIT_FUNCTION(shmop) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(shmop) { php_info_print_table_start(); @@ -138,8 +135,7 @@ PHP_MINFO_FUNCTION(shmop) } /* }}} */ -/* {{{ proto Shmop shmop_open(int key, string flags, int mode, int size) - gets and attaches a shared memory segment */ +/* {{{ gets and attaches a shared memory segment */ PHP_FUNCTION(shmop_open) { zend_long key, mode, size; @@ -223,8 +219,7 @@ err: } /* }}} */ -/* {{{ proto string shmop_read(Shmop shmid, int start, int count) - reads from a shm segment */ +/* {{{ reads from a shm segment */ PHP_FUNCTION(shmop_read) { zval *shmid; @@ -259,8 +254,7 @@ PHP_FUNCTION(shmop_read) } /* }}} */ -/* {{{ proto void shmop_close(Shmop shmid) - used to close a shared memory segment; now a NOP */ +/* {{{ used to close a shared memory segment; now a NOP */ PHP_FUNCTION(shmop_close) { zval *shmid; @@ -271,8 +265,7 @@ PHP_FUNCTION(shmop_close) } /* }}} */ -/* {{{ proto int shmop_size(Shmop shmid) - returns the shm size */ +/* {{{ returns the shm size */ PHP_FUNCTION(shmop_size) { zval *shmid; @@ -288,8 +281,7 @@ PHP_FUNCTION(shmop_size) } /* }}} */ -/* {{{ proto int shmop_write(Shmop shmid, string data, int offset) - writes to a shared memory segment */ +/* {{{ writes to a shared memory segment */ PHP_FUNCTION(shmop_write) { php_shmop *shmop; @@ -321,8 +313,7 @@ PHP_FUNCTION(shmop_write) } /* }}} */ -/* {{{ proto bool shmop_delete(Shmop shmid) - mark segment for deletion */ +/* {{{ mark segment for deletion */ PHP_FUNCTION(shmop_delete) { zval *shmid; diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 6a2e2b95c2..8568a3ffe7 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -59,8 +59,7 @@ static void php_sxe_iterator_move_forward(zend_object_iterator *iter); static void php_sxe_iterator_rewind(zend_object_iterator *iter); static int sxe_object_cast_ex(zend_object *readobj, zval *writeobj, int type); -/* {{{ _node_as_zval() - */ +/* {{{ _node_as_zval() */ static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix) { php_sxe_object *subnode; @@ -227,8 +226,7 @@ next_iter: } /* }}} */ -/* {{{ sxe_prop_dim_read() - */ +/* {{{ sxe_prop_dim_read() */ static zval *sxe_prop_dim_read(zend_object *object, zval *member, zend_bool elements, zend_bool attribs, int type, zval *rv) { php_sxe_object *sxe; @@ -368,8 +366,7 @@ long_dim: } /* }}} */ -/* {{{ sxe_property_read() - */ +/* {{{ sxe_property_read() */ static zval *sxe_property_read(zend_object *object, zend_string *name, int type, void **cache_slot, zval *rv) { zval member; @@ -378,16 +375,14 @@ static zval *sxe_property_read(zend_object *object, zend_string *name, int type, } /* }}} */ -/* {{{ sxe_dimension_read() - */ +/* {{{ sxe_dimension_read() */ static zval *sxe_dimension_read(zend_object *object, zval *offset, int type, zval *rv) { return sxe_prop_dim_read(object, offset, 0, 1, type, rv); } /* }}} */ -/* {{{ change_node_zval() - */ +/* {{{ change_node_zval() */ static void change_node_zval(xmlNodePtr node, zval *value) { xmlChar *buffer; @@ -420,8 +415,7 @@ static void change_node_zval(xmlNodePtr node, zval *value) } /* }}} */ -/* {{{ sxe_property_write() - */ +/* {{{ sxe_property_write() */ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value, zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode) { php_sxe_object *sxe; @@ -662,8 +656,7 @@ next_iter: } /* }}} */ -/* {{{ sxe_property_write() - */ +/* {{{ sxe_property_write() */ static zval *sxe_property_write(zend_object *object, zend_string *name, zval *value, void **cache_slot) { zval member; @@ -673,8 +666,7 @@ static zval *sxe_property_write(zend_object *object, zend_string *name, zval *va } /* }}} */ -/* {{{ sxe_dimension_write() - */ +/* {{{ sxe_dimension_write() */ static void sxe_dimension_write(zend_object *object, zval *offset, zval *value) { sxe_prop_dim_write(object, offset, value, 0, 1, NULL); @@ -716,8 +708,7 @@ static zval *sxe_property_get_adr(zend_object *object, zend_string *zname, int f } /* }}} */ -/* {{{ sxe_prop_dim_exists() - */ +/* {{{ sxe_prop_dim_exists() */ static int sxe_prop_dim_exists(zend_object *object, zval *member, int check_empty, zend_bool elements, zend_bool attribs) { php_sxe_object *sxe; @@ -822,8 +813,7 @@ static int sxe_prop_dim_exists(zend_object *object, zval *member, int check_empt } /* }}} */ -/* {{{ sxe_property_exists() - */ +/* {{{ sxe_property_exists() */ static int sxe_property_exists(zend_object *object, zend_string *name, int check_empty, void **cache_slot) { zval member; @@ -832,16 +822,14 @@ static int sxe_property_exists(zend_object *object, zend_string *name, int check } /* }}} */ -/* {{{ sxe_dimension_exists() - */ +/* {{{ sxe_dimension_exists() */ static int sxe_dimension_exists(zend_object *object, zval *member, int check_empty) { return sxe_prop_dim_exists(object, member, check_empty, 0, 1); } /* }}} */ -/* {{{ sxe_prop_dim_delete() - */ +/* {{{ sxe_prop_dim_delete() */ static void sxe_prop_dim_delete(zend_object *object, zval *member, zend_bool elements, zend_bool attribs) { php_sxe_object *sxe; @@ -951,8 +939,7 @@ next_iter: } /* }}} */ -/* {{{ sxe_property_delete() - */ +/* {{{ sxe_property_delete() */ static void sxe_property_delete(zend_object *object, zend_string *name, void **cache_slot) { zval member; @@ -961,8 +948,7 @@ static void sxe_property_delete(zend_object *object, zend_string *name, void **c } /* }}} */ -/* {{{ sxe_dimension_unset() - */ +/* {{{ sxe_dimension_unset() */ static void sxe_dimension_delete(zend_object *object, zval *offset) { sxe_prop_dim_delete(object, offset, 0, 1); @@ -985,8 +971,7 @@ static inline zend_string *sxe_xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr li } /* }}} */ -/* {{{ _get_base_node_value() - */ +/* {{{ _get_base_node_value() */ static void _get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval *value, xmlChar *nsprefix, int isprefix) { php_sxe_object *subnode; @@ -1314,8 +1299,7 @@ static int sxe_objects_compare(zval *object1, zval *object2) /* {{{ */ } /* }}} */ -/* {{{ proto array SimpleXMLElement::xpath(string path) - Runs XPath query on the XML data */ +/* {{{ Runs XPath query on the XML data */ SXE_METHOD(xpath) { php_sxe_object *sxe; @@ -1406,8 +1390,7 @@ SXE_METHOD(xpath) } /* }}} */ -/* {{{ proto bool SimpleXMLElement::registerXPathNamespace(string prefix, string ns) - Creates a prefix/ns context for the next XPath query */ +/* {{{ Creates a prefix/ns context for the next XPath query */ SXE_METHOD(registerXPathNamespace) { php_sxe_object *sxe; @@ -1431,8 +1414,7 @@ SXE_METHOD(registerXPathNamespace) /* }}} */ -/* {{{ proto string SimpleXMLElement::asXML([string filename]) - Return a well-formed XML string based on SimpleXML element */ +/* {{{ Return a well-formed XML string based on SimpleXML element */ SXE_METHOD(asXML) { php_sxe_object *sxe; @@ -1557,8 +1539,7 @@ static void sxe_add_namespaces(php_sxe_object *sxe, xmlNodePtr node, zend_bool r } } /* }}} */ -/* {{{ proto string SimpleXMLElement::getNamespaces([bool recursve]) - Return all namespaces in use */ +/* {{{ Return all namespaces in use */ SXE_METHOD(getNamespaces) { zend_bool recursive = 0; @@ -1606,8 +1587,7 @@ static void sxe_add_registered_namespaces(php_sxe_object *sxe, xmlNodePtr node, } /* }}} */ -/* {{{ proto string SimpleXMLElement::getDocNamespaces([bool recursive [, bool from_root]) - Return all namespaces registered with document */ +/* {{{ Return all namespaces registered with document */ SXE_METHOD(getDocNamespaces) { zend_bool recursive = 0, from_root = 1; @@ -1634,8 +1614,7 @@ SXE_METHOD(getDocNamespaces) } /* }}} */ -/* {{{ proto object SimpleXMLElement::children([string ns [, bool is_prefix]]) - Finds children of given node */ +/* {{{ Finds children of given node */ SXE_METHOD(children) { php_sxe_object *sxe; @@ -1662,8 +1641,7 @@ SXE_METHOD(children) } /* }}} */ -/* {{{ proto object SimpleXMLElement::getName() - Finds children of given node */ +/* {{{ Finds children of given node */ SXE_METHOD(getName) { php_sxe_object *sxe; @@ -1687,8 +1665,7 @@ SXE_METHOD(getName) } /* }}} */ -/* {{{ proto array SimpleXMLElement::attributes([string ns [, bool is_prefix]]) - Identifies an element's attributes */ +/* {{{ Identifies an element's attributes */ SXE_METHOD(attributes) { php_sxe_object *sxe; @@ -1714,8 +1691,7 @@ SXE_METHOD(attributes) } /* }}} */ -/* {{{ proto void SimpleXMLElement::addChild(string qName [, string value [, string ns]]) - Add Element with optional namespace information */ +/* {{{ Add Element with optional namespace information */ SXE_METHOD(addChild) { php_sxe_object *sxe; @@ -1779,8 +1755,7 @@ SXE_METHOD(addChild) } /* }}} */ -/* {{{ proto void SimpleXMLElement::addAttribute(string qName, string value [,string ns]) - Add Attribute with optional namespace information */ +/* {{{ Add Attribute with optional namespace information */ SXE_METHOD(addAttribute) { php_sxe_object *sxe; @@ -1853,8 +1828,7 @@ SXE_METHOD(addAttribute) } /* }}} */ -/* {{{ cast_object() - */ +/* {{{ cast_object() */ static int cast_object(zval *object, int type, char *contents) { if (contents) { @@ -1886,8 +1860,7 @@ static int cast_object(zval *object, int type, char *contents) } /* }}} */ -/* {{{ sxe_object_cast() - */ +/* {{{ sxe_object_cast() */ static int sxe_object_cast_ex(zend_object *readobj, zval *writeobj, int type) { php_sxe_object *sxe; @@ -1949,8 +1922,7 @@ static int sxe_object_cast(zend_object *readobj, zval *writeobj, int type) } /* }}} */ -/* {{{ proto object SimpleXMLElement::__toString() - Returns the string content */ +/* {{{ Returns the string content */ SXE_METHOD(__toString) { if (zend_parse_parameters_none() == FAILURE) { @@ -2009,8 +1981,7 @@ static int sxe_count_elements(zend_object *object, zend_long *count) /* {{{ */ } /* }}} */ -/* {{{ proto int SimpleXMLElement::count() - Get number of child elements */ +/* {{{ Get number of child elements */ SXE_METHOD(count) { zend_long count = 0; @@ -2027,8 +1998,7 @@ SXE_METHOD(count) /* }}} */ -/* {{{ proto void SimpleXMLElement::rewind() - Rewind to first element */ +/* {{{ Rewind to first element */ SXE_METHOD(rewind) { if (zend_parse_parameters_none() == FAILURE) { @@ -2039,8 +2009,7 @@ SXE_METHOD(rewind) } /* }}} */ -/* {{{ proto bool SimpleXMLElement::valid() - Check whether iteration is valid */ +/* {{{ Check whether iteration is valid */ SXE_METHOD(valid) { php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS); @@ -2053,8 +2022,7 @@ SXE_METHOD(valid) } /* }}} */ -/* {{{ proto SimpleXMLElement SimpleXMLElement::current() - Get current element */ +/* {{{ Get current element */ SXE_METHOD(current) { php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS); @@ -2073,8 +2041,7 @@ SXE_METHOD(current) } /* }}} */ -/* {{{ proto string SimpleXMLElement::key() - Get name of current child element */ +/* {{{ Get name of current child element */ SXE_METHOD(key) { xmlNodePtr curnode; @@ -2099,8 +2066,7 @@ SXE_METHOD(key) } /* }}} */ -/* {{{ proto void SimpleXMLElement::next() - Move to next element */ +/* {{{ Move to next element */ SXE_METHOD(next) { if (zend_parse_parameters_none() == FAILURE) { @@ -2111,8 +2077,7 @@ SXE_METHOD(next) } /* }}} */ -/* {{{ proto bool SimpleXMLElement::hasChildren() - Check whether element has children (elements) */ +/* {{{ Check whether element has children (elements) */ SXE_METHOD(hasChildren) { php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS); @@ -2139,8 +2104,7 @@ SXE_METHOD(hasChildren) } /* }}} */ -/* {{{ proto SimpleXMLElement SimpleXMLElement::getChildren() - Get child element iterator */ +/* {{{ Get child element iterator */ SXE_METHOD(getChildren) { php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS); @@ -2160,8 +2124,7 @@ SXE_METHOD(getChildren) static zend_object_handlers sxe_object_handlers; -/* {{{ sxe_object_clone() - */ +/* {{{ sxe_object_clone() */ static zend_object * sxe_object_clone(zend_object *object) { @@ -2208,8 +2171,7 @@ sxe_object_clone(zend_object *object) } /* }}} */ -/* {{{ sxe_object_dtor() - */ +/* {{{ sxe_object_dtor() */ static void sxe_object_dtor(zend_object *object) { /* dtor required to cleanup iterator related data properly */ @@ -2237,8 +2199,7 @@ static void sxe_object_dtor(zend_object *object) } /* }}} */ -/* {{{ sxe_object_free_storage() - */ +/* {{{ sxe_object_free_storage() */ static void sxe_object_free_storage(zend_object *object) { php_sxe_object *sxe; @@ -2260,8 +2221,7 @@ static void sxe_object_free_storage(zend_object *object) } /* }}} */ -/* {{{ php_sxe_find_fptr_count() - */ +/* {{{ php_sxe_find_fptr_count() */ static zend_function* php_sxe_find_fptr_count(zend_class_entry *ce) { zend_function *fptr_count = NULL; @@ -2287,8 +2247,7 @@ static zend_function* php_sxe_find_fptr_count(zend_class_entry *ce) } /* }}} */ -/* {{{ php_sxe_object_new() - */ +/* {{{ php_sxe_object_new() */ static php_sxe_object* php_sxe_object_new(zend_class_entry *ce, zend_function *fptr_count) { php_sxe_object *intern; @@ -2308,8 +2267,7 @@ static php_sxe_object* php_sxe_object_new(zend_class_entry *ce, zend_function *f } /* }}} */ -/* {{{ sxe_object_new() - */ +/* {{{ sxe_object_new() */ PHP_SXE_API zend_object * sxe_object_new(zend_class_entry *ce) { @@ -2320,8 +2278,7 @@ sxe_object_new(zend_class_entry *ce) } /* }}} */ -/* {{{ proto simplemxml_element simplexml_load_file(string filename [, string class_name [, int options [, string ns [, bool is_prefix]]]]) - Load a filename and return a simplexml_element object to allow for processing */ +/* {{{ Load a filename and return a simplexml_element object to allow for processing */ PHP_FUNCTION(simplexml_load_file) { php_sxe_object *sxe; @@ -2366,8 +2323,7 @@ PHP_FUNCTION(simplexml_load_file) } /* }}} */ -/* {{{ proto simplemxml_element simplexml_load_string(string data [, string class_name [, int options [, string ns [, bool is_prefix]]]]) - Load a string and return a simplexml_element object to allow for processing */ +/* {{{ Load a string and return a simplexml_element object to allow for processing */ PHP_FUNCTION(simplexml_load_string) { php_sxe_object *sxe; @@ -2420,8 +2376,7 @@ PHP_FUNCTION(simplexml_load_string) } /* }}} */ -/* {{{ proto SimpleXMLElement::__construct(string data [, int options [, bool data_is_url [, string ns [, bool is_prefix]]]]) - SimpleXMLElement constructor */ +/* {{{ SimpleXMLElement constructor */ SXE_METHOD(__construct) { php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS); @@ -2673,8 +2628,7 @@ void *simplexml_export_node(zval *object) /* {{{ */ } /* }}} */ -/* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string class_name]) - Get a simplexml_element object from dom to allow for processing */ +/* {{{ Get a simplexml_element object from dom to allow for processing */ PHP_FUNCTION(simplexml_import_dom) { php_sxe_object *sxe; @@ -2748,8 +2702,7 @@ zend_module_entry simplexml_module_entry = { /* {{{ */ ZEND_GET_MODULE(simplexml) #endif -/* {{{ PHP_MINIT_FUNCTION(simplexml) - */ +/* {{{ PHP_MINIT_FUNCTION(simplexml) */ PHP_MINIT_FUNCTION(simplexml) { zend_class_entry ce; @@ -2798,8 +2751,7 @@ PHP_MINIT_FUNCTION(simplexml) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml) - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml) */ PHP_MSHUTDOWN_FUNCTION(simplexml) { sxe_class_entry = NULL; @@ -2807,8 +2759,7 @@ PHP_MSHUTDOWN_FUNCTION(simplexml) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION(simplexml) - */ +/* {{{ PHP_MINFO_FUNCTION(simplexml) */ PHP_MINFO_FUNCTION(simplexml) { php_info_print_table_start(); diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index ec8f762cfd..a11914cdf5 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -16,8 +16,7 @@ ZEND_PARSE_PARAMETERS_END() #endif -/* {{{ void test1() - */ +/* {{{ void test1() */ PHP_FUNCTION(test1) { ZEND_PARSE_PARAMETERS_NONE(); @@ -26,8 +25,7 @@ PHP_FUNCTION(test1) } /* }}} */ -/* {{{ string test2( [ string $var ] ) - */ +/* {{{ string test2( [ string $var ] ) */ PHP_FUNCTION(test2) { char *var = "World"; @@ -45,8 +43,7 @@ PHP_FUNCTION(test2) } /* }}}*/ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(%EXTNAME%) { #if defined(ZTS) && defined(COMPILE_DL_%EXTNAMECAPS%) @@ -57,8 +54,7 @@ PHP_RINIT_FUNCTION(%EXTNAME%) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(%EXTNAME%) { php_info_print_table_start(); @@ -67,8 +63,7 @@ PHP_MINFO_FUNCTION(%EXTNAME%) } /* }}} */ -/* {{{ %EXTNAME%_module_entry - */ +/* {{{ %EXTNAME%_module_entry */ zend_module_entry %EXTNAME%_module_entry = { STANDARD_MODULE_HEADER, "%EXTNAME%", /* Extension name */ diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 9d9f231b19..f948dda74c 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -158,8 +158,7 @@ ZEND_GET_MODULE(snmp) /* THREAD_LS snmp_module php_snmp_module; - may need one of these at some point */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(snmp) { snmp_globals->valueretrieval = SNMP_VALUE_LIBRARY; @@ -1240,48 +1239,42 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) } /* }}} */ -/* {{{ proto mixed snmpget(string host, string community, mixed object_id [, int timeout [, int retries]]) - Fetch a SNMP object */ +/* {{{ Fetch a SNMP object */ PHP_FUNCTION(snmpget) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_1); } /* }}} */ -/* {{{ proto mixed snmpgetnext(string host, string community, mixed object_id [, int timeout [, int retries]]) - Fetch a SNMP object */ +/* {{{ Fetch a SNMP object */ PHP_FUNCTION(snmpgetnext) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_1); } /* }}} */ -/* {{{ proto mixed snmpwalk(string host, string community, mixed object_id [, int timeout [, int retries]]) - Return all objects under the specified object id */ +/* {{{ Return all objects under the specified object id */ PHP_FUNCTION(snmpwalk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_1); } /* }}} */ -/* {{{ proto mixed snmprealwalk(string host, string community, mixed object_id [, int timeout [, int retries]]) - Return all objects including their respective object id within the specified one */ +/* {{{ Return all objects including their respective object id within the specified one */ PHP_FUNCTION(snmprealwalk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_1); } /* }}} */ -/* {{{ proto bool snmpset(string host, string community, mixed object_id, mixed type, mixed value [, int timeout [, int retries]]) - Set the value of a SNMP object */ +/* {{{ Set the value of a SNMP object */ PHP_FUNCTION(snmpset) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_1); } /* }}} */ -/* {{{ proto bool snmp_get_quick_print(void) - Return the current status of quick_print */ +/* {{{ Return the current status of quick_print */ PHP_FUNCTION(snmp_get_quick_print) { if (zend_parse_parameters_none() == FAILURE) { @@ -1292,8 +1285,7 @@ PHP_FUNCTION(snmp_get_quick_print) } /* }}} */ -/* {{{ proto bool snmp_set_quick_print(int quick_print) - Return all objects including their respective object id within the specified one */ +/* {{{ Return all objects including their respective object id within the specified one */ PHP_FUNCTION(snmp_set_quick_print) { zend_long a1; @@ -1307,8 +1299,7 @@ PHP_FUNCTION(snmp_set_quick_print) } /* }}} */ -/* {{{ proto bool snmp_set_enum_print(int enum_print) - Return all values that are enums with their enum value instead of the raw integer */ +/* {{{ Return all values that are enums with their enum value instead of the raw integer */ PHP_FUNCTION(snmp_set_enum_print) { zend_long a1; @@ -1322,8 +1313,7 @@ PHP_FUNCTION(snmp_set_enum_print) } /* }}} */ -/* {{{ proto bool snmp_set_oid_output_format(int oid_format) - Set the OID output format. */ +/* {{{ Set the OID output format. */ PHP_FUNCTION(snmp_set_oid_output_format) { zend_long a1; @@ -1350,88 +1340,77 @@ PHP_FUNCTION(snmp_set_oid_output_format) } /* }}} */ -/* {{{ proto mixed snmp2_get(string host, string community, mixed object_id [, int timeout [, int retries]]) - Fetch a SNMP object */ +/* {{{ Fetch a SNMP object */ PHP_FUNCTION(snmp2_get) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_2c); } /* }}} */ -/* {{{ proto mixed snmp2_getnext(string host, string community, mixed object_id [, int timeout [, int retries]]) - Fetch a SNMP object */ +/* {{{ Fetch a SNMP object */ PHP_FUNCTION(snmp2_getnext) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_2c); } /* }}} */ -/* {{{ proto mixed snmp2_walk(string host, string community, mixed object_id [, int timeout [, int retries]]) - Return all objects under the specified object id */ +/* {{{ Return all objects under the specified object id */ PHP_FUNCTION(snmp2_walk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_2c); } /* }}} */ -/* {{{ proto mixed snmp2_real_walk(string host, string community, mixed object_id [, int timeout [, int retries]]) - Return all objects including their respective object id within the specified one */ +/* {{{ Return all objects including their respective object id within the specified one */ PHP_FUNCTION(snmp2_real_walk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_2c); } /* }}} */ -/* {{{ proto bool snmp2_set(string host, string community, mixed object_id, mixed type, mixed value [, int timeout [, int retries]]) - Set the value of a SNMP object */ +/* {{{ Set the value of a SNMP object */ PHP_FUNCTION(snmp2_set) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_2c); } /* }}} */ -/* {{{ proto mixed snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]]) - Fetch the value of a SNMP object */ +/* {{{ Fetch the value of a SNMP object */ PHP_FUNCTION(snmp3_get) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, SNMP_VERSION_3); } /* }}} */ -/* {{{ proto mixed snmp3_getnext(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]]) - Fetch the value of a SNMP object */ +/* {{{ Fetch the value of a SNMP object */ PHP_FUNCTION(snmp3_getnext) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, SNMP_VERSION_3); } /* }}} */ -/* {{{ proto mixed snmp3_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]]) - Fetch the value of a SNMP object */ +/* {{{ Fetch the value of a SNMP object */ PHP_FUNCTION(snmp3_walk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, (SNMP_CMD_WALK | SNMP_NUMERIC_KEYS), SNMP_VERSION_3); } /* }}} */ -/* {{{ proto mixed snmp3_real_walk(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id [, int timeout [, int retries]]) - Fetch the value of a SNMP object */ +/* {{{ Fetch the value of a SNMP object */ PHP_FUNCTION(snmp3_real_walk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, SNMP_VERSION_3); } /* }}} */ -/* {{{ proto bool snmp3_set(string host, string sec_name, string sec_level, string auth_protocol, string auth_passphrase, string priv_protocol, string priv_passphrase, mixed object_id, mixed type, mixed value [, int timeout [, int retries]]) - Fetch the value of a SNMP object */ +/* {{{ Fetch the value of a SNMP object */ PHP_FUNCTION(snmp3_set) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, SNMP_VERSION_3); } /* }}} */ -/* {{{ proto bool snmp_set_valueretrieval(int method) - Specify the method how the SNMP values will be returned */ +/* {{{ Specify the method how the SNMP values will be returned */ PHP_FUNCTION(snmp_set_valueretrieval) { zend_long method; @@ -1450,8 +1429,7 @@ PHP_FUNCTION(snmp_set_valueretrieval) } /* }}} */ -/* {{{ proto int snmp_get_valueretrieval() - Return the method how the SNMP values will be returned */ +/* {{{ Return the method how the SNMP values will be returned */ PHP_FUNCTION(snmp_get_valueretrieval) { if (zend_parse_parameters_none() == FAILURE) { @@ -1462,8 +1440,7 @@ PHP_FUNCTION(snmp_get_valueretrieval) } /* }}} */ -/* {{{ proto bool snmp_read_mib(string filename) - Reads and parses a MIB file into the active MIB tree. */ +/* {{{ Reads and parses a MIB file into the active MIB tree. */ PHP_FUNCTION(snmp_read_mib) { char *filename; @@ -1482,8 +1459,7 @@ PHP_FUNCTION(snmp_read_mib) } /* }}} */ -/* {{{ proto SNMP::__construct(int version, string hostname, string community|securityName [, int timeout [, int retries]]) - Creates a new SNMP session to specified host. */ +/* {{{ Creates a new SNMP session to specified host. */ PHP_METHOD(SNMP, __construct) { php_snmp_object *snmp_object; @@ -1529,8 +1505,7 @@ PHP_METHOD(SNMP, __construct) } /* }}} */ -/* {{{ proto bool SNMP::close() - Close SNMP session */ +/* {{{ Close SNMP session */ PHP_METHOD(SNMP, close) { php_snmp_object *snmp_object; @@ -1548,40 +1523,35 @@ PHP_METHOD(SNMP, close) } /* }}} */ -/* {{{ proto mixed SNMP::get(mixed object_id [, bool preserve_keys]) - Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ +/* {{{ Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ PHP_METHOD(SNMP, get) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, (-1)); } /* }}} */ -/* {{{ proto mixed SNMP::getnext(mixed object_id) - Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ +/* {{{ Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ PHP_METHOD(SNMP, getnext) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, (-1)); } /* }}} */ -/* {{{ proto mixed SNMP::walk(mixed object_id [, bool $suffix_as_key = FALSE [, int $max_repetitions [, int $non_repeaters]]) - Return all objects including their respective object id within the specified one as array of oid->value pairs */ +/* {{{ Return all objects including their respective object id within the specified one as array of oid->value pairs */ PHP_METHOD(SNMP, walk) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_WALK, (-1)); } /* }}} */ -/* {{{ proto bool SNMP::set(mixed object_id, mixed type, mixed value) - Set the value of a SNMP object */ +/* {{{ Set the value of a SNMP object */ PHP_METHOD(SNMP, set) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_SET, (-1)); } /* }}} */ -/* {{{ proto bool SNMP::setSecurity(string sec_level, [ string auth_protocol, string auth_passphrase [, string priv_protocol, string priv_passphrase [, string contextName [, string contextEngineID]]]]) - Set SNMPv3 security-related session parameters */ +/* {{{ Set SNMPv3 security-related session parameters */ PHP_METHOD(SNMP, setSecurity) { php_snmp_object *snmp_object; @@ -1605,8 +1575,7 @@ PHP_METHOD(SNMP, setSecurity) } /* }}} */ -/* {{{ proto int SNMP::getErrno() - Get last error code number */ +/* {{{ Get last error code number */ PHP_METHOD(SNMP, getErrno) { php_snmp_object *snmp_object; @@ -1623,8 +1592,7 @@ PHP_METHOD(SNMP, getErrno) } /* }}} */ -/* {{{ proto int SNMP::getError() - Get last error message */ +/* {{{ Get last error message */ PHP_METHOD(SNMP, getError) { php_snmp_object *snmp_object; @@ -1962,8 +1930,7 @@ const php_snmp_prop_handler php_snmp_property_entries[] = { }; /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(snmp) { netsnmp_log_handler *logh; @@ -2052,8 +2019,7 @@ PHP_MINIT_FUNCTION(snmp) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(snmp) { snmp_shutdown("snmpapp"); @@ -2064,8 +2030,7 @@ PHP_MSHUTDOWN_FUNCTION(snmp) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(snmp) { php_info_print_table_start(); @@ -2075,16 +2040,14 @@ PHP_MINFO_FUNCTION(snmp) } /* }}} */ -/* {{{ snmp_module_deps[] - */ +/* {{{ snmp_module_deps[] */ static const zend_module_dep snmp_module_deps[] = { ZEND_MOD_REQUIRED("spl") ZEND_MOD_END }; /* }}} */ -/* {{{ snmp_module_entry - */ +/* {{{ snmp_module_entry */ zend_module_entry snmp_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 1cc6d31ec0..a18f085c07 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -513,8 +513,7 @@ PHP_MINFO_FUNCTION(soap) } -/* {{{ proto object SoapParam::__construct(mixed data, string name) - SoapParam constructor */ +/* {{{ SoapParam constructor */ PHP_METHOD(SoapParam, __construct) { zval *data; @@ -537,8 +536,7 @@ PHP_METHOD(SoapParam, __construct) /* }}} */ -/* {{{ proto object SoapHeader::__construct(string namespace, string name [, mixed data [, bool mustUnderstand [, mixed actor]]]) - SoapHeader constructor */ +/* {{{ SoapHeader constructor */ PHP_METHOD(SoapHeader, __construct) { zval *data = NULL, *actor = NULL; @@ -580,8 +578,7 @@ PHP_METHOD(SoapHeader, __construct) } /* }}} */ -/* {{{ proto object SoapFault::__construct(string faultcode, string faultstring [, string faultactor [, mixed detail [, string faultname [, mixed headerfault]]]]) - SoapFault constructor */ +/* {{{ SoapFault constructor */ PHP_METHOD(SoapFault, __construct) { char *fault_string = NULL, *fault_code = NULL, *fault_actor = NULL, *name = NULL, *fault_code_ns = NULL; @@ -631,8 +628,7 @@ PHP_METHOD(SoapFault, __construct) } /* }}} */ -/* {{{ proto object SoapFault::SoapFault(string faultcode, string faultstring [, string faultactor [, mixed detail [, string faultname [, mixed headerfault]]]]) - SoapFault constructor */ +/* {{{ SoapFault constructor */ PHP_METHOD(SoapFault, __toString) { zval *faultcode, *faultstring, *file, *line, trace, rv1, rv2, rv3, rv4; @@ -683,8 +679,7 @@ PHP_METHOD(SoapFault, __toString) } /* }}} */ -/* {{{ proto object SoapVar::__construct(mixed data, int encoding [, string type_name [, string type_namespace [, string node_name [, string node_namespace]]]]) - SoapVar constructor */ +/* {{{ SoapVar constructor */ PHP_METHOD(SoapVar, __construct) { zval *data, *type, *this_ptr; @@ -830,8 +825,7 @@ static HashTable* soap_create_typemap(sdlPtr sdl, HashTable *ht) /* {{{ */ } /* }}} */ -/* {{{ proto object SoapServer::__construct(mixed wsdl [, array options]) - SoapServer constructor */ +/* {{{ SoapServer constructor */ PHP_METHOD(SoapServer, __construct) { soapServicePtr service; @@ -958,8 +952,7 @@ PHP_METHOD(SoapServer, __construct) /* }}} */ -/* {{{ proto object SoapServer::setPersistence(int mode ) - Sets persistence mode of SoapServer */ +/* {{{ Sets persistence mode of SoapServer */ PHP_METHOD(SoapServer, setPersistence) { soapServicePtr service; @@ -989,8 +982,7 @@ PHP_METHOD(SoapServer, setPersistence) /* }}} */ -/* {{{ proto void SoapServer::setClass(string class_name [, mixed args]) - Sets class which will handle SOAP requests */ +/* {{{ Sets class which will handle SOAP requests */ PHP_METHOD(SoapServer, setClass) { soapServicePtr service; @@ -1032,8 +1024,7 @@ PHP_METHOD(SoapServer, setClass) /* }}} */ -/* {{{ proto void SoapServer::setObject(object obj) - Sets object which will handle SOAP requests */ +/* {{{ Sets object which will handle SOAP requests */ PHP_METHOD(SoapServer, setObject) { soapServicePtr service; @@ -1056,8 +1047,7 @@ PHP_METHOD(SoapServer, setObject) /* }}} */ -/* {{{ proto array SoapServer::getFunctions(void) - Returns list of defined functions */ +/* {{{ Returns list of defined functions */ PHP_METHOD(SoapServer, getFunctions) { soapServicePtr service; @@ -1100,8 +1090,7 @@ PHP_METHOD(SoapServer, getFunctions) /* }}} */ -/* {{{ proto void SoapServer::addFunction(mixed functions) - Adds one or several functions those will handle SOAP requests */ +/* {{{ Adds one or several functions those will handle SOAP requests */ PHP_METHOD(SoapServer, addFunction) { soapServicePtr service; @@ -1205,8 +1194,7 @@ static void _soap_server_exception(soapServicePtr service, sdlFunctionPtr functi } /* }}} */ -/* {{{ proto void SoapServer::handle([string soap_request]) - Handles a SOAP request */ +/* {{{ Handles a SOAP request */ PHP_METHOD(SoapServer, handle) { int soap_version, old_soap_version; @@ -1708,8 +1696,7 @@ fail: } /* }}} */ -/* {{{ proto SoapServer::fault ( staring code, string string [, string actor [, mixed details [, string name]]] ) - Issue SoapFault indicating an error */ +/* {{{ Issue SoapFault indicating an error */ PHP_METHOD(SoapServer, fault) { char *code, *string, *actor=NULL, *name=NULL; @@ -1736,7 +1723,7 @@ PHP_METHOD(SoapServer, fault) } /* }}} */ -/* {{{ proto SoapServer::addSoapHeader(SoapHeader $object) */ +/* {{{ */ PHP_METHOD(SoapServer, addSoapHeader) { soapServicePtr service; @@ -1952,7 +1939,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const } /* }}} */ -/* {{{ proto use_soap_error_handler([bool $handler = TRUE]) */ +/* {{{ */ PHP_FUNCTION(use_soap_error_handler) { zend_bool handler = 1; @@ -1964,7 +1951,7 @@ PHP_FUNCTION(use_soap_error_handler) } /* }}} */ -/* {{{ proto is_soap_fault(mixed $object) */ +/* {{{ */ PHP_FUNCTION(is_soap_fault) { zval *fault; @@ -1980,8 +1967,7 @@ PHP_FUNCTION(is_soap_fault) /* SoapClient functions */ -/* {{{ proto object SoapClient::__construct(mixed wsdl [, array options]) - SoapClient constructor */ +/* {{{ SoapClient constructor */ PHP_METHOD(SoapClient, __construct) { @@ -2524,8 +2510,7 @@ static void verify_soap_headers_array(HashTable *ht) /* {{{ */ } /* }}} */ -/* {{{ proto mixed SoapClient::__call(string function_name, array arguments [, array options [, array input_headers [, array &output_headers]]]) - Calls a SOAP function */ +/* {{{ Calls a SOAP function */ PHP_METHOD(SoapClient, __call) { char *function, *location=NULL, *soap_action = NULL, *uri = NULL; @@ -2635,8 +2620,7 @@ cleanup: /* }}} */ -/* {{{ proto array SoapClient::__getFunctions(void) - Returns list of SOAP functions */ +/* {{{ Returns list of SOAP functions */ PHP_METHOD(SoapClient, __getFunctions) { sdlPtr sdl; @@ -2662,8 +2646,7 @@ PHP_METHOD(SoapClient, __getFunctions) /* }}} */ -/* {{{ proto array SoapClient::__getTypes(void) - Returns list of SOAP types */ +/* {{{ Returns list of SOAP types */ PHP_METHOD(SoapClient, __getTypes) { sdlPtr sdl; @@ -2691,8 +2674,7 @@ PHP_METHOD(SoapClient, __getTypes) /* }}} */ -/* {{{ proto string SoapClient::__getLastRequest(void) - Returns last SOAP request */ +/* {{{ Returns last SOAP request */ PHP_METHOD(SoapClient, __getLastRequest) { zval *tmp; @@ -2710,8 +2692,7 @@ PHP_METHOD(SoapClient, __getLastRequest) /* }}} */ -/* {{{ proto object SoapClient::__getLastResponse(void) - Returns last SOAP response */ +/* {{{ Returns last SOAP response */ PHP_METHOD(SoapClient, __getLastResponse) { zval *tmp; @@ -2729,8 +2710,7 @@ PHP_METHOD(SoapClient, __getLastResponse) /* }}} */ -/* {{{ proto string SoapClient::__getLastRequestHeaders(void) - Returns last SOAP request headers */ +/* {{{ Returns last SOAP request headers */ PHP_METHOD(SoapClient, __getLastRequestHeaders) { zval *tmp; @@ -2748,8 +2728,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders) /* }}} */ -/* {{{ proto string SoapClient::__getLastResponseHeaders(void) - Returns last SOAP response headers */ +/* {{{ Returns last SOAP response headers */ PHP_METHOD(SoapClient, __getLastResponseHeaders) { zval *tmp; @@ -2767,8 +2746,7 @@ PHP_METHOD(SoapClient, __getLastResponseHeaders) /* }}} */ -/* {{{ proto string SoapClient::__doRequest() - SoapClient::__doRequest() */ +/* {{{ SoapClient::__doRequest() */ PHP_METHOD(SoapClient, __doRequest) { zend_string *buf; @@ -2800,8 +2778,7 @@ PHP_METHOD(SoapClient, __doRequest) } /* }}} */ -/* {{{ proto void SoapClient::__setCookie(string name [, strung value]) - Sets cookie thet will sent with SOAP request. +/* {{{ Sets cookie thet will sent with SOAP request. The call to this function will effect all following calls of SOAP methods. If value is not specified cookie is removed. */ PHP_METHOD(SoapClient, __setCookie) @@ -2839,8 +2816,7 @@ PHP_METHOD(SoapClient, __setCookie) } /* }}} */ -/* {{{ proto array SoapClient::__getCookies(void) - Returns list of cookies */ +/* {{{ Returns list of cookies */ PHP_METHOD(SoapClient, __getCookies) { zval *cookies; @@ -2859,8 +2835,7 @@ PHP_METHOD(SoapClient, __getCookies) } /* }}} */ -/* {{{ proto void SoapClient::__setSoapHeaders(array SoapHeaders) - Sets SOAP headers for subsequent calls (replaces any previous +/* {{{ Sets SOAP headers for subsequent calls (replaces any previous values). If no value is specified, all of the headers are removed. */ PHP_METHOD(SoapClient, __setSoapHeaders) @@ -2893,8 +2868,7 @@ PHP_METHOD(SoapClient, __setSoapHeaders) } /* }}} */ -/* {{{ proto string SoapClient::__setLocation([string new_location]) - Sets the location option (the endpoint URL that will be touched by the +/* {{{ Sets the location option (the endpoint URL that will be touched by the following SOAP requests). If new_location is not specified or null then SoapClient will use endpoint from WSDL file. diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index e73aae1caf..d17203f0a4 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -395,8 +395,7 @@ static PHP_GSHUTDOWN_FUNCTION(sockets) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(sockets) { #if defined(COMPILE_DL_SOCKETS) && defined(ZTS) @@ -554,8 +553,7 @@ static PHP_MINIT_FUNCTION(sockets) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(sockets) { php_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS_PASSTHRU); @@ -564,8 +562,7 @@ static PHP_MSHUTDOWN_FUNCTION(sockets) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(sockets) { php_info_print_table_start(); @@ -651,8 +648,7 @@ static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds) /* {{{ */ } /* }}} */ -/* {{{ proto int socket_select(array &read_fds, array &write_fds, array &except_fds, int tv_sec[, int tv_usec]) - Runs the select() system call on the sets mentioned with a timeout specified by tv_sec and tv_usec */ +/* {{{ Runs the select() system call on the sets mentioned with a timeout specified by tv_sec and tv_usec */ PHP_FUNCTION(socket_select) { zval *r_array, *w_array, *e_array; @@ -729,8 +725,7 @@ PHP_FUNCTION(socket_select) } /* }}} */ -/* {{{ proto resource socket_create_listen(int port[, int backlog]) - Opens a socket on port to accept connections */ +/* {{{ Opens a socket on port to accept connections */ PHP_FUNCTION(socket_create_listen) { php_socket *php_sock; @@ -751,8 +746,7 @@ PHP_FUNCTION(socket_create_listen) } /* }}} */ -/* {{{ proto resource socket_accept(resource socket) - Accepts a connection on the listening socket fd */ +/* {{{ Accepts a connection on the listening socket fd */ PHP_FUNCTION(socket_accept) { zval *arg1; @@ -776,8 +770,7 @@ PHP_FUNCTION(socket_accept) } /* }}} */ -/* {{{ proto bool socket_set_nonblock(resource socket) - Sets nonblocking mode on a socket resource */ +/* {{{ Sets nonblocking mode on a socket resource */ PHP_FUNCTION(socket_set_nonblock) { zval *arg1; @@ -814,8 +807,7 @@ PHP_FUNCTION(socket_set_nonblock) } /* }}} */ -/* {{{ proto bool socket_set_block(resource socket) - Sets blocking mode on a socket resource */ +/* {{{ Sets blocking mode on a socket resource */ PHP_FUNCTION(socket_set_block) { zval *arg1; @@ -854,8 +846,7 @@ PHP_FUNCTION(socket_set_block) } /* }}} */ -/* {{{ proto bool socket_listen(resource socket[, int backlog]) - Sets the maximum number of connections allowed to be waited for on the socket specified by fd */ +/* {{{ Sets the maximum number of connections allowed to be waited for on the socket specified by fd */ PHP_FUNCTION(socket_listen) { zval *arg1; @@ -878,8 +869,7 @@ PHP_FUNCTION(socket_listen) } /* }}} */ -/* {{{ proto void socket_close(resource socket) - Closes a file descriptor */ +/* {{{ Closes a file descriptor */ PHP_FUNCTION(socket_close) { zval *arg1; @@ -908,8 +898,7 @@ PHP_FUNCTION(socket_close) } /* }}} */ -/* {{{ proto int socket_write(resource socket, string buf[, int length]) - Writes the buffer to the socket resource, length is optional */ +/* {{{ Writes the buffer to the socket resource, length is optional */ PHP_FUNCTION(socket_write) { zval *arg1; @@ -951,8 +940,7 @@ PHP_FUNCTION(socket_write) } /* }}} */ -/* {{{ proto string socket_read(resource socket, int length [, int type]) - Reads a maximum of length bytes from socket */ +/* {{{ Reads a maximum of length bytes from socket */ PHP_FUNCTION(socket_read) { zval *arg1; @@ -1011,8 +999,7 @@ PHP_FUNCTION(socket_read) } /* }}} */ -/* {{{ proto bool socket_getsockname(resource socket, string &addr[, int &port]) - Queries the remote side of the given socket which may either result in host/port or in a UNIX filesystem path, dependent on its type. */ +/* {{{ Queries the remote side of the given socket which may either result in host/port or in a UNIX filesystem path, dependent on its type. */ PHP_FUNCTION(socket_getsockname) { zval *arg1, *addr, *port = NULL; @@ -1085,8 +1072,7 @@ PHP_FUNCTION(socket_getsockname) } /* }}} */ -/* {{{ proto bool socket_getpeername(resource socket, string &addr[, int &port]) - Queries the remote side of the given socket which may either result in host/port or in a UNIX filesystem path, dependent on its type. */ +/* {{{ Queries the remote side of the given socket which may either result in host/port or in a UNIX filesystem path, dependent on its type. */ PHP_FUNCTION(socket_getpeername) { zval *arg1, *arg2, *arg3 = NULL; @@ -1162,8 +1148,7 @@ PHP_FUNCTION(socket_getpeername) } /* }}} */ -/* {{{ proto resource socket_create(int domain, int type, int protocol) - Creates an endpoint for communication in the domain specified by domain, of type specified by type */ +/* {{{ Creates an endpoint for communication in the domain specified by domain, of type specified by type */ PHP_FUNCTION(socket_create) { zend_long domain, type, protocol; @@ -1208,8 +1193,7 @@ PHP_FUNCTION(socket_create) } /* }}} */ -/* {{{ proto bool socket_connect(resource socket, string addr [, int port]) - Opens a connection to addr:port on the socket specified by socket */ +/* {{{ Opens a connection to addr:port on the socket specified by socket */ PHP_FUNCTION(socket_connect) { zval *resource_socket; @@ -1298,8 +1282,7 @@ PHP_FUNCTION(socket_connect) } /* }}} */ -/* {{{ proto string socket_strerror(int errno) - Returns a string describing an error */ +/* {{{ Returns a string describing an error */ PHP_FUNCTION(socket_strerror) { zend_long arg1; @@ -1312,8 +1295,7 @@ PHP_FUNCTION(socket_strerror) } /* }}} */ -/* {{{ proto bool socket_bind(resource socket, string addr [, int port]) - Binds an open socket to a listening port, port is only specified in AF_INET family. */ +/* {{{ Binds an open socket to a listening port, port is only specified in AF_INET family. */ PHP_FUNCTION(socket_bind) { zval *arg1; @@ -1395,8 +1377,7 @@ PHP_FUNCTION(socket_bind) } /* }}} */ -/* {{{ proto int socket_recv(resource socket, string &buf, int len, int flags) - Receives data from a connected socket */ +/* {{{ Receives data from a connected socket */ PHP_FUNCTION(socket_recv) { zval *php_sock_res, *buf; @@ -1438,8 +1419,7 @@ PHP_FUNCTION(socket_recv) } /* }}} */ -/* {{{ proto int socket_send(resource socket, string buf, int len, int flags) - Sends data to a connected socket */ +/* {{{ Sends data to a connected socket */ PHP_FUNCTION(socket_send) { zval *arg1; @@ -1472,8 +1452,7 @@ PHP_FUNCTION(socket_send) } /* }}} */ -/* {{{ proto int socket_recvfrom(resource socket, string &buf, int len, int flags, string &name [, int &port]) - Receives data from a socket, connected or not */ +/* {{{ Receives data from a socket, connected or not */ PHP_FUNCTION(socket_recvfrom) { zval *arg1, *arg2, *arg5, *arg6 = NULL; @@ -1590,8 +1569,7 @@ PHP_FUNCTION(socket_recvfrom) } /* }}} */ -/* {{{ proto int socket_sendto(resource socket, string buf, int len, int flags, string addr [, int port]) - Sends a message to a socket, whether it is connected or not */ +/* {{{ Sends a message to a socket, whether it is connected or not */ PHP_FUNCTION(socket_sendto) { zval *arg1; @@ -1675,8 +1653,7 @@ PHP_FUNCTION(socket_sendto) } /* }}} */ -/* {{{ proto mixed socket_get_option(resource socket, int level, int optname) - Gets socket options for the socket */ +/* {{{ Gets socket options for the socket */ PHP_FUNCTION(socket_get_option) { zval *arg1; @@ -1786,8 +1763,7 @@ PHP_FUNCTION(socket_get_option) } /* }}} */ -/* {{{ proto bool socket_set_option(resource socket, int level, int optname, int|array optval) - Sets socket options for the socket */ +/* {{{ Sets socket options for the socket */ PHP_FUNCTION(socket_set_option) { zval *arg1, *arg4; @@ -1932,8 +1908,7 @@ default_case: /* }}} */ #ifdef HAVE_SOCKETPAIR -/* {{{ proto bool socket_create_pair(int domain, int type, int protocol, array &fd) - Creates a pair of indistinguishable sockets and stores them in fds. */ +/* {{{ Creates a pair of indistinguishable sockets and stores them in fds. */ PHP_FUNCTION(socket_create_pair) { zval retval[2], *fds_array_zval; @@ -1999,8 +1974,7 @@ PHP_FUNCTION(socket_create_pair) #endif #ifdef HAVE_SHUTDOWN -/* {{{ proto bool socket_shutdown(resource socket[, int how]) - Shuts down a socket for receiving, sending, or both. */ +/* {{{ Shuts down a socket for receiving, sending, or both. */ PHP_FUNCTION(socket_shutdown) { zval *arg1; @@ -2025,8 +1999,7 @@ PHP_FUNCTION(socket_shutdown) /* }}} */ #endif -/* {{{ proto int socket_last_error([resource socket]) - Returns the last socket error (either the last used or the provided socket resource) */ +/* {{{ Returns the last socket error (either the last used or the provided socket resource) */ PHP_FUNCTION(socket_last_error) { zval *arg1 = NULL; @@ -2047,8 +2020,7 @@ PHP_FUNCTION(socket_last_error) } /* }}} */ -/* {{{ proto void socket_clear_error([resource socket]) - Clears the error on the socket or the last error code. */ +/* {{{ Clears the error on the socket or the last error code. */ PHP_FUNCTION(socket_clear_error) { zval *arg1 = NULL; @@ -2118,8 +2090,7 @@ error: return NULL; } -/* {{{ proto resource socket_import_stream(resource stream) - Imports a stream that encapsulates a socket into a socket extension resource. */ +/* {{{ Imports a stream that encapsulates a socket into a socket extension resource. */ PHP_FUNCTION(socket_import_stream) { zval *zstream; @@ -2164,8 +2135,7 @@ PHP_FUNCTION(socket_import_stream) } /* }}} */ -/* {{{ proto resource socket_export_stream(resource socket) - Exports a socket extension resource into a stream that encapsulates a socket. */ +/* {{{ Exports a socket extension resource into a stream that encapsulates a socket. */ PHP_FUNCTION(socket_export_stream) { zval *zsocket; @@ -2261,8 +2231,7 @@ PHP_FUNCTION(socket_export_stream) } /* }}} */ -/* {{{ proto resource addrinfo socket_addrinfo_lookup(string hostname[, mixed service, array hints]) - Gets array with contents of getaddrinfo about the given hostname. */ +/* {{{ Gets array with contents of getaddrinfo about the given hostname. */ PHP_FUNCTION(socket_addrinfo_lookup) { char *service = NULL; @@ -2323,8 +2292,7 @@ PHP_FUNCTION(socket_addrinfo_lookup) } /* }}} */ -/* {{{ proto resource socket_addrinfo_bind(resource addrinfo) - Creates and binds to a socket from a given addrinfo resource */ +/* {{{ Creates and binds to a socket from a given addrinfo resource */ PHP_FUNCTION(socket_addrinfo_bind) { zval *arg1; @@ -2389,8 +2357,7 @@ PHP_FUNCTION(socket_addrinfo_bind) } /* }}} */ -/* {{{ proto resource socket_addrinfo_connect(resource addrinfo) - Creates and connects to a socket from a given addrinfo resource */ +/* {{{ Creates and connects to a socket from a given addrinfo resource */ PHP_FUNCTION(socket_addrinfo_connect) { zval *arg1; @@ -2455,8 +2422,7 @@ PHP_FUNCTION(socket_addrinfo_connect) } /* }}} */ -/* {{{ proto resource socket_addrinfo_explain(resource addrinfo) - Creates and connects to a socket from a given addrinfo resource */ +/* {{{ Creates and connects to a socket from a given addrinfo resource */ PHP_FUNCTION(socket_addrinfo_explain) { zval *arg1, sockaddr; @@ -2512,8 +2478,7 @@ PHP_FUNCTION(socket_addrinfo_explain) #ifdef PHP_WIN32 - /* {{{ proto string socket_wsaprotocol_info_export(resource stream, int target_pid) - Exports the network socket information suitable to be used in another process and returns the info id. */ + /* {{{ Exports the network socket information suitable to be used in another process and returns the info id. */ PHP_FUNCTION(socket_wsaprotocol_info_export) { WSAPROTOCOL_INFO wi; @@ -2568,8 +2533,7 @@ PHP_FUNCTION(socket_wsaprotocol_info_export) } /* }}} */ -/* {{{ proto resource socket_wsaprotocol_info_import(string id) - Imports the network socket information using the supplied id and creates a new socket on its base. */ +/* {{{ Imports the network socket information using the supplied id and creates a new socket on its base. */ PHP_FUNCTION(socket_wsaprotocol_info_import) { char *id; @@ -2627,8 +2591,7 @@ PHP_FUNCTION(socket_wsaprotocol_info_import) } /* }}} */ -/* {{{ proto bool socket_wsaprotocol_info_release(string id) - Frees the exported info and corresponding resources using the supplied id. */ +/* {{{ Frees the exported info and corresponding resources using the supplied id. */ PHP_FUNCTION(socket_wsaprotocol_info_release) { char *id; diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index e2b361fb5b..43effd0c99 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -47,8 +47,7 @@ ZEND_DECLARE_MODULE_GLOBALS(spl) #define SPL_DEFAULT_FILE_EXTENSIONS ".inc,.php" -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(spl) { spl_globals->autoload_extensions = NULL; @@ -76,8 +75,7 @@ static zend_class_entry * spl_find_ce_by_name(zend_string *name, zend_bool autol return ce; } -/* {{{ proto array class_parents(object instance [, bool autoload = true]) - Return an array containing the names of all parent classes */ +/* {{{ Return an array containing the names of all parent classes */ PHP_FUNCTION(class_parents) { zval *obj; @@ -110,8 +108,7 @@ PHP_FUNCTION(class_parents) } /* }}} */ -/* {{{ proto array class_implements(mixed what [, bool autoload ]) - Return all classes and interfaces implemented by SPL */ +/* {{{ Return all classes and interfaces implemented by SPL */ PHP_FUNCTION(class_implements) { zval *obj; @@ -139,8 +136,7 @@ PHP_FUNCTION(class_implements) } /* }}} */ -/* {{{ proto array class_uses(mixed what [, bool autoload ]) - Return all traits used by a class. */ +/* {{{ Return all traits used by a class. */ PHP_FUNCTION(class_uses) { zval *obj; @@ -228,8 +224,7 @@ PHP_FUNCTION(class_uses) SPL_ADD_CLASS(UnderflowException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(UnexpectedValueException, z_list, sub, allow, ce_flags); \ -/* {{{ proto array spl_classes() - Return an array containing the names of all clsses and interfaces defined in SPL */ +/* {{{ Return an array containing the names of all clsses and interfaces defined in SPL */ PHP_FUNCTION(spl_classes) { if (zend_parse_parameters_none() == FAILURE) { @@ -300,8 +295,7 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha return 0; } /* }}} */ -/* {{{ proto void spl_autoload(string class_name [, string file_extensions]) - Default autoloader implementation */ +/* {{{ Default autoloader implementation */ PHP_FUNCTION(spl_autoload) { int pos_len, pos1_len; @@ -341,8 +335,7 @@ PHP_FUNCTION(spl_autoload) zend_string_release(lc_name); } /* }}} */ -/* {{{ proto string spl_autoload_extensions([string file_extensions]) - Register and return default file extensions for spl_autoload */ +/* {{{ Register and return default file extensions for spl_autoload */ PHP_FUNCTION(spl_autoload_extensions) { zend_string *file_exts = NULL; @@ -459,8 +452,7 @@ static zend_class_entry *spl_perform_autoload(zend_string *class_name, zend_stri return NULL; } -/* {{{ proto void spl_autoload_call(string class_name) - Try all registered autoload function to load the requested class */ +/* {{{ Try all registered autoload function to load the requested class */ PHP_FUNCTION(spl_autoload_call) { zend_string *class_name; @@ -497,8 +489,7 @@ static Bucket *spl_find_registered_function(autoload_func_info *find_alfi) { return NULL; } -/* {{{ proto bool spl_autoload_register([mixed autoload_function [, bool throw [, bool prepend]]]) - Register given function as autoloader */ +/* {{{ Register given function as autoloader */ PHP_FUNCTION(spl_autoload_register) { zend_bool do_throw = 1; @@ -565,8 +556,7 @@ PHP_FUNCTION(spl_autoload_register) RETURN_TRUE; } /* }}} */ -/* {{{ proto bool spl_autoload_unregister(mixed autoload_function) - Unregister given function as autoloader */ +/* {{{ Unregister given function as autoloader */ PHP_FUNCTION(spl_autoload_unregister) { zend_fcall_info fci; @@ -594,8 +584,7 @@ PHP_FUNCTION(spl_autoload_unregister) RETURN_FALSE; } /* }}} */ -/* {{{ proto false|array spl_autoload_functions() - Return all registered autoloader functions */ +/* {{{ Return all registered autoloader functions */ PHP_FUNCTION(spl_autoload_functions) { autoload_func_info *alfi; @@ -631,8 +620,7 @@ PHP_FUNCTION(spl_autoload_functions) } } /* }}} */ -/* {{{ proto string spl_object_hash(object obj) - Return hash id for given object */ +/* {{{ Return hash id for given object */ PHP_FUNCTION(spl_object_hash) { zval *obj; @@ -645,8 +633,7 @@ PHP_FUNCTION(spl_object_hash) } /* }}} */ -/* {{{ proto int spl_object_id(object obj) - Returns the integer object handle for the given object */ +/* {{{ Returns the integer object handle for the given object */ PHP_FUNCTION(spl_object_id) { zval *obj; @@ -685,8 +672,7 @@ static void spl_build_class_list_string(zval *entry, char **list) /* {{{ */ *list = res; } /* }}} */ -/* {{{ PHP_MINFO(spl) - */ +/* {{{ PHP_MINFO(spl) */ PHP_MINFO_FUNCTION(spl) { zval list, *zv; @@ -719,8 +705,7 @@ PHP_MINFO_FUNCTION(spl) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION(spl) - */ +/* {{{ PHP_MINIT_FUNCTION(spl) */ PHP_MINIT_FUNCTION(spl) { zend_autoload = spl_perform_autoload; @@ -763,8 +748,7 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */ return SUCCESS; } /* }}} */ -/* {{{ spl_module_entry - */ +/* {{{ spl_module_entry */ zend_module_entry spl_module_entry = { STANDARD_MODULE_HEADER, "SPL", diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 676d04ab93..c7b7edd4fd 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -693,9 +693,7 @@ static int spl_array_has_dimension(zend_object *object, zval *offset, int check_ return spl_array_has_dimension_ex(1, object, offset, check_empty); } /* }}} */ -/* {{{ proto bool ArrayObject::offsetExists(mixed $index) - proto bool ArrayIterator::offsetExists(mixed $index) - Returns whether the requested $index exists. */ +/* {{{ Returns whether the requested $index exists. */ PHP_METHOD(ArrayObject, offsetExists) { zval *index; @@ -705,9 +703,7 @@ PHP_METHOD(ArrayObject, offsetExists) RETURN_BOOL(spl_array_has_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index, 2)); } /* }}} */ -/* {{{ proto mixed ArrayObject::offsetGet(mixed $index) - proto mixed ArrayIterator::offsetGet(mixed $index) - Returns the value at the specified $index. */ +/* {{{ Returns the value at the specified $index. */ PHP_METHOD(ArrayObject, offsetGet) { zval *value, *index; @@ -720,9 +716,7 @@ PHP_METHOD(ArrayObject, offsetGet) } } /* }}} */ -/* {{{ proto void ArrayObject::offsetSet(mixed $index, mixed $newval) - proto void ArrayIterator::offsetSet(mixed $index, mixed $newval) - Sets the value at the specified $index to $newval. */ +/* {{{ Sets the value at the specified $index to $newval. */ PHP_METHOD(ArrayObject, offsetSet) { zval *index, *value; @@ -744,9 +738,7 @@ void spl_array_iterator_append(zval *object, zval *append_value) /* {{{ */ spl_array_write_dimension(Z_OBJ_P(object), NULL, append_value); } /* }}} */ -/* {{{ proto void ArrayObject::append(mixed $newval) - proto void ArrayIterator::append(mixed $newval) - Appends the value (cannot be called for objects). */ +/* {{{ Appends the value (cannot be called for objects). */ PHP_METHOD(ArrayObject, append) { zval *value; @@ -757,9 +749,7 @@ PHP_METHOD(ArrayObject, append) spl_array_iterator_append(ZEND_THIS, value); } /* }}} */ -/* {{{ proto void ArrayObject::offsetUnset(mixed $index) - proto void ArrayIterator::offsetUnset(mixed $index) - Unsets the value at the specified $index. */ +/* {{{ Unsets the value at the specified $index. */ PHP_METHOD(ArrayObject, offsetUnset) { zval *index; @@ -769,9 +759,7 @@ PHP_METHOD(ArrayObject, offsetUnset) spl_array_unset_dimension_ex(0, Z_OBJ_P(ZEND_THIS), index); } /* }}} */ -/* {{{ proto array ArrayObject::getArrayCopy() - proto array ArrayIterator::getArrayCopy() - Return a copy of the contained array */ +/* {{{ Return a copy of the contained array */ PHP_METHOD(ArrayObject, getArrayCopy) { zval *object = ZEND_THIS; @@ -1181,8 +1169,7 @@ zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval *object, } /* }}} */ -/* {{{ proto ArrayObject::__construct([array|object ar = array() [, int flags = 0 [, string iterator_class = "ArrayIterator"]]]) - Constructs a new array object from an array or object. */ +/* {{{ Constructs a new array object from an array or object. */ PHP_METHOD(ArrayObject, __construct) { zval *object = ZEND_THIS; @@ -1211,8 +1198,7 @@ PHP_METHOD(ArrayObject, __construct) } /* }}} */ -/* {{{ proto ArrayIterator::__construct([array|object ar = array() [, int flags = 0]]) - Constructs a new array iterator from an array or object. */ +/* {{{ Constructs a new array iterator from an array or object. */ PHP_METHOD(ArrayIterator, __construct) { zval *object = ZEND_THIS; @@ -1236,8 +1222,7 @@ PHP_METHOD(ArrayIterator, __construct) } /* }}} */ -/* {{{ proto void ArrayObject::setIteratorClass(string iterator_class) - Set the class used in getIterator. */ +/* {{{ Set the class used in getIterator. */ PHP_METHOD(ArrayObject, setIteratorClass) { zval *object = ZEND_THIS; @@ -1252,8 +1237,7 @@ PHP_METHOD(ArrayObject, setIteratorClass) } /* }}} */ -/* {{{ proto string ArrayObject::getIteratorClass() - Get the class used in getIterator. */ +/* {{{ Get the class used in getIterator. */ PHP_METHOD(ArrayObject, getIteratorClass) { zval *object = ZEND_THIS; @@ -1268,8 +1252,7 @@ PHP_METHOD(ArrayObject, getIteratorClass) } /* }}} */ -/* {{{ proto int ArrayObject::getFlags() - Get flags */ +/* {{{ Get flags */ PHP_METHOD(ArrayObject, getFlags) { zval *object = ZEND_THIS; @@ -1283,8 +1266,7 @@ PHP_METHOD(ArrayObject, getFlags) } /* }}} */ -/* {{{ proto void ArrayObject::setFlags(int flags) - Set flags */ +/* {{{ Set flags */ PHP_METHOD(ArrayObject, setFlags) { zval *object = ZEND_THIS; @@ -1299,8 +1281,7 @@ PHP_METHOD(ArrayObject, setFlags) } /* }}} */ -/* {{{ proto Array|Object ArrayObject::exchangeArray(Array|Object input = array()) - Replace the referenced array or object with a new one and return the old one (right now copy - to be changed) */ +/* {{{ Replace the referenced array or object with a new one and return the old one (right now copy - to be changed) */ PHP_METHOD(ArrayObject, exchangeArray) { zval *object = ZEND_THIS, *array; @@ -1320,8 +1301,7 @@ PHP_METHOD(ArrayObject, exchangeArray) } /* }}} */ -/* {{{ proto ArrayIterator ArrayObject::getIterator() - Create a new iterator from a ArrayObject instance */ +/* {{{ Create a new iterator from a ArrayObject instance */ PHP_METHOD(ArrayObject, getIterator) { zval *object = ZEND_THIS; @@ -1335,8 +1315,7 @@ PHP_METHOD(ArrayObject, getIterator) } /* }}} */ -/* {{{ proto void ArrayIterator::rewind() - Rewind array back to the start */ +/* {{{ Rewind array back to the start */ PHP_METHOD(ArrayIterator, rewind) { zval *object = ZEND_THIS; @@ -1350,8 +1329,7 @@ PHP_METHOD(ArrayIterator, rewind) } /* }}} */ -/* {{{ proto void ArrayIterator::seek(int $position) - Seek to position. */ +/* {{{ Seek to position. */ PHP_METHOD(ArrayIterator, seek) { zend_long opos, position; @@ -1419,9 +1397,7 @@ int spl_array_object_count_elements(zend_object *object, zend_long *count) /* {{ return SUCCESS; } /* }}} */ -/* {{{ proto int ArrayObject::count() - proto int ArrayIterator::count() - Return the number of elements in the Iterator. */ +/* {{{ Return the number of elements in the Iterator. */ PHP_METHOD(ArrayObject, count) { spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS); @@ -1491,38 +1467,25 @@ PHP_METHOD(cname, fname) \ spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname, sizeof(#fname)-1, use_arg); \ } -/* {{{ proto int ArrayObject::asort([int $sort_flags = SORT_REGULAR ]) - proto int ArrayIterator::asort([int $sort_flags = SORT_REGULAR ]) - Sort the entries by values. */ +/* {{{ Sort the entries by values. */ SPL_ARRAY_METHOD(ArrayObject, asort, SPL_ARRAY_METHOD_MAY_USER_ARG) /* }}} */ -/* {{{ proto int ArrayObject::ksort([int $sort_flags = SORT_REGULAR ]) - proto int ArrayIterator::ksort([int $sort_flags = SORT_REGULAR ]) - Sort the entries by key. */ +/* {{{ Sort the entries by key. */ SPL_ARRAY_METHOD(ArrayObject, ksort, SPL_ARRAY_METHOD_MAY_USER_ARG) /* }}} */ -/* {{{ proto int ArrayObject::uasort(callback cmp_function) - proto int ArrayIterator::uasort(callback cmp_function) - Sort the entries by values user defined function. */ +/* {{{ Sort the entries by values user defined function. */ SPL_ARRAY_METHOD(ArrayObject, uasort, SPL_ARRAY_METHOD_USE_ARG) /* }}} */ -/* {{{ proto int ArrayObject::uksort(callback cmp_function) - proto int ArrayIterator::uksort(callback cmp_function) - Sort the entries by key using user defined function. */ +/* {{{ Sort the entries by key using user defined function. */ SPL_ARRAY_METHOD(ArrayObject, uksort, SPL_ARRAY_METHOD_USE_ARG) /* }}} */ -/* {{{ proto int ArrayObject::natsort() - proto int ArrayIterator::natsort() - Sort the entries by values using "natural order" algorithm. */ +/* {{{ Sort the entries by values using "natural order" algorithm. */ SPL_ARRAY_METHOD(ArrayObject, natsort, SPL_ARRAY_METHOD_NO_ARG) /* }}} */ -/* {{{ proto int ArrayObject::natcasesort() - proto int ArrayIterator::natcasesort() - Sort the entries by key using case insensitive "natural order" algorithm. */ +/* {{{ Sort the entries by key using case insensitive "natural order" algorithm. */ SPL_ARRAY_METHOD(ArrayObject, natcasesort, SPL_ARRAY_METHOD_NO_ARG) /* }}} */ -/* {{{ proto mixed|NULL ArrayIterator::current() - Return current array entry */ +/* {{{ Return current array entry */ PHP_METHOD(ArrayIterator, current) { zval *object = ZEND_THIS; @@ -1547,8 +1510,7 @@ PHP_METHOD(ArrayIterator, current) } /* }}} */ -/* {{{ proto mixed|NULL ArrayIterator::key() - Return current array key */ +/* {{{ Return current array key */ PHP_METHOD(ArrayIterator, key) { if (zend_parse_parameters_none() == FAILURE) { @@ -1567,8 +1529,7 @@ void spl_array_iterator_key(zval *object, zval *return_value) /* {{{ */ } /* }}} */ -/* {{{ proto void ArrayIterator::next() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(ArrayIterator, next) { zval *object = ZEND_THIS; @@ -1583,8 +1544,7 @@ PHP_METHOD(ArrayIterator, next) } /* }}} */ -/* {{{ proto bool ArrayIterator::valid() - Check whether array contains more entries */ +/* {{{ Check whether array contains more entries */ PHP_METHOD(ArrayIterator, valid) { zval *object = ZEND_THIS; @@ -1599,8 +1559,7 @@ PHP_METHOD(ArrayIterator, valid) } /* }}} */ -/* {{{ proto bool RecursiveArrayIterator::hasChildren() - Check whether current element has children (e.g. is an array) */ +/* {{{ Check whether current element has children (e.g. is an array) */ PHP_METHOD(RecursiveArrayIterator, hasChildren) { zval *object = ZEND_THIS, *entry; @@ -1624,8 +1583,7 @@ PHP_METHOD(RecursiveArrayIterator, hasChildren) } /* }}} */ -/* {{{ proto object RecursiveArrayIterator::getChildren() - Create a sub iterator for the current element (same class as $this) */ +/* {{{ Create a sub iterator for the current element (same class as $this) */ PHP_METHOD(RecursiveArrayIterator, getChildren) { zval *object = ZEND_THIS, *entry, flags; @@ -1659,8 +1617,7 @@ PHP_METHOD(RecursiveArrayIterator, getChildren) } /* }}} */ -/* {{{ proto string ArrayObject::serialize() - Serialize the object */ +/* {{{ Serialize the object */ PHP_METHOD(ArrayObject, serialize) { zval *object = ZEND_THIS; @@ -1702,9 +1659,7 @@ PHP_METHOD(ArrayObject, serialize) RETURN_NEW_STR(buf.s); } /* }}} */ -/* {{{ proto void ArrayObject::unserialize(string serialized) - * unserialize the object - */ +/* {{{ unserialize the object */ PHP_METHOD(ArrayObject, unserialize) { zval *object = ZEND_THIS; @@ -1816,7 +1771,7 @@ outexcept: } /* }}} */ -/* {{{ proto array ArrayObject::__serialize() */ +/* {{{ */ PHP_METHOD(ArrayObject, __serialize) { spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS); @@ -1856,7 +1811,7 @@ PHP_METHOD(ArrayObject, __serialize) /* }}} */ -/* {{{ proto void ArrayObject::__unserialize(array data) */ +/* {{{ */ PHP_METHOD(ArrayObject, __unserialize) { spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS); @@ -1917,7 +1872,7 @@ PHP_METHOD(ArrayObject, __unserialize) } /* }}} */ -/* {{{ proto void Array::__debugInfo() */ +/* {{{ */ PHP_METHOD(ArrayObject, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 03b224a25b..6053d75ac8 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -752,16 +752,14 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto } /* }}} */ -/* {{{ proto DirectoryIterator::__construct(string path) - Cronstructs a new dir iterator from a path. */ +/* {{{ Cronstructs a new dir iterator from a path. */ PHP_METHOD(DirectoryIterator, __construct) { spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto void DirectoryIterator::rewind() - Rewind dir back to the start */ +/* {{{ Rewind dir back to the start */ PHP_METHOD(DirectoryIterator, rewind) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -778,8 +776,7 @@ PHP_METHOD(DirectoryIterator, rewind) } /* }}} */ -/* {{{ proto string DirectoryIterator::key() - Return current dir entry */ +/* {{{ Return current dir entry */ PHP_METHOD(DirectoryIterator, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -796,8 +793,7 @@ PHP_METHOD(DirectoryIterator, key) } /* }}} */ -/* {{{ proto DirectoryIterator DirectoryIterator::current() - Return this (needed for Iterator interface) */ +/* {{{ Return this (needed for Iterator interface) */ PHP_METHOD(DirectoryIterator, current) { if (zend_parse_parameters_none() == FAILURE) { @@ -807,8 +803,7 @@ PHP_METHOD(DirectoryIterator, current) } /* }}} */ -/* {{{ proto void DirectoryIterator::next() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(DirectoryIterator, next) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -829,8 +824,7 @@ PHP_METHOD(DirectoryIterator, next) } /* }}} */ -/* {{{ proto void DirectoryIterator::seek(int position) - Seek to the given position */ +/* {{{ Seek to the given position */ PHP_METHOD(DirectoryIterator, seek) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -859,8 +853,7 @@ PHP_METHOD(DirectoryIterator, seek) } } /* }}} */ -/* {{{ proto string DirectoryIterator::valid() - Check whether dir contains more entries */ +/* {{{ Check whether dir contains more entries */ PHP_METHOD(DirectoryIterator, valid) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -873,8 +866,7 @@ PHP_METHOD(DirectoryIterator, valid) } /* }}} */ -/* {{{ proto string SplFileInfo::getPath() - Return the path */ +/* {{{ Return the path */ PHP_METHOD(SplFileInfo, getPath) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -894,8 +886,7 @@ PHP_METHOD(SplFileInfo, getPath) } /* }}} */ -/* {{{ proto string SplFileInfo::getFilename() - Return filename only */ +/* {{{ Return filename only */ PHP_METHOD(SplFileInfo, getFilename) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -915,8 +906,7 @@ PHP_METHOD(SplFileInfo, getFilename) } /* }}} */ -/* {{{ proto string DirectoryIterator::getFilename() - Return filename of current dir entry */ +/* {{{ Return filename of current dir entry */ PHP_METHOD(DirectoryIterator, getFilename) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -929,8 +919,7 @@ PHP_METHOD(DirectoryIterator, getFilename) } /* }}} */ -/* {{{ proto string SplFileInfo::getExtension() - Returns file extension component of path */ +/* {{{ Returns file extension component of path */ PHP_METHOD(SplFileInfo, getExtension) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -970,8 +959,7 @@ PHP_METHOD(SplFileInfo, getExtension) } /* }}}*/ -/* {{{ proto string DirectoryIterator::getExtension() - Returns the file extension component of path */ +/* {{{ Returns the file extension component of path */ PHP_METHOD(DirectoryIterator, getExtension) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -997,8 +985,7 @@ PHP_METHOD(DirectoryIterator, getExtension) } /* }}} */ -/* {{{ proto string SplFileInfo::getBasename([string $suffix]) - Returns filename component of path */ +/* {{{ Returns filename component of path */ PHP_METHOD(SplFileInfo, getBasename) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1024,8 +1011,7 @@ PHP_METHOD(SplFileInfo, getBasename) } /* }}}*/ -/* {{{ proto string DirectoryIterator::getBasename([string $suffix]) - Returns filename component of current dir entry */ +/* {{{ Returns filename component of current dir entry */ PHP_METHOD(DirectoryIterator, getBasename) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1043,8 +1029,7 @@ PHP_METHOD(DirectoryIterator, getBasename) } /* }}} */ -/* {{{ proto string SplFileInfo::getPathname() - Return path and filename */ +/* {{{ Return path and filename */ PHP_METHOD(SplFileInfo, getPathname) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1063,8 +1048,7 @@ PHP_METHOD(SplFileInfo, getPathname) } /* }}} */ -/* {{{ proto string FilesystemIterator::key() - Return getPathname() or getFilename() depending on flags */ +/* {{{ Return getPathname() or getFilename() depending on flags */ PHP_METHOD(FilesystemIterator, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1082,8 +1066,7 @@ PHP_METHOD(FilesystemIterator, key) } /* }}} */ -/* {{{ proto string FilesystemIterator::current() - Return getFilename(), getFileInfo() or $this depending on flags */ +/* {{{ Return getFilename(), getFileInfo() or $this depending on flags */ PHP_METHOD(FilesystemIterator, current) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1104,8 +1087,7 @@ PHP_METHOD(FilesystemIterator, current) } /* }}} */ -/* {{{ proto bool DirectoryIterator::isDot() - Returns true if current entry is '.' or '..' */ +/* {{{ Returns true if current entry is '.' or '..' */ PHP_METHOD(DirectoryIterator, isDot) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1118,8 +1100,7 @@ PHP_METHOD(DirectoryIterator, isDot) } /* }}} */ -/* {{{ proto SplFileInfo::__construct(string file_name) - Cronstructs a new SplFileInfo from a path. */ +/* {{{ Cronstructs a new SplFileInfo from a path. */ /* When the constructor gets called the object is already created by the engine, so we must only call 'additional' initializations. */ @@ -1158,83 +1139,67 @@ PHP_METHOD(SplFileInfo, func_name) \ } /* }}} */ -/* {{{ proto int SplFileInfo::getPerms() - Get file permissions */ +/* {{{ Get file permissions */ FileInfoFunction(getPerms, FS_PERMS) /* }}} */ -/* {{{ proto int SplFileInfo::getInode() - Get file inode */ +/* {{{ Get file inode */ FileInfoFunction(getInode, FS_INODE) /* }}} */ -/* {{{ proto int SplFileInfo::getSize() - Get file size */ +/* {{{ Get file size */ FileInfoFunction(getSize, FS_SIZE) /* }}} */ -/* {{{ proto int SplFileInfo::getOwner() - Get file owner */ +/* {{{ Get file owner */ FileInfoFunction(getOwner, FS_OWNER) /* }}} */ -/* {{{ proto int SplFileInfo::getGroup() - Get file group */ +/* {{{ Get file group */ FileInfoFunction(getGroup, FS_GROUP) /* }}} */ -/* {{{ proto int SplFileInfo::getATime() - Get last access time of file */ +/* {{{ Get last access time of file */ FileInfoFunction(getATime, FS_ATIME) /* }}} */ -/* {{{ proto int SplFileInfo::getMTime() - Get last modification time of file */ +/* {{{ Get last modification time of file */ FileInfoFunction(getMTime, FS_MTIME) /* }}} */ -/* {{{ proto int SplFileInfo::getCTime() - Get inode modification time of file */ +/* {{{ Get inode modification time of file */ FileInfoFunction(getCTime, FS_CTIME) /* }}} */ -/* {{{ proto string SplFileInfo::getType() - Get file type */ +/* {{{ Get file type */ FileInfoFunction(getType, FS_TYPE) /* }}} */ -/* {{{ proto bool SplFileInfo::isWritable() - Returns true if file can be written */ +/* {{{ Returns true if file can be written */ FileInfoFunction(isWritable, FS_IS_W) /* }}} */ -/* {{{ proto bool SplFileInfo::isReadable() - Returns true if file can be read */ +/* {{{ Returns true if file can be read */ FileInfoFunction(isReadable, FS_IS_R) /* }}} */ -/* {{{ proto bool SplFileInfo::isExecutable() - Returns true if file is executable */ +/* {{{ Returns true if file is executable */ FileInfoFunction(isExecutable, FS_IS_X) /* }}} */ -/* {{{ proto bool SplFileInfo::isFile() - Returns true if file is a regular file */ +/* {{{ Returns true if file is a regular file */ FileInfoFunction(isFile, FS_IS_FILE) /* }}} */ -/* {{{ proto bool SplFileInfo::isDir() - Returns true if file is directory */ +/* {{{ Returns true if file is directory */ FileInfoFunction(isDir, FS_IS_DIR) /* }}} */ -/* {{{ proto bool SplFileInfo::isLink() - Returns true if file is symbolic link */ +/* {{{ Returns true if file is symbolic link */ FileInfoFunction(isLink, FS_IS_LINK) /* }}} */ -/* {{{ proto string SplFileInfo::getLinkTarget() - Return the target of a symbolic link */ +/* {{{ Return the target of a symbolic link */ PHP_METHOD(SplFileInfo, getLinkTarget) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1283,8 +1248,7 @@ PHP_METHOD(SplFileInfo, getLinkTarget) } /* }}} */ -/* {{{ proto string SplFileInfo::getRealPath() - Return the resolved path */ +/* {{{ Return the resolved path */ PHP_METHOD(SplFileInfo, getRealPath) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1324,8 +1288,7 @@ PHP_METHOD(SplFileInfo, getRealPath) } /* }}} */ -/* {{{ proto SplFileObject SplFileInfo::openFile([string mode = 'r' [, bool use_include_path [, resource context]]]) - Open the current file */ +/* {{{ Open the current file */ PHP_METHOD(SplFileInfo, openFile) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1334,8 +1297,7 @@ PHP_METHOD(SplFileInfo, openFile) } /* }}} */ -/* {{{ proto void SplFileInfo::setFileClass([string class_name]) - Class to use in openFile() */ +/* {{{ Class to use in openFile() */ PHP_METHOD(SplFileInfo, setFileClass) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1349,8 +1311,7 @@ PHP_METHOD(SplFileInfo, setFileClass) } /* }}} */ -/* {{{ proto void SplFileInfo::setInfoClass([string class_name]) - Class to use in getFileInfo(), getPathInfo() */ +/* {{{ Class to use in getFileInfo(), getPathInfo() */ PHP_METHOD(SplFileInfo, setInfoClass) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1364,8 +1325,7 @@ PHP_METHOD(SplFileInfo, setInfoClass) } /* }}} */ -/* {{{ proto SplFileInfo SplFileInfo::getFileInfo([string $class_name]) - Get/copy file info */ +/* {{{ Get/copy file info */ PHP_METHOD(SplFileInfo, getFileInfo) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1379,8 +1339,7 @@ PHP_METHOD(SplFileInfo, getFileInfo) } /* }}} */ -/* {{{ proto SplFileInfo SplFileInfo::getPathInfo([string $class_name]) - Get/copy file info */ +/* {{{ Get/copy file info */ PHP_METHOD(SplFileInfo, getPathInfo) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1402,7 +1361,7 @@ PHP_METHOD(SplFileInfo, getPathInfo) } /* }}} */ -/* {{{ proto void SplFileInfo::__debugInfo() */ +/* {{{ */ PHP_METHOD(SplFileInfo, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { @@ -1412,7 +1371,7 @@ PHP_METHOD(SplFileInfo, __debugInfo) RETURN_ARR(spl_filesystem_object_get_debug_info(Z_OBJ_P(ZEND_THIS))); } /* }}} */ -/* {{{ proto SplFileInfo::_bad_state_ex(void) */ +/* {{{ */ PHP_METHOD(SplFileInfo, _bad_state_ex) { zend_throw_exception_ex(spl_ce_LogicException, 0, @@ -1421,16 +1380,14 @@ PHP_METHOD(SplFileInfo, _bad_state_ex) } /* }}} */ -/* {{{ proto FilesystemIterator::__construct(string path [, int flags]) - Cronstructs a new dir iterator from a path. */ +/* {{{ Cronstructs a new dir iterator from a path. */ PHP_METHOD(FilesystemIterator, __construct) { spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIT_CTOR_FLAGS | SPL_FILE_DIR_SKIPDOTS); } /* }}} */ -/* {{{ proto void FilesystemIterator::rewind() - Rewind dir back to the start */ +/* {{{ Rewind dir back to the start */ PHP_METHOD(FilesystemIterator, rewind) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1450,8 +1407,7 @@ PHP_METHOD(FilesystemIterator, rewind) } /* }}} */ -/* {{{ proto int FilesystemIterator::getFlags() - Get handling flags */ +/* {{{ Get handling flags */ PHP_METHOD(FilesystemIterator, getFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1463,8 +1419,7 @@ PHP_METHOD(FilesystemIterator, getFlags) RETURN_LONG(intern->flags & (SPL_FILE_DIR_KEY_MODE_MASK | SPL_FILE_DIR_CURRENT_MODE_MASK | SPL_FILE_DIR_OTHERS_MASK)); } /* }}} */ -/* {{{ proto void FilesystemIterator::setFlags(long $flags) - Set handling flags */ +/* {{{ Set handling flags */ PHP_METHOD(FilesystemIterator, setFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1478,8 +1433,7 @@ PHP_METHOD(FilesystemIterator, setFlags) intern->flags |= ((SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK|SPL_FILE_DIR_OTHERS_MASK) & flags); } /* }}} */ -/* {{{ proto bool RecursiveDirectoryIterator::hasChildren([bool $allow_links = false]) - Returns whether current entry is a directory and not '.' or '..' */ +/* {{{ Returns whether current entry is a directory and not '.' or '..' */ PHP_METHOD(RecursiveDirectoryIterator, hasChildren) { zend_bool allow_links = 0; @@ -1503,8 +1457,7 @@ PHP_METHOD(RecursiveDirectoryIterator, hasChildren) } /* }}} */ -/* {{{ proto RecursiveDirectoryIterator DirectoryIterator::getChildren() - Returns an iterator for the current entry if it is a directory */ +/* {{{ Returns an iterator for the current entry if it is a directory */ PHP_METHOD(RecursiveDirectoryIterator, getChildren) { zval zpath, zflags; @@ -1538,8 +1491,7 @@ PHP_METHOD(RecursiveDirectoryIterator, getChildren) } /* }}} */ -/* {{{ proto void RecursiveDirectoryIterator::getSubPath() - Get sub path */ +/* {{{ Get sub path */ PHP_METHOD(RecursiveDirectoryIterator, getSubPath) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1556,8 +1508,7 @@ PHP_METHOD(RecursiveDirectoryIterator, getSubPath) } /* }}} */ -/* {{{ proto void RecursiveDirectoryIterator::getSubPathname() - Get sub path and file name */ +/* {{{ Get sub path and file name */ PHP_METHOD(RecursiveDirectoryIterator, getSubPathname) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -1575,8 +1526,7 @@ PHP_METHOD(RecursiveDirectoryIterator, getSubPathname) } /* }}} */ -/* {{{ proto RecursiveDirectoryIterator::__construct(string path [, int flags]) - Cronstructs a new dir iterator from a path. */ +/* {{{ Cronstructs a new dir iterator from a path. */ PHP_METHOD(RecursiveDirectoryIterator, __construct) { spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIT_CTOR_FLAGS); @@ -1584,16 +1534,14 @@ PHP_METHOD(RecursiveDirectoryIterator, __construct) /* }}} */ #ifdef HAVE_GLOB -/* {{{ proto GlobIterator::__construct(string path [, int flags]) - Cronstructs a new dir iterator from a glob expression (no glob:// needed). */ +/* {{{ Cronstructs a new dir iterator from a glob expression (no glob:// needed). */ PHP_METHOD(GlobIterator, __construct) { spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIT_CTOR_FLAGS|DIT_CTOR_GLOB); } /* }}} */ -/* {{{ proto int GlobIterator::count() - Return the number of directories and files found by globbing */ +/* {{{ Return the number of directories and files found by globbing */ PHP_METHOD(GlobIterator, count) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2115,8 +2063,7 @@ static void spl_filesystem_file_rewind(zval * this_ptr, spl_filesystem_object *i } } /* }}} */ -/* {{{ proto SplFileObject::__construct(string filename [, string mode = 'r' [, bool use_include_path [, resource context]]]]) - Construct a new file object */ +/* {{{ Construct a new file object */ PHP_METHOD(SplFileObject, __construct) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2175,8 +2122,7 @@ PHP_METHOD(SplFileObject, __construct) } /* }}} */ -/* {{{ proto SplTempFileObject::__construct([int max_memory]) - Construct a new temp file object */ +/* {{{ Construct a new temp file object */ PHP_METHOD(SplTempFileObject, __construct) { zend_long max_memory = PHP_STREAM_MAX_MEM; @@ -2209,8 +2155,7 @@ PHP_METHOD(SplTempFileObject, __construct) zend_restore_error_handling(&error_handling); } /* }}} */ -/* {{{ proto void SplFileObject::rewind() - Rewind the file and read the first line */ +/* {{{ Rewind the file and read the first line */ PHP_METHOD(SplFileObject, rewind) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2222,8 +2167,7 @@ PHP_METHOD(SplFileObject, rewind) spl_filesystem_file_rewind(ZEND_THIS, intern); } /* }}} */ -/* {{{ proto void SplFileObject::eof() - Return whether end of file is reached */ +/* {{{ Return whether end of file is reached */ PHP_METHOD(SplFileObject, eof) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2240,8 +2184,7 @@ PHP_METHOD(SplFileObject, eof) RETURN_BOOL(php_stream_eof(intern->u.file.stream)); } /* }}} */ -/* {{{ proto void SplFileObject::valid() - Return !eof() */ +/* {{{ Return !eof() */ PHP_METHOD(SplFileObject, valid) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2260,8 +2203,7 @@ PHP_METHOD(SplFileObject, valid) } } /* }}} */ -/* {{{ proto string SplFileObject::fgets() - Return next line from file */ +/* {{{ Return next line from file */ PHP_METHOD(SplFileObject, fgets) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2281,8 +2223,7 @@ PHP_METHOD(SplFileObject, fgets) RETURN_STRINGL(intern->u.file.current_line, intern->u.file.current_line_len); } /* }}} */ -/* {{{ proto string SplFileObject::current() - Return current line from file */ +/* {{{ Return current line from file */ PHP_METHOD(SplFileObject, current) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2310,8 +2251,7 @@ PHP_METHOD(SplFileObject, current) RETURN_FALSE; } /* }}} */ -/* {{{ proto int SplFileObject::key() - Return line number */ +/* {{{ Return line number */ PHP_METHOD(SplFileObject, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2327,8 +2267,7 @@ PHP_METHOD(SplFileObject, key) RETURN_LONG(intern->u.file.current_line_num); } /* }}} */ -/* {{{ proto void SplFileObject::next() - Read next line */ +/* {{{ Read next line */ PHP_METHOD(SplFileObject, next) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2344,8 +2283,7 @@ PHP_METHOD(SplFileObject, next) intern->u.file.current_line_num++; } /* }}} */ -/* {{{ proto void SplFileObject::setFlags(int flags) - Set file handling flags */ +/* {{{ Set file handling flags */ PHP_METHOD(SplFileObject, setFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2355,8 +2293,7 @@ PHP_METHOD(SplFileObject, setFlags) } } /* }}} */ -/* {{{ proto int SplFileObject::getFlags() - Get file handling flags */ +/* {{{ Get file handling flags */ PHP_METHOD(SplFileObject, getFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2368,8 +2305,7 @@ PHP_METHOD(SplFileObject, getFlags) RETURN_LONG(intern->flags & SPL_FILE_OBJECT_MASK); } /* }}} */ -/* {{{ proto void SplFileObject::setMaxLineLen(int max_len) - Set maximum line length */ +/* {{{ Set maximum line length */ PHP_METHOD(SplFileObject, setMaxLineLen) { zend_long max_len; @@ -2388,8 +2324,7 @@ PHP_METHOD(SplFileObject, setMaxLineLen) intern->u.file.max_line_len = max_len; } /* }}} */ -/* {{{ proto int SplFileObject::getMaxLineLen() - Get maximum line length */ +/* {{{ Get maximum line length */ PHP_METHOD(SplFileObject, getMaxLineLen) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2401,8 +2336,7 @@ PHP_METHOD(SplFileObject, getMaxLineLen) RETURN_LONG((zend_long)intern->u.file.max_line_len); } /* }}} */ -/* {{{ proto bool SplFileObject::hasChildren() - Return false */ +/* {{{ Return false */ PHP_METHOD(SplFileObject, hasChildren) { if (zend_parse_parameters_none() == FAILURE) { @@ -2412,8 +2346,7 @@ PHP_METHOD(SplFileObject, hasChildren) RETURN_FALSE; } /* }}} */ -/* {{{ proto bool SplFileObject::getChildren() - Read NULL */ +/* {{{ Read NULL */ PHP_METHOD(SplFileObject, getChildren) { if (zend_parse_parameters_none() == FAILURE) { @@ -2431,8 +2364,7 @@ PHP_METHOD(SplFileObject, func_name) \ } /* }}} */ -/* {{{ proto array SplFileObject::fgetcsv([string delimiter [, string enclosure [, escape = '\\']]]) - Return current line as csv */ +/* {{{ Return current line as csv */ PHP_METHOD(SplFileObject, fgetcsv) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2483,8 +2415,7 @@ PHP_METHOD(SplFileObject, fgetcsv) } /* }}} */ -/* {{{ proto int SplFileObject::fputcsv(array fields, [string delimiter [, string enclosure [, string escape]]]) - Output a field array as a CSV line */ +/* {{{ Output a field array as a CSV line */ PHP_METHOD(SplFileObject, fputcsv) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2538,8 +2469,7 @@ PHP_METHOD(SplFileObject, fputcsv) } /* }}} */ -/* {{{ proto void SplFileObject::setCsvControl([string delimiter [, string enclosure [, string escape ]]]) - Set the delimiter, enclosure and escape character used in fgetcsv */ +/* {{{ Set the delimiter, enclosure and escape character used in fgetcsv */ PHP_METHOD(SplFileObject, setCsvControl) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2588,8 +2518,7 @@ PHP_METHOD(SplFileObject, setCsvControl) } /* }}} */ -/* {{{ proto array SplFileObject::getCsvControl() - Get the delimiter, enclosure and escape character used in fgetcsv */ +/* {{{ Get the delimiter, enclosure and escape character used in fgetcsv */ PHP_METHOD(SplFileObject, getCsvControl) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2614,13 +2543,11 @@ PHP_METHOD(SplFileObject, getCsvControl) } /* }}} */ -/* {{{ proto bool SplFileObject::flock(int operation [, int &wouldblock]) - Portable file locking */ +/* {{{ Portable file locking */ FileFunction(flock) /* }}} */ -/* {{{ proto bool SplFileObject::fflush() - Flush the file */ +/* {{{ Flush the file */ PHP_METHOD(SplFileObject, fflush) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2633,8 +2560,7 @@ PHP_METHOD(SplFileObject, fflush) RETURN_BOOL(!php_stream_flush(intern->u.file.stream)); } /* }}} */ -/* {{{ proto int SplFileObject::ftell() - Return current file position */ +/* {{{ Return current file position */ PHP_METHOD(SplFileObject, ftell) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2654,8 +2580,7 @@ PHP_METHOD(SplFileObject, ftell) } } /* }}} */ -/* {{{ proto int SplFileObject::fseek(int pos [, int whence = SEEK_SET]) - Return current file position */ +/* {{{ Return current file position */ PHP_METHOD(SplFileObject, fseek) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2674,8 +2599,7 @@ PHP_METHOD(SplFileObject, fseek) RETURN_LONG(php_stream_seek(intern->u.file.stream, pos, (int)whence)); } /* }}} */ -/* {{{ proto int SplFileObject::fgetc() - Get a character form the file */ +/* {{{ Get a character form the file */ PHP_METHOD(SplFileObject, fgetc) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2704,8 +2628,7 @@ PHP_METHOD(SplFileObject, fgetc) } } /* }}} */ -/* {{{ proto int SplFileObject::fpassthru() - Output all remaining data from a file pointer */ +/* {{{ Output all remaining data from a file pointer */ PHP_METHOD(SplFileObject, fpassthru) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2718,8 +2641,7 @@ PHP_METHOD(SplFileObject, fpassthru) RETURN_LONG(php_stream_passthru(intern->u.file.stream)); } /* }}} */ -/* {{{ proto bool SplFileObject::fscanf(string format [, string ...]) - Implements a mostly ANSI compatible fscanf() */ +/* {{{ Implements a mostly ANSI compatible fscanf() */ PHP_METHOD(SplFileObject, fscanf) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2736,8 +2658,7 @@ PHP_METHOD(SplFileObject, fscanf) } /* }}} */ -/* {{{ proto int|false SplFileObject::fwrite(string str [, int length]) - Binary-safe file write */ +/* {{{ Binary-safe file write */ PHP_METHOD(SplFileObject, fwrite) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2801,13 +2722,11 @@ PHP_METHOD(SplFileObject, fread) RETURN_STR(str); } -/* {{{ proto bool SplFileObject::fstat() - Stat() on a filehandle */ +/* {{{ Stat() on a filehandle */ FileFunction(fstat) /* }}} */ -/* {{{ proto bool SplFileObject::ftruncate(int size) - Truncate file to 'size' length */ +/* {{{ Truncate file to 'size' length */ PHP_METHOD(SplFileObject, ftruncate) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2830,8 +2749,7 @@ PHP_METHOD(SplFileObject, ftruncate) RETURN_BOOL(0 == php_stream_truncate_set_size(intern->u.file.stream, size)); } /* }}} */ -/* {{{ proto void SplFileObject::seek(int line_pos) - Seek to specified line */ +/* {{{ Seek to specified line */ PHP_METHOD(SplFileObject, seek) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS); @@ -2859,8 +2777,7 @@ PHP_METHOD(SplFileObject, seek) } } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION(spl_directory) - */ +/* {{{ PHP_MINIT_FUNCTION(spl_directory) */ PHP_MINIT_FUNCTION(spl_directory) { REGISTER_SPL_STD_CLASS_EX(SplFileInfo, spl_filesystem_object_new, class_SplFileInfo_methods); diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 9479b9056a..1d91eceb6a 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -539,8 +539,7 @@ static HashTable *spl_dllist_object_get_gc(zend_object *obj, zval **gc_data, int } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::push(mixed value) - Push $value on the SplDoublyLinkedList */ +/* {{{ Push $value on the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, push) { zval *value; @@ -555,8 +554,7 @@ PHP_METHOD(SplDoublyLinkedList, push) } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::unshift(mixed value) - Unshift $value on the SplDoublyLinkedList */ +/* {{{ Unshift $value on the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, unshift) { zval *value; @@ -571,8 +569,7 @@ PHP_METHOD(SplDoublyLinkedList, unshift) } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::pop() - Pop an element out of the SplDoublyLinkedList */ +/* {{{ Pop an element out of the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, pop) { spl_dllist_object *intern; @@ -591,8 +588,7 @@ PHP_METHOD(SplDoublyLinkedList, pop) } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::shift() - Shift an element out of the SplDoublyLinkedList */ +/* {{{ Shift an element out of the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, shift) { spl_dllist_object *intern; @@ -611,8 +607,7 @@ PHP_METHOD(SplDoublyLinkedList, shift) } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::top() - Peek at the top element of the SplDoublyLinkedList */ +/* {{{ Peek at the top element of the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, top) { zval *value; @@ -634,8 +629,7 @@ PHP_METHOD(SplDoublyLinkedList, top) } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::bottom() - Peek at the bottom element of the SplDoublyLinkedList */ +/* {{{ Peek at the bottom element of the SplDoublyLinkedList */ PHP_METHOD(SplDoublyLinkedList, bottom) { zval *value; @@ -657,8 +651,7 @@ PHP_METHOD(SplDoublyLinkedList, bottom) } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::count() - Return the number of elements in the datastructure. */ +/* {{{ Return the number of elements in the datastructure. */ PHP_METHOD(SplDoublyLinkedList, count) { zend_long count; @@ -673,8 +666,7 @@ PHP_METHOD(SplDoublyLinkedList, count) } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::isEmpty() - Return true if the SplDoublyLinkedList is empty. */ +/* {{{ Return true if the SplDoublyLinkedList is empty. */ PHP_METHOD(SplDoublyLinkedList, isEmpty) { zend_long count; @@ -688,8 +680,7 @@ PHP_METHOD(SplDoublyLinkedList, isEmpty) } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::setIteratorMode(int mode) - Set the mode of iteration */ +/* {{{ Set the mode of iteration */ PHP_METHOD(SplDoublyLinkedList, setIteratorMode) { zend_long value; @@ -713,8 +704,7 @@ PHP_METHOD(SplDoublyLinkedList, setIteratorMode) } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::getIteratorMode() - Return the mode of iteration */ +/* {{{ Return the mode of iteration */ PHP_METHOD(SplDoublyLinkedList, getIteratorMode) { spl_dllist_object *intern; @@ -729,8 +719,7 @@ PHP_METHOD(SplDoublyLinkedList, getIteratorMode) } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::offsetExists(mixed index) - Returns whether the requested $index exists. */ +/* {{{ Returns whether the requested $index exists. */ PHP_METHOD(SplDoublyLinkedList, offsetExists) { zval *zindex; @@ -747,8 +736,7 @@ PHP_METHOD(SplDoublyLinkedList, offsetExists) RETURN_BOOL(index >= 0 && index < intern->llist->count); } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::offsetGet(mixed index) - Returns the value at the specified $index. */ +/* {{{ Returns the value at the specified $index. */ PHP_METHOD(SplDoublyLinkedList, offsetGet) { zval *zindex; @@ -779,8 +767,7 @@ PHP_METHOD(SplDoublyLinkedList, offsetGet) } } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::offsetSet(mixed index, mixed newval) - Sets the value at the specified $index to $newval. */ +/* {{{ Sets the value at the specified $index to $newval. */ PHP_METHOD(SplDoublyLinkedList, offsetSet) { zval *zindex, *value; @@ -832,8 +819,7 @@ PHP_METHOD(SplDoublyLinkedList, offsetSet) } } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::offsetUnset(mixed index) - Unsets the value at the specified $index. */ +/* {{{ Unsets the value at the specified $index. */ PHP_METHOD(SplDoublyLinkedList, offsetUnset) { zval *zindex; @@ -1009,8 +995,7 @@ static void spl_dllist_it_move_forward(zend_object_iterator *iter) /* {{{ */ } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::key() - Return current array key */ +/* {{{ Return current array key */ PHP_METHOD(SplDoublyLinkedList, key) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1023,8 +1008,7 @@ PHP_METHOD(SplDoublyLinkedList, key) } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::prev() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(SplDoublyLinkedList, prev) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1037,8 +1021,7 @@ PHP_METHOD(SplDoublyLinkedList, prev) } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::next() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(SplDoublyLinkedList, next) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1051,8 +1034,7 @@ PHP_METHOD(SplDoublyLinkedList, next) } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::valid() - Check whether the datastructure contains more entries */ +/* {{{ Check whether the datastructure contains more entries */ PHP_METHOD(SplDoublyLinkedList, valid) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1065,8 +1047,7 @@ PHP_METHOD(SplDoublyLinkedList, valid) } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::rewind() - Rewind the datastructure back to the start */ +/* {{{ Rewind the datastructure back to the start */ PHP_METHOD(SplDoublyLinkedList, rewind) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1079,8 +1060,7 @@ PHP_METHOD(SplDoublyLinkedList, rewind) } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::current() - Return current datastructure entry */ +/* {{{ Return current datastructure entry */ PHP_METHOD(SplDoublyLinkedList, current) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1100,8 +1080,7 @@ PHP_METHOD(SplDoublyLinkedList, current) } /* }}} */ -/* {{{ proto string SplDoublyLinkedList::serialize() - Serializes storage */ +/* {{{ Serializes storage */ PHP_METHOD(SplDoublyLinkedList, serialize) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1138,8 +1117,7 @@ PHP_METHOD(SplDoublyLinkedList, serialize) RETURN_NEW_STR(buf.s); } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::unserialize(string serialized) - Unserializes storage */ +/* {{{ Unserializes storage */ PHP_METHOD(SplDoublyLinkedList, unserialize) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1200,7 +1178,7 @@ error: } /* }}} */ -/* {{{ proto array SplDoublyLinkedList::__serialize() */ +/* {{{ */ PHP_METHOD(SplDoublyLinkedList, __serialize) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); @@ -1232,7 +1210,7 @@ PHP_METHOD(SplDoublyLinkedList, __serialize) zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &tmp); } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::__unserialize(array serialized) */ +/* {{{ */ PHP_METHOD(SplDoublyLinkedList, __unserialize) { spl_dllist_object *intern = Z_SPLDLLIST_P(ZEND_THIS); HashTable *data; @@ -1262,8 +1240,7 @@ PHP_METHOD(SplDoublyLinkedList, __unserialize) { object_properties_load(&intern->std, Z_ARRVAL_P(members_zv)); } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::add(mixed index, mixed newval) - Inserts a new entry before the specified $index consisting of $newval. */ +/* {{{ Inserts a new entry before the specified $index consisting of $newval. */ PHP_METHOD(SplDoublyLinkedList, add) { zval *zindex, *value; @@ -1316,7 +1293,7 @@ PHP_METHOD(SplDoublyLinkedList, add) } } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::__debugInfo() */ +/* {{{ */ PHP_METHOD(SplDoublyLinkedList, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 46536274b9..866a0a9a78 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -519,8 +519,7 @@ static int spl_fixedarray_object_count_elements(zend_object *object, zend_long * } /* }}} */ -/* {{{ proto SplFixedArray::__construct([int size]) -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, __construct) { zval *object = ZEND_THIS; @@ -547,8 +546,7 @@ PHP_METHOD(SplFixedArray, __construct) } /* }}} */ -/* {{{ proto SplFixedArray::__wakeup() -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, __wakeup) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -577,8 +575,7 @@ PHP_METHOD(SplFixedArray, __wakeup) } /* }}} */ -/* {{{ proto int SplFixedArray::count(void) -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, count) { zval *object = ZEND_THIS; @@ -593,8 +590,7 @@ PHP_METHOD(SplFixedArray, count) } /* }}} */ -/* {{{ proto object SplFixedArray::toArray() -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, toArray) { spl_fixedarray_object *intern; @@ -619,8 +615,7 @@ PHP_METHOD(SplFixedArray, toArray) } /* }}} */ -/* {{{ proto object SplFixedArray::fromArray(array array[, bool save_indexes]) -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, fromArray) { zval *data; @@ -684,8 +679,7 @@ PHP_METHOD(SplFixedArray, fromArray) } /* }}} */ -/* {{{ proto int SplFixedArray::getSize(void) -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, getSize) { zval *object = ZEND_THIS; @@ -700,8 +694,7 @@ PHP_METHOD(SplFixedArray, getSize) } /* }}} */ -/* {{{ proto bool SplFixedArray::setSize(int size) -*/ +/* {{{ */ PHP_METHOD(SplFixedArray, setSize) { zval *object = ZEND_THIS; @@ -724,8 +717,7 @@ PHP_METHOD(SplFixedArray, setSize) } /* }}} */ -/* {{{ proto bool SplFixedArray::offsetExists(mixed $index) - Returns whether the requested $index exists. */ +/* {{{ Returns whether the requested $index exists. */ PHP_METHOD(SplFixedArray, offsetExists) { zval *zindex; @@ -740,8 +732,7 @@ PHP_METHOD(SplFixedArray, offsetExists) RETURN_BOOL(spl_fixedarray_object_has_dimension_helper(intern, zindex, 0)); } /* }}} */ -/* {{{ proto mixed SplFixedArray::offsetGet(mixed $index) - Returns the value at the specified $index. */ +/* {{{ Returns the value at the specified $index. */ PHP_METHOD(SplFixedArray, offsetGet) { zval *zindex, *value; @@ -761,8 +752,7 @@ PHP_METHOD(SplFixedArray, offsetGet) } } /* }}} */ -/* {{{ proto void SplFixedArray::offsetSet(mixed $index, mixed $newval) - Sets the value at the specified $index to $newval. */ +/* {{{ Sets the value at the specified $index to $newval. */ PHP_METHOD(SplFixedArray, offsetSet) { zval *zindex, *value; @@ -777,8 +767,7 @@ PHP_METHOD(SplFixedArray, offsetSet) } /* }}} */ -/* {{{ proto void SplFixedArray::offsetUnset(mixed $index) - Unsets the value at the specified $index. */ +/* {{{ Unsets the value at the specified $index. */ PHP_METHOD(SplFixedArray, offsetUnset) { zval *zindex; @@ -877,8 +866,7 @@ static void spl_fixedarray_it_move_forward(zend_object_iterator *iter) /* {{{ */ } /* }}} */ -/* {{{ proto int SplFixedArray::key() - Return current array key */ +/* {{{ Return current array key */ PHP_METHOD(SplFixedArray, key) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -891,8 +879,7 @@ PHP_METHOD(SplFixedArray, key) } /* }}} */ -/* {{{ proto void SplFixedArray::next() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(SplFixedArray, next) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -905,8 +892,7 @@ PHP_METHOD(SplFixedArray, next) } /* }}} */ -/* {{{ proto bool SplFixedArray::valid() - Check whether the datastructure contains more entries */ +/* {{{ Check whether the datastructure contains more entries */ PHP_METHOD(SplFixedArray, valid) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -919,8 +905,7 @@ PHP_METHOD(SplFixedArray, valid) } /* }}} */ -/* {{{ proto void SplFixedArray::rewind() - Rewind the datastructure back to the start */ +/* {{{ Rewind the datastructure back to the start */ PHP_METHOD(SplFixedArray, rewind) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); @@ -933,8 +918,7 @@ PHP_METHOD(SplFixedArray, rewind) } /* }}} */ -/* {{{ proto mixed|NULL SplFixedArray::current() - Return current datastructure entry */ +/* {{{ Return current datastructure entry */ PHP_METHOD(SplFixedArray, current) { zval zindex, *value; diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 3e8a73d021..e23b0f2421 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -558,8 +558,7 @@ static HashTable *spl_pqueue_object_get_gc(zend_object *obj, zval **gc_data, int } /* }}} */ -/* {{{ proto int SplHeap::count() - Return the number of elements in the heap. */ +/* {{{ Return the number of elements in the heap. */ PHP_METHOD(SplHeap, count) { zend_long count; @@ -574,8 +573,7 @@ PHP_METHOD(SplHeap, count) } /* }}} */ -/* {{{ proto int SplHeap::isEmpty() - Return true if the heap is empty. */ +/* {{{ Return true if the heap is empty. */ PHP_METHOD(SplHeap, isEmpty) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -588,8 +586,7 @@ PHP_METHOD(SplHeap, isEmpty) } /* }}} */ -/* {{{ proto bool SplHeap::insert(mixed value) - Push $value on the heap */ +/* {{{ Push $value on the heap */ PHP_METHOD(SplHeap, insert) { zval *value; @@ -613,8 +610,7 @@ PHP_METHOD(SplHeap, insert) } /* }}} */ -/* {{{ proto mixed SplHeap::extract() - extract the element out of the top of the heap */ +/* {{{ extract the element out of the top of the heap */ PHP_METHOD(SplHeap, extract) { spl_heap_object *intern; @@ -637,8 +633,7 @@ PHP_METHOD(SplHeap, extract) } /* }}} */ -/* {{{ proto bool SplPriorityQueue::insert(mixed value, mixed priority) - Push $value with the priority $priodiry on the priorityqueue */ +/* {{{ Push $value with the priority $priodiry on the priorityqueue */ PHP_METHOD(SplPriorityQueue, insert) { zval *data, *priority; @@ -665,8 +660,7 @@ PHP_METHOD(SplPriorityQueue, insert) } /* }}} */ -/* {{{ proto mixed SplPriorityQueue::extract() - extract the element out of the top of the priority queue */ +/* {{{ extract the element out of the top of the priority queue */ PHP_METHOD(SplPriorityQueue, extract) { spl_pqueue_elem elem; @@ -693,8 +687,7 @@ PHP_METHOD(SplPriorityQueue, extract) } /* }}} */ -/* {{{ proto mixed SplPriorityQueue::top() - Peek at the top element of the priority queue */ +/* {{{ Peek at the top element of the priority queue */ PHP_METHOD(SplPriorityQueue, top) { spl_heap_object *intern; @@ -723,8 +716,7 @@ PHP_METHOD(SplPriorityQueue, top) /* }}} */ -/* {{{ proto int SplPriorityQueue::setExtractFlags(int flags) - Set the flags of extraction*/ +/* {{{ Set the flags of extraction*/ PHP_METHOD(SplPriorityQueue, setExtractFlags) { zend_long value; @@ -746,8 +738,7 @@ PHP_METHOD(SplPriorityQueue, setExtractFlags) } /* }}} */ -/* {{{ proto int SplPriorityQueue::getExtractFlags() - Get the flags of extraction*/ +/* {{{ Get the flags of extraction*/ PHP_METHOD(SplPriorityQueue, getExtractFlags) { spl_heap_object *intern; @@ -762,8 +753,7 @@ PHP_METHOD(SplPriorityQueue, getExtractFlags) } /* }}} */ -/* {{{ proto int SplHeap::recoverFromCorruption() - Recover from a corrupted state*/ +/* {{{ Recover from a corrupted state*/ PHP_METHOD(SplHeap, recoverFromCorruption) { spl_heap_object *intern; @@ -780,8 +770,7 @@ PHP_METHOD(SplHeap, recoverFromCorruption) } /* }}} */ -/* {{{ proto int SplHeap::isCorrupted() - Tells if the heap is in a corrupted state*/ +/* {{{ Tells if the heap is in a corrupted state*/ PHP_METHOD(SplHeap, isCorrupted) { spl_heap_object *intern; @@ -796,8 +785,7 @@ PHP_METHOD(SplHeap, isCorrupted) } /* }}} */ -/* {{{ proto bool SplPriorityQueue::compare(mixed $value1, mixed $value2) - compare the priorities */ +/* {{{ compare the priorities */ PHP_METHOD(SplPriorityQueue, compare) { zval *a, *b; @@ -810,8 +798,7 @@ PHP_METHOD(SplPriorityQueue, compare) } /* }}} */ -/* {{{ proto mixed SplHeap::top() - Peek at the top element of the heap */ +/* {{{ Peek at the top element of the heap */ PHP_METHOD(SplHeap, top) { zval *value; @@ -839,8 +826,7 @@ PHP_METHOD(SplHeap, top) } /* }}} */ -/* {{{ proto bool SplMinHeap::compare(mixed $value1, mixed $value2) - compare the values */ +/* {{{ compare the values */ PHP_METHOD(SplMinHeap, compare) { zval *a, *b; @@ -853,8 +839,7 @@ PHP_METHOD(SplMinHeap, compare) } /* }}} */ -/* {{{ proto bool SplMaxHeap::compare(mixed $value1, mixed $value2) - compare the values */ +/* {{{ compare the values */ PHP_METHOD(SplMaxHeap, compare) { zval *a, *b; @@ -949,8 +934,7 @@ static void spl_heap_it_move_forward(zend_object_iterator *iter) /* {{{ */ } /* }}} */ -/* {{{ proto int SplHeap::key() - Return current array key */ +/* {{{ Return current array key */ PHP_METHOD(SplHeap, key) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -963,8 +947,7 @@ PHP_METHOD(SplHeap, key) } /* }}} */ -/* {{{ proto void SplHeap::next() - Move to next entry */ +/* {{{ Move to next entry */ PHP_METHOD(SplHeap, next) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -977,8 +960,7 @@ PHP_METHOD(SplHeap, next) } /* }}} */ -/* {{{ proto bool SplHeap::valid() - Check whether the datastructure contains more entries */ +/* {{{ Check whether the datastructure contains more entries */ PHP_METHOD(SplHeap, valid) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -991,8 +973,7 @@ PHP_METHOD(SplHeap, valid) } /* }}} */ -/* {{{ proto void SplHeap::rewind() - Rewind the datastructure back to the start */ +/* {{{ Rewind the datastructure back to the start */ PHP_METHOD(SplHeap, rewind) { if (zend_parse_parameters_none() == FAILURE) { @@ -1002,8 +983,7 @@ PHP_METHOD(SplHeap, rewind) } /* }}} */ -/* {{{ proto mixed|NULL SplHeap::current() - Return current datastructure entry */ +/* {{{ Return current datastructure entry */ PHP_METHOD(SplHeap, current) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -1021,8 +1001,7 @@ PHP_METHOD(SplHeap, current) } /* }}} */ -/* {{{ proto mixed|NULL SplPriorityQueue::current() - Return current datastructure entry */ +/* {{{ Return current datastructure entry */ PHP_METHOD(SplPriorityQueue, current) { spl_heap_object *intern = Z_SPLHEAP_P(ZEND_THIS); @@ -1040,7 +1019,7 @@ PHP_METHOD(SplPriorityQueue, current) } /* }}} */ -/* {{{ proto void SplHeap::__debugInfo() */ +/* {{{ */ PHP_METHOD(SplHeap, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { @@ -1050,7 +1029,7 @@ PHP_METHOD(SplHeap, __debugInfo) RETURN_ARR(spl_heap_object_get_debug_info(spl_ce_SplHeap, Z_OBJ_P(ZEND_THIS))); } /* }}} */ -/* {{{ proto void SplPriorityQueue::__debugInfo() */ +/* {{{ */ PHP_METHOD(SplPriorityQueue, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index dfac8a48df..1656ef1f77 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -591,15 +591,13 @@ static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_cla } } -/* {{{ proto RecursiveIteratorIterator::__construct(RecursiveIterator|IteratorAggregate it [, int mode = RIT_LEAVES_ONLY [, int flags = 0]]) throws InvalidArgumentException - Creates a RecursiveIteratorIterator from a RecursiveIterator. */ +/* {{{ Creates a RecursiveIteratorIterator from a RecursiveIterator. */ PHP_METHOD(RecursiveIteratorIterator, __construct) { spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveIteratorIterator, zend_ce_iterator, RIT_RecursiveIteratorIterator); } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::rewind() - Rewind the iterator to the first element of the top level inner iterator. */ +/* {{{ Rewind the iterator to the first element of the top level inner iterator. */ PHP_METHOD(RecursiveIteratorIterator, rewind) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -611,8 +609,7 @@ PHP_METHOD(RecursiveIteratorIterator, rewind) spl_recursive_it_rewind_ex(object, ZEND_THIS); } /* }}} */ -/* {{{ proto bool RecursiveIteratorIterator::valid() - Check whether the current position is valid */ +/* {{{ Check whether the current position is valid */ PHP_METHOD(RecursiveIteratorIterator, valid) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -624,8 +621,7 @@ PHP_METHOD(RecursiveIteratorIterator, valid) RETURN_BOOL(spl_recursive_it_valid_ex(object, ZEND_THIS) == SUCCESS); } /* }}} */ -/* {{{ proto mixed RecursiveIteratorIterator::key() - Access the current key */ +/* {{{ Access the current key */ PHP_METHOD(RecursiveIteratorIterator, key) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -644,8 +640,7 @@ PHP_METHOD(RecursiveIteratorIterator, key) } } /* }}} */ -/* {{{ proto mixed RecursiveIteratorIterator::current() - Access the current element value */ +/* {{{ Access the current element value */ PHP_METHOD(RecursiveIteratorIterator, current) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -664,8 +659,7 @@ PHP_METHOD(RecursiveIteratorIterator, current) } } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::next() - Move forward to the next element */ +/* {{{ Move forward to the next element */ PHP_METHOD(RecursiveIteratorIterator, next) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -677,8 +671,7 @@ PHP_METHOD(RecursiveIteratorIterator, next) spl_recursive_it_move_forward_ex(object, ZEND_THIS); } /* }}} */ -/* {{{ proto int RecursiveIteratorIterator::getDepth() - Get the current depth of the recursive iteration */ +/* {{{ Get the current depth of the recursive iteration */ PHP_METHOD(RecursiveIteratorIterator, getDepth) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -690,8 +683,7 @@ PHP_METHOD(RecursiveIteratorIterator, getDepth) RETURN_LONG(object->level); } /* }}} */ -/* {{{ proto RecursiveIterator RecursiveIteratorIterator::getSubIterator([int level]) - The current active sub iterator or the iterator at specified level */ +/* {{{ The current active sub iterator or the iterator at specified level */ PHP_METHOD(RecursiveIteratorIterator, getSubIterator) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -715,8 +707,7 @@ PHP_METHOD(RecursiveIteratorIterator, getSubIterator) ZVAL_COPY_DEREF(return_value, value); } /* }}} */ -/* {{{ proto RecursiveIterator RecursiveIteratorIterator::getInnerIterator() - The current active sub iterator */ +/* {{{ The current active sub iterator */ PHP_METHOD(RecursiveIteratorIterator, getInnerIterator) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -731,8 +722,7 @@ PHP_METHOD(RecursiveIteratorIterator, getInnerIterator) ZVAL_COPY_DEREF(return_value, zobject); } /* }}} */ -/* {{{ proto RecursiveIterator RecursiveIteratorIterator::beginIteration() - Called when iteration begins (after first rewind() call) */ +/* {{{ Called when iteration begins (after first rewind() call) */ PHP_METHOD(RecursiveIteratorIterator, beginIteration) { if (zend_parse_parameters_none() == FAILURE) { @@ -741,8 +731,7 @@ PHP_METHOD(RecursiveIteratorIterator, beginIteration) /* nothing to do */ } /* }}} */ -/* {{{ proto RecursiveIterator RecursiveIteratorIterator::endIteration() - Called when iteration ends (when valid() first returns false */ +/* {{{ Called when iteration ends (when valid() first returns false */ PHP_METHOD(RecursiveIteratorIterator, endIteration) { if (zend_parse_parameters_none() == FAILURE) { @@ -751,8 +740,7 @@ PHP_METHOD(RecursiveIteratorIterator, endIteration) /* nothing to do */ } /* }}} */ -/* {{{ proto bool RecursiveIteratorIterator::callHasChildren() - Called for each element to test whether it has children */ +/* {{{ Called for each element to test whether it has children */ PHP_METHOD(RecursiveIteratorIterator, callHasChildren) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -780,8 +768,7 @@ PHP_METHOD(RecursiveIteratorIterator, callHasChildren) } } /* }}} */ -/* {{{ proto RecursiveIterator RecursiveIteratorIterator::callGetChildren() - Return children of current element */ +/* {{{ Return children of current element */ PHP_METHOD(RecursiveIteratorIterator, callGetChildren) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -805,8 +792,7 @@ PHP_METHOD(RecursiveIteratorIterator, callGetChildren) } } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::beginChildren() - Called when recursing one level down */ +/* {{{ Called when recursing one level down */ PHP_METHOD(RecursiveIteratorIterator, beginChildren) { if (zend_parse_parameters_none() == FAILURE) { @@ -815,8 +801,7 @@ PHP_METHOD(RecursiveIteratorIterator, beginChildren) /* nothing to do */ } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::endChildren() - Called when end recursing one level */ +/* {{{ Called when end recursing one level */ PHP_METHOD(RecursiveIteratorIterator, endChildren) { if (zend_parse_parameters_none() == FAILURE) { @@ -825,8 +810,7 @@ PHP_METHOD(RecursiveIteratorIterator, endChildren) /* nothing to do */ } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::nextElement() - Called when the next element is available */ +/* {{{ Called when the next element is available */ PHP_METHOD(RecursiveIteratorIterator, nextElement) { if (zend_parse_parameters_none() == FAILURE) { @@ -835,8 +819,7 @@ PHP_METHOD(RecursiveIteratorIterator, nextElement) /* nothing to do */ } /* }}} */ -/* {{{ proto void RecursiveIteratorIterator::setMaxDepth([$max_depth = -1]) - Set the maximum allowed depth (or any depth if pmax_depth = -1] */ +/* {{{ Set the maximum allowed depth (or any depth if pmax_depth = -1] */ PHP_METHOD(RecursiveIteratorIterator, setMaxDepth) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -855,8 +838,7 @@ PHP_METHOD(RecursiveIteratorIterator, setMaxDepth) object->max_depth = (int)max_depth; } /* }}} */ -/* {{{ proto int|false RecursiveIteratorIterator::getMaxDepth() - Return the maximum accepted depth or false if any depth is allowed */ +/* {{{ Return the maximum accepted depth or false if any depth is allowed */ PHP_METHOD(RecursiveIteratorIterator, getMaxDepth) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1039,15 +1021,13 @@ static void spl_recursive_tree_iterator_get_postfix(spl_recursive_it_object *obj Z_ADDREF_P(return_value); } -/* {{{ proto RecursiveTreeIterator::__construct(RecursiveIterator|IteratorAggregate it [, int flags = RTIT_BYPASS_KEY [, int cit_flags = CIT_CATCH_GET_CHILD [, mode = RIT_SELF_FIRST ]]]) throws InvalidArgumentException - RecursiveIteratorIterator to generate ASCII graphic trees for the entries in a RecursiveIterator */ +/* {{{ RecursiveIteratorIterator to generate ASCII graphic trees for the entries in a RecursiveIterator */ PHP_METHOD(RecursiveTreeIterator, __construct) { spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveTreeIterator, zend_ce_iterator, RIT_RecursiveTreeIterator); } /* }}} */ -/* {{{ proto void RecursiveTreeIterator::setPrefixPart(int part, string prefix) throws OutOfRangeException - Sets prefix parts as used in getPrefix() */ +/* {{{ Sets prefix parts as used in getPrefix() */ PHP_METHOD(RecursiveTreeIterator, setPrefixPart) { zend_long part; @@ -1068,8 +1048,7 @@ PHP_METHOD(RecursiveTreeIterator, setPrefixPart) smart_str_appendl(&object->prefix[part], prefix, prefix_len); } /* }}} */ -/* {{{ proto string RecursiveTreeIterator::getPrefix() - Returns the string to place in front of current element */ +/* {{{ Returns the string to place in front of current element */ PHP_METHOD(RecursiveTreeIterator, getPrefix) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1087,8 +1066,7 @@ PHP_METHOD(RecursiveTreeIterator, getPrefix) spl_recursive_tree_iterator_get_prefix(object, return_value); } /* }}} */ -/* {{{ proto void RecursiveTreeIterator::setPostfix(string prefix) - Sets postfix as used in getPostfix() */ +/* {{{ Sets postfix as used in getPostfix() */ PHP_METHOD(RecursiveTreeIterator, setPostfix) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1103,8 +1081,7 @@ PHP_METHOD(RecursiveTreeIterator, setPostfix) smart_str_appendl(&object->postfix[0], postfix, postfix_len); } /* }}} */ -/* {{{ proto string RecursiveTreeIterator::getEntry() - Returns the string presentation built for current element */ +/* {{{ Returns the string presentation built for current element */ PHP_METHOD(RecursiveTreeIterator, getEntry) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1122,8 +1099,7 @@ PHP_METHOD(RecursiveTreeIterator, getEntry) spl_recursive_tree_iterator_get_entry(object, return_value); } /* }}} */ -/* {{{ proto string RecursiveTreeIterator::getPostfix() - Returns the string to place after the current element */ +/* {{{ Returns the string to place after the current element */ PHP_METHOD(RecursiveTreeIterator, getPostfix) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1141,8 +1117,7 @@ PHP_METHOD(RecursiveTreeIterator, getPostfix) spl_recursive_tree_iterator_get_postfix(object, return_value); } /* }}} */ -/* {{{ proto mixed RecursiveTreeIterator::current() - Returns the current element prefixed and postfixed */ +/* {{{ Returns the current element prefixed and postfixed */ PHP_METHOD(RecursiveTreeIterator, current) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1203,8 +1178,7 @@ PHP_METHOD(RecursiveTreeIterator, current) RETURN_NEW_STR(str); } /* }}} */ -/* {{{ proto mixed RecursiveTreeIterator::key() - Returns the current key prefixed and postfixed */ +/* {{{ Returns the current key prefixed and postfixed */ PHP_METHOD(RecursiveTreeIterator, key) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(ZEND_THIS); @@ -1457,25 +1431,19 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z return intern; } -/* {{{ proto FilterIterator::__construct(Iterator it) - Create an Iterator from another iterator */ +/* {{{ Create an Iterator from another iterator */ PHP_METHOD(FilterIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_FilterIterator, zend_ce_iterator, DIT_FilterIterator); } /* }}} */ -/* {{{ proto CallbackFilterIterator::__construct(Iterator it, callback func) - Create an Iterator from another iterator */ +/* {{{ Create an Iterator from another iterator */ PHP_METHOD(CallbackFilterIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_CallbackFilterIterator, zend_ce_iterator, DIT_CallbackFilterIterator); } /* }}} */ -/* {{{ proto Iterator FilterIterator::getInnerIterator() - proto Iterator CachingIterator::getInnerIterator() - proto Iterator LimitIterator::getInnerIterator() - proto Iterator ParentIterator::getInnerIterator() - Get the inner iterator */ +/* {{{ Get the inner iterator */ PHP_METHOD(IteratorIterator, getInnerIterator) { spl_dual_it_object *intern; @@ -1575,10 +1543,7 @@ static inline void spl_dual_it_next(spl_dual_it_object *intern, int do_free) intern->current.pos++; } -/* {{{ proto void ParentIterator::rewind() - proto void IteratorIterator::rewind() - Rewind the iterator - */ +/* {{{ Rewind the iterator */ PHP_METHOD(IteratorIterator, rewind) { spl_dual_it_object *intern; @@ -1593,11 +1558,7 @@ PHP_METHOD(IteratorIterator, rewind) spl_dual_it_fetch(intern, 1); } /* }}} */ -/* {{{ proto bool FilterIterator::valid() - proto bool ParentIterator::valid() - proto bool IteratorIterator::valid() - proto bool NoRewindIterator::valid() - Check whether the current element is valid */ +/* {{{ Check whether the current element is valid */ PHP_METHOD(IteratorIterator, valid) { spl_dual_it_object *intern; @@ -1611,14 +1572,7 @@ PHP_METHOD(IteratorIterator, valid) RETURN_BOOL(Z_TYPE(intern->current.data) != IS_UNDEF); } /* }}} */ -/* {{{ proto mixed FilterIterator::key() - proto mixed CachingIterator::key() - proto mixed LimitIterator::key() - proto mixed ParentIterator::key() - proto mixed IteratorIterator::key() - proto mixed NoRewindIterator::key() - proto mixed AppendIterator::key() - Get the current key */ +/* {{{ Get the current key */ PHP_METHOD(IteratorIterator, key) { spl_dual_it_object *intern; @@ -1638,13 +1592,7 @@ PHP_METHOD(IteratorIterator, key) } } /* }}} */ -/* {{{ proto mixed FilterIterator::current() - proto mixed CachingIterator::current() - proto mixed LimitIterator::current() - proto mixed ParentIterator::current() - proto mixed IteratorIterator::current() - proto mixed NoRewindIterator::current() - Get the current element value */ +/* {{{ Get the current element value */ PHP_METHOD(IteratorIterator, current) { spl_dual_it_object *intern; @@ -1664,10 +1612,7 @@ PHP_METHOD(IteratorIterator, current) } } /* }}} */ -/* {{{ proto void ParentIterator::next() - proto void IteratorIterator::next() - proto void NoRewindIterator::next() - Move the iterator forward */ +/* {{{ Move the iterator forward */ PHP_METHOD(IteratorIterator, next) { spl_dual_it_object *intern; @@ -1715,8 +1660,7 @@ static inline void spl_filter_it_next(zval *zthis, spl_dual_it_object *intern) spl_filter_it_fetch(zthis, intern); } -/* {{{ proto void FilterIterator::rewind() - Rewind the iterator */ +/* {{{ Rewind the iterator */ PHP_METHOD(FilterIterator, rewind) { spl_dual_it_object *intern; @@ -1729,8 +1673,7 @@ PHP_METHOD(FilterIterator, rewind) spl_filter_it_rewind(ZEND_THIS, intern); } /* }}} */ -/* {{{ proto void FilterIterator::next() - Move the iterator forward */ +/* {{{ Move the iterator forward */ PHP_METHOD(FilterIterator, next) { spl_dual_it_object *intern; @@ -1743,23 +1686,20 @@ PHP_METHOD(FilterIterator, next) spl_filter_it_next(ZEND_THIS, intern); } /* }}} */ -/* {{{ proto RecursiveCallbackFilterIterator::__construct(RecursiveIterator it, callback func) - Create a RecursiveCallbackFilterIterator from a RecursiveIterator */ +/* {{{ Create a RecursiveCallbackFilterIterator from a RecursiveIterator */ PHP_METHOD(RecursiveCallbackFilterIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveCallbackFilterIterator, spl_ce_RecursiveIterator, DIT_RecursiveCallbackFilterIterator); } /* }}} */ -/* {{{ proto RecursiveFilterIterator::__construct(RecursiveIterator it) - Create a RecursiveFilterIterator from a RecursiveIterator */ +/* {{{ Create a RecursiveFilterIterator from a RecursiveIterator */ PHP_METHOD(RecursiveFilterIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveFilterIterator, spl_ce_RecursiveIterator, DIT_RecursiveFilterIterator); } /* }}} */ -/* {{{ proto bool RecursiveFilterIterator::hasChildren() - Check whether the inner iterator's current element has children */ +/* {{{ Check whether the inner iterator's current element has children */ PHP_METHOD(RecursiveFilterIterator, hasChildren) { spl_dual_it_object *intern; @@ -1773,8 +1713,7 @@ PHP_METHOD(RecursiveFilterIterator, hasChildren) zend_call_method_with_0_params(Z_OBJ(intern->inner.zobject), intern->inner.ce, NULL, "haschildren", return_value); } /* }}} */ -/* {{{ proto RecursiveFilterIterator RecursiveFilterIterator::getChildren() - Return the inner iterator's children contained in a RecursiveFilterIterator */ +/* {{{ Return the inner iterator's children contained in a RecursiveFilterIterator */ PHP_METHOD(RecursiveFilterIterator, getChildren) { spl_dual_it_object *intern; @@ -1793,8 +1732,7 @@ PHP_METHOD(RecursiveFilterIterator, getChildren) zval_ptr_dtor(&retval); } /* }}} */ -/* {{{ proto RecursiveCallbackFilterIterator RecursiveCallbackFilterIterator::getChildren() - Return the inner iterator's children contained in a RecursiveCallbackFilterIterator */ +/* {{{ Return the inner iterator's children contained in a RecursiveCallbackFilterIterator */ PHP_METHOD(RecursiveCallbackFilterIterator, getChildren) { spl_dual_it_object *intern; @@ -1812,22 +1750,19 @@ PHP_METHOD(RecursiveCallbackFilterIterator, getChildren) } zval_ptr_dtor(&retval); } /* }}} */ -/* {{{ proto ParentIterator::__construct(RecursiveIterator it) - Create a ParentIterator from a RecursiveIterator */ +/* {{{ Create a ParentIterator from a RecursiveIterator */ PHP_METHOD(ParentIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_ParentIterator, spl_ce_RecursiveIterator, DIT_ParentIterator); } /* }}} */ -/* {{{ proto RegexIterator::__construct(Iterator it, string regex [, int mode [, int flags [, int preg_flags]]]) - Create an RegexIterator from another iterator and a regular expression */ +/* {{{ Create an RegexIterator from another iterator and a regular expression */ PHP_METHOD(RegexIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RegexIterator, zend_ce_iterator, DIT_RegexIterator); } /* }}} */ -/* {{{ proto bool CallbackFilterIterator::accept() - Calls the callback with the current value, the current key and the inner iterator as arguments */ +/* {{{ Calls the callback with the current value, the current key and the inner iterator as arguments */ PHP_METHOD(CallbackFilterIterator, accept) { spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS); @@ -1866,8 +1801,7 @@ PHP_METHOD(CallbackFilterIterator, accept) } /* }}} */ -/* {{{ proto bool RegexIterator::accept() - Match (string)current() against regular expression */ +/* {{{ Match (string)current() against regular expression */ PHP_METHOD(RegexIterator, accept) { spl_dual_it_object *intern; @@ -1961,8 +1895,7 @@ PHP_METHOD(RegexIterator, accept) zend_string_release_ex(subject, 0); } /* }}} */ -/* {{{ proto string RegexIterator::getRegex() - Returns current regular expression */ +/* {{{ Returns current regular expression */ PHP_METHOD(RegexIterator, getRegex) { spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS); @@ -1974,8 +1907,7 @@ PHP_METHOD(RegexIterator, getRegex) RETURN_STR_COPY(intern->u.regex.regex); } /* }}} */ -/* {{{ proto bool RegexIterator::getMode() - Returns current operation mode */ +/* {{{ Returns current operation mode */ PHP_METHOD(RegexIterator, getMode) { spl_dual_it_object *intern; @@ -1989,8 +1921,7 @@ PHP_METHOD(RegexIterator, getMode) RETURN_LONG(intern->u.regex.mode); } /* }}} */ -/* {{{ proto bool RegexIterator::setMode(int new_mode) - Set new operation mode */ +/* {{{ Set new operation mode */ PHP_METHOD(RegexIterator, setMode) { spl_dual_it_object *intern; @@ -2010,8 +1941,7 @@ PHP_METHOD(RegexIterator, setMode) intern->u.regex.mode = mode; } /* }}} */ -/* {{{ proto bool RegexIterator::getFlags() - Returns current operation flags */ +/* {{{ Returns current operation flags */ PHP_METHOD(RegexIterator, getFlags) { spl_dual_it_object *intern; @@ -2025,8 +1955,7 @@ PHP_METHOD(RegexIterator, getFlags) RETURN_LONG(intern->u.regex.flags); } /* }}} */ -/* {{{ proto bool RegexIterator::setFlags(int new_flags) - Set operation flags */ +/* {{{ Set operation flags */ PHP_METHOD(RegexIterator, setFlags) { spl_dual_it_object *intern; @@ -2041,8 +1970,7 @@ PHP_METHOD(RegexIterator, setFlags) intern->u.regex.flags = flags; } /* }}} */ -/* {{{ proto bool RegexIterator::getFlags() - Returns current PREG flags (if in use or NULL) */ +/* {{{ Returns current PREG flags (if in use or NULL) */ PHP_METHOD(RegexIterator, getPregFlags) { spl_dual_it_object *intern; @@ -2060,8 +1988,7 @@ PHP_METHOD(RegexIterator, getPregFlags) } } /* }}} */ -/* {{{ proto bool RegexIterator::setPregFlags(int new_flags) - Set PREG flags */ +/* {{{ Set PREG flags */ PHP_METHOD(RegexIterator, setPregFlags) { spl_dual_it_object *intern; @@ -2077,15 +2004,13 @@ PHP_METHOD(RegexIterator, setPregFlags) intern->u.regex.use_flags = 1; } /* }}} */ -/* {{{ proto RecursiveRegexIterator::__construct(RecursiveIterator it, string regex [, int mode [, int flags [, int preg_flags]]]) - Create an RecursiveRegexIterator from another recursive iterator and a regular expression */ +/* {{{ Create an RecursiveRegexIterator from another recursive iterator and a regular expression */ PHP_METHOD(RecursiveRegexIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveRegexIterator, spl_ce_RecursiveIterator, DIT_RecursiveRegexIterator); } /* }}} */ -/* {{{ proto RecursiveRegexIterator RecursiveRegexIterator::getChildren() - Return the inner iterator's children contained in a RecursiveRegexIterator */ +/* {{{ Return the inner iterator's children contained in a RecursiveRegexIterator */ PHP_METHOD(RecursiveRegexIterator, getChildren) { spl_dual_it_object *intern; @@ -2260,15 +2185,13 @@ static inline void spl_limit_it_seek(spl_dual_it_object *intern, zend_long pos) } } -/* {{{ proto LimitIterator::__construct(Iterator it [, int offset, int count]) - Construct a LimitIterator from an Iterator with a given starting offset and optionally a maximum count */ +/* {{{ Construct a LimitIterator from an Iterator with a given starting offset and optionally a maximum count */ PHP_METHOD(LimitIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_LimitIterator, zend_ce_iterator, DIT_LimitIterator); } /* }}} */ -/* {{{ proto void LimitIterator::rewind() - Rewind the iterator to the specified starting offset */ +/* {{{ Rewind the iterator to the specified starting offset */ PHP_METHOD(LimitIterator, rewind) { spl_dual_it_object *intern; @@ -2282,8 +2205,7 @@ PHP_METHOD(LimitIterator, rewind) spl_limit_it_seek(intern, intern->u.limit.offset); } /* }}} */ -/* {{{ proto bool LimitIterator::valid() - Check whether the current element is valid */ +/* {{{ Check whether the current element is valid */ PHP_METHOD(LimitIterator, valid) { spl_dual_it_object *intern; @@ -2298,8 +2220,7 @@ PHP_METHOD(LimitIterator, valid) RETURN_BOOL((intern->u.limit.count == -1 || intern->current.pos < intern->u.limit.offset + intern->u.limit.count) && Z_TYPE(intern->current.data) != IS_UNDEF); } /* }}} */ -/* {{{ proto void LimitIterator::next() - Move the iterator forward */ +/* {{{ Move the iterator forward */ PHP_METHOD(LimitIterator, next) { spl_dual_it_object *intern; @@ -2316,8 +2237,7 @@ PHP_METHOD(LimitIterator, next) } } /* }}} */ -/* {{{ proto void LimitIterator::seek(int position) - Seek to the given position */ +/* {{{ Seek to the given position */ PHP_METHOD(LimitIterator, seek) { spl_dual_it_object *intern; @@ -2332,8 +2252,7 @@ PHP_METHOD(LimitIterator, seek) RETURN_LONG(intern->current.pos); } /* }}} */ -/* {{{ proto int LimitIterator::getPosition() - Return the current position */ +/* {{{ Return the current position */ PHP_METHOD(LimitIterator, getPosition) { spl_dual_it_object *intern; @@ -2434,15 +2353,13 @@ static inline void spl_caching_it_rewind(spl_dual_it_object *intern) spl_caching_it_next(intern); } -/* {{{ proto CachingIterator::__construct(Iterator it [, flags = CIT_CALL_TOSTRING]) - Construct a CachingIterator from an Iterator */ +/* {{{ Construct a CachingIterator from an Iterator */ PHP_METHOD(CachingIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_CachingIterator, zend_ce_iterator, DIT_CachingIterator); } /* }}} */ -/* {{{ proto void CachingIterator::rewind() - Rewind the iterator */ +/* {{{ Rewind the iterator */ PHP_METHOD(CachingIterator, rewind) { spl_dual_it_object *intern; @@ -2456,8 +2373,7 @@ PHP_METHOD(CachingIterator, rewind) spl_caching_it_rewind(intern); } /* }}} */ -/* {{{ proto bool CachingIterator::valid() - Check whether the current element is valid */ +/* {{{ Check whether the current element is valid */ PHP_METHOD(CachingIterator, valid) { spl_dual_it_object *intern; @@ -2471,8 +2387,7 @@ PHP_METHOD(CachingIterator, valid) RETURN_BOOL(spl_caching_it_valid(intern) == SUCCESS); } /* }}} */ -/* {{{ proto void CachingIterator::next() - Move the iterator forward */ +/* {{{ Move the iterator forward */ PHP_METHOD(CachingIterator, next) { spl_dual_it_object *intern; @@ -2486,8 +2401,7 @@ PHP_METHOD(CachingIterator, next) spl_caching_it_next(intern); } /* }}} */ -/* {{{ proto bool CachingIterator::hasNext() - Check whether the inner iterator has a valid next element */ +/* {{{ Check whether the inner iterator has a valid next element */ PHP_METHOD(CachingIterator, hasNext) { spl_dual_it_object *intern; @@ -2501,8 +2415,7 @@ PHP_METHOD(CachingIterator, hasNext) RETURN_BOOL(spl_caching_it_has_next(intern) == SUCCESS); } /* }}} */ -/* {{{ proto string CachingIterator::__toString() - Return the string representation of the current element */ +/* {{{ Return the string representation of the current element */ PHP_METHOD(CachingIterator, __toString) { spl_dual_it_object *intern; @@ -2534,8 +2447,7 @@ PHP_METHOD(CachingIterator, __toString) } } /* }}} */ -/* {{{ proto void CachingIterator::offsetSet(mixed index, mixed newval) - Set given index in cache */ +/* {{{ Set given index in cache */ PHP_METHOD(CachingIterator, offsetSet) { spl_dual_it_object *intern; @@ -2558,8 +2470,7 @@ PHP_METHOD(CachingIterator, offsetSet) } /* }}} */ -/* {{{ proto string CachingIterator::offsetGet(mixed index) - Return the internal cache if used */ +/* {{{ Return the internal cache if used */ PHP_METHOD(CachingIterator, offsetGet) { spl_dual_it_object *intern; @@ -2586,8 +2497,7 @@ PHP_METHOD(CachingIterator, offsetGet) } /* }}} */ -/* {{{ proto void CachingIterator::offsetUnset(mixed index) - Unset given index in cache */ +/* {{{ Unset given index in cache */ PHP_METHOD(CachingIterator, offsetUnset) { spl_dual_it_object *intern; @@ -2608,8 +2518,7 @@ PHP_METHOD(CachingIterator, offsetUnset) } /* }}} */ -/* {{{ proto bool CachingIterator::offsetExists(mixed index) - Return whether the requested index exists */ +/* {{{ Return whether the requested index exists */ PHP_METHOD(CachingIterator, offsetExists) { spl_dual_it_object *intern; @@ -2630,8 +2539,7 @@ PHP_METHOD(CachingIterator, offsetExists) } /* }}} */ -/* {{{ proto array CachingIterator::getCache() - Return the cache */ +/* {{{ Return the cache */ PHP_METHOD(CachingIterator, getCache) { spl_dual_it_object *intern; @@ -2651,8 +2559,7 @@ PHP_METHOD(CachingIterator, getCache) } /* }}} */ -/* {{{ proto int CachingIterator::getFlags() - Return the internal flags */ +/* {{{ Return the internal flags */ PHP_METHOD(CachingIterator, getFlags) { spl_dual_it_object *intern; @@ -2667,8 +2574,7 @@ PHP_METHOD(CachingIterator, getFlags) } /* }}} */ -/* {{{ proto void CachingIterator::setFlags(int flags) - Set the internal flags */ +/* {{{ Set the internal flags */ PHP_METHOD(CachingIterator, setFlags) { spl_dual_it_object *intern; @@ -2700,8 +2606,7 @@ PHP_METHOD(CachingIterator, setFlags) } /* }}} */ -/* {{{ proto void CachingIterator::count() - Number of cached elements */ +/* {{{ Number of cached elements */ PHP_METHOD(CachingIterator, count) { spl_dual_it_object *intern; @@ -2721,15 +2626,13 @@ PHP_METHOD(CachingIterator, count) } /* }}} */ -/* {{{ proto RecursiveCachingIterator::__construct(RecursiveIterator it [, flags = CIT_CALL_TOSTRING]) - Create an iterator from a RecursiveIterator */ +/* {{{ Create an iterator from a RecursiveIterator */ PHP_METHOD(RecursiveCachingIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_RecursiveCachingIterator, spl_ce_RecursiveIterator, DIT_RecursiveCachingIterator); } /* }}} */ -/* {{{ proto bool RecursiveCachingIterator::hasChildren() - Check whether the current element of the inner iterator has children */ +/* {{{ Check whether the current element of the inner iterator has children */ PHP_METHOD(RecursiveCachingIterator, hasChildren) { spl_dual_it_object *intern; @@ -2743,8 +2646,7 @@ PHP_METHOD(RecursiveCachingIterator, hasChildren) RETURN_BOOL(Z_TYPE(intern->u.caching.zchildren) != IS_UNDEF); } /* }}} */ -/* {{{ proto RecursiveCachingIterator RecursiveCachingIterator::getChildren() - Return the inner iterator's children as a RecursiveCachingIterator */ +/* {{{ Return the inner iterator's children as a RecursiveCachingIterator */ PHP_METHOD(RecursiveCachingIterator, getChildren) { spl_dual_it_object *intern; @@ -2764,22 +2666,19 @@ PHP_METHOD(RecursiveCachingIterator, getChildren) } } /* }}} */ -/* {{{ proto IteratorIterator::__construct(Traversable it) - Create an iterator from anything that is traversable */ +/* {{{ Create an iterator from anything that is traversable */ PHP_METHOD(IteratorIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_IteratorIterator, zend_ce_traversable, DIT_IteratorIterator); } /* }}} */ -/* {{{ proto NoRewindIterator::__construct(Iterator it) - Create an iterator from another iterator */ +/* {{{ Create an iterator from another iterator */ PHP_METHOD(NoRewindIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_NoRewindIterator, zend_ce_iterator, DIT_NoRewindIterator); } /* }}} */ -/* {{{ proto void NoRewindIterator::rewind() - Prevent a call to inner iterators rewind() */ +/* {{{ Prevent a call to inner iterators rewind() */ PHP_METHOD(NoRewindIterator, rewind) { if (zend_parse_parameters_none() == FAILURE) { @@ -2788,8 +2687,7 @@ PHP_METHOD(NoRewindIterator, rewind) /* nothing to do */ } /* }}} */ -/* {{{ proto bool NoRewindIterator::valid() - Return inner iterators valid() */ +/* {{{ Return inner iterators valid() */ PHP_METHOD(NoRewindIterator, valid) { spl_dual_it_object *intern; @@ -2802,8 +2700,7 @@ PHP_METHOD(NoRewindIterator, valid) RETURN_BOOL(intern->inner.iterator->funcs->valid(intern->inner.iterator) == SUCCESS); } /* }}} */ -/* {{{ proto mixed NoRewindIterator::key() - Return inner iterators key() */ +/* {{{ Return inner iterators key() */ PHP_METHOD(NoRewindIterator, key) { spl_dual_it_object *intern; @@ -2821,8 +2718,7 @@ PHP_METHOD(NoRewindIterator, key) } } /* }}} */ -/* {{{ proto mixed NoRewindIterator::current() - Return inner iterators current() */ +/* {{{ Return inner iterators current() */ PHP_METHOD(NoRewindIterator, current) { spl_dual_it_object *intern; @@ -2839,8 +2735,7 @@ PHP_METHOD(NoRewindIterator, current) } } /* }}} */ -/* {{{ proto void NoRewindIterator::next() - Return inner iterators next() */ +/* {{{ Return inner iterators next() */ PHP_METHOD(NoRewindIterator, next) { spl_dual_it_object *intern; @@ -2853,15 +2748,13 @@ PHP_METHOD(NoRewindIterator, next) intern->inner.iterator->funcs->move_forward(intern->inner.iterator); } /* }}} */ -/* {{{ proto InfiniteIterator::__construct(Iterator it) - Create an iterator from another iterator */ +/* {{{ Create an iterator from another iterator */ PHP_METHOD(InfiniteIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_InfiniteIterator, zend_ce_iterator, DIT_InfiniteIterator); } /* }}} */ -/* {{{ proto void InfiniteIterator::next() - Prevent a call to inner iterators rewind() (internally the current data will be fetched if valid()) */ +/* {{{ Prevent a call to inner iterators rewind() (internally the current data will be fetched if valid()) */ PHP_METHOD(InfiniteIterator, next) { spl_dual_it_object *intern; @@ -2883,8 +2776,7 @@ PHP_METHOD(InfiniteIterator, next) } } /* }}} */ -/* {{{ proto void EmptyIterator::rewind() - Does nothing */ +/* {{{ Does nothing */ PHP_METHOD(EmptyIterator, rewind) { if (zend_parse_parameters_none() == FAILURE) { @@ -2892,8 +2784,7 @@ PHP_METHOD(EmptyIterator, rewind) } } /* }}} */ -/* {{{ proto false EmptyIterator::valid() - Return false */ +/* {{{ Return false */ PHP_METHOD(EmptyIterator, valid) { if (zend_parse_parameters_none() == FAILURE) { @@ -2903,8 +2794,7 @@ PHP_METHOD(EmptyIterator, valid) RETURN_FALSE; } /* }}} */ -/* {{{ proto void EmptyIterator::key() - Throws exception BadMethodCallException */ +/* {{{ Throws exception BadMethodCallException */ PHP_METHOD(EmptyIterator, key) { if (zend_parse_parameters_none() == FAILURE) { @@ -2914,8 +2804,7 @@ PHP_METHOD(EmptyIterator, key) zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the key of an EmptyIterator", 0); } /* }}} */ -/* {{{ proto void EmptyIterator::current() - Throws exception BadMethodCallException */ +/* {{{ Throws exception BadMethodCallException */ PHP_METHOD(EmptyIterator, current) { if (zend_parse_parameters_none() == FAILURE) { @@ -2925,8 +2814,7 @@ PHP_METHOD(EmptyIterator, current) zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the value of an EmptyIterator", 0); } /* }}} */ -/* {{{ proto void EmptyIterator::next() - Does nothing */ +/* {{{ Does nothing */ PHP_METHOD(EmptyIterator, next) { if (zend_parse_parameters_none() == FAILURE) { @@ -2980,15 +2868,13 @@ void spl_append_it_next(spl_dual_it_object *intern) /* {{{ */ spl_append_it_fetch(intern); } /* }}} */ -/* {{{ proto AppendIterator::__construct() - Create an AppendIterator */ +/* {{{ Create an AppendIterator */ PHP_METHOD(AppendIterator, __construct) { spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_AppendIterator, zend_ce_iterator, DIT_AppendIterator); } /* }}} */ -/* {{{ proto void AppendIterator::append(Iterator it) - Append an iterator */ +/* {{{ Append an iterator */ PHP_METHOD(AppendIterator, append) { spl_dual_it_object *intern; @@ -3018,8 +2904,7 @@ PHP_METHOD(AppendIterator, append) } } /* }}} */ -/* {{{ proto mixed AppendIterator::current() - Get the current element value */ +/* {{{ Get the current element value */ PHP_METHOD(AppendIterator, current) { spl_dual_it_object *intern; @@ -3040,8 +2925,7 @@ PHP_METHOD(AppendIterator, current) } } /* }}} */ -/* {{{ proto void AppendIterator::rewind() - Rewind to the first iterator and rewind the first iterator, too */ +/* {{{ Rewind to the first iterator and rewind the first iterator, too */ PHP_METHOD(AppendIterator, rewind) { spl_dual_it_object *intern; @@ -3058,8 +2942,7 @@ PHP_METHOD(AppendIterator, rewind) } } /* }}} */ -/* {{{ proto bool AppendIterator::valid() - Check if the current state is valid */ +/* {{{ Check if the current state is valid */ PHP_METHOD(AppendIterator, valid) { spl_dual_it_object *intern; @@ -3073,8 +2956,7 @@ PHP_METHOD(AppendIterator, valid) RETURN_BOOL(Z_TYPE(intern->current.data) != IS_UNDEF); } /* }}} */ -/* {{{ proto void AppendIterator::next() - Forward to next element */ +/* {{{ Forward to next element */ PHP_METHOD(AppendIterator, next) { spl_dual_it_object *intern; @@ -3088,8 +2970,7 @@ PHP_METHOD(AppendIterator, next) spl_append_it_next(intern); } /* }}} */ -/* {{{ proto int AppendIterator::getIteratorIndex() - Get index of iterator */ +/* {{{ Get index of iterator */ PHP_METHOD(AppendIterator, getIteratorIndex) { spl_dual_it_object *intern; @@ -3104,8 +2985,7 @@ PHP_METHOD(AppendIterator, getIteratorIndex) spl_array_iterator_key(&intern->u.append.zarrayit, return_value); } /* }}} */ -/* {{{ proto ArrayIterator AppendIterator::getArrayIterator() - Get access to inner ArrayIterator */ +/* {{{ Get access to inner ArrayIterator */ PHP_METHOD(AppendIterator, getArrayIterator) { spl_dual_it_object *intern; @@ -3206,8 +3086,7 @@ static int spl_iterator_to_values_apply(zend_object_iterator *iter, void *puser) } /* }}} */ -/* {{{ proto array iterator_to_array(Traversable it [, bool use_keys = true]) - Copy the iterator into an array */ +/* {{{ Copy the iterator into an array */ PHP_FUNCTION(iterator_to_array) { zval *obj; @@ -3228,8 +3107,7 @@ static int spl_iterator_count_apply(zend_object_iterator *iter, void *puser) /* } /* }}} */ -/* {{{ proto int iterator_count(Traversable it) - Count the elements in an iterator */ +/* {{{ Count the elements in an iterator */ PHP_FUNCTION(iterator_count) { zval *obj; @@ -3269,8 +3147,7 @@ static int spl_iterator_func_apply(zend_object_iterator *iter, void *puser) /* { } /* }}} */ -/* {{{ proto int iterator_apply(Traversable it, mixed function [, mixed params]) - Calls a function for every element in an iterator */ +/* {{{ Calls a function for every element in an iterator */ PHP_FUNCTION(iterator_apply) { spl_iterator_apply_info apply_info; @@ -3292,8 +3169,7 @@ PHP_FUNCTION(iterator_apply) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION(spl_iterators) - */ +/* {{{ PHP_MINIT_FUNCTION(spl_iterators) */ PHP_MINIT_FUNCTION(spl_iterators) { REGISTER_SPL_INTERFACE(RecursiveIterator); diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index bcf3a39535..f38f5bcdda 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -343,8 +343,7 @@ int spl_object_storage_contains(spl_SplObjectStorage *intern, zval *obj) /* {{{ return found; } /* }}} */ -/* {{{ proto void SplObjectStorage::attach(object obj, mixed data = NULL) - Attaches an object to the storage if not yet contained */ +/* {{{ Attaches an object to the storage if not yet contained */ PHP_METHOD(SplObjectStorage, attach) { zval *obj, *inf = NULL; @@ -357,8 +356,7 @@ PHP_METHOD(SplObjectStorage, attach) spl_object_storage_attach(intern, obj, inf); } /* }}} */ -/* {{{ proto void SplObjectStorage::detach(object obj) - Detaches an object from the storage */ +/* {{{ Detaches an object from the storage */ PHP_METHOD(SplObjectStorage, detach) { zval *obj; @@ -373,8 +371,7 @@ PHP_METHOD(SplObjectStorage, detach) intern->index = 0; } /* }}} */ -/* {{{ proto string SplObjectStorage::getHash(object obj) - Returns the hash of an object */ +/* {{{ Returns the hash of an object */ PHP_METHOD(SplObjectStorage, getHash) { zval *obj; @@ -387,8 +384,7 @@ PHP_METHOD(SplObjectStorage, getHash) } /* }}} */ -/* {{{ proto mixed SplObjectStorage::offsetGet(object obj) - Returns associated information for a stored object */ +/* {{{ Returns associated information for a stored object */ PHP_METHOD(SplObjectStorage, offsetGet) { zval *obj; @@ -416,8 +412,7 @@ PHP_METHOD(SplObjectStorage, offsetGet) } } /* }}} */ -/* {{{ proto bool SplObjectStorage::addAll(SplObjectStorage $os) - Add all elements contained in $os */ +/* {{{ Add all elements contained in $os */ PHP_METHOD(SplObjectStorage, addAll) { zval *obj; @@ -435,8 +430,7 @@ PHP_METHOD(SplObjectStorage, addAll) RETURN_LONG(zend_hash_num_elements(&intern->storage)); } /* }}} */ -/* {{{ proto bool SplObjectStorage::removeAll(SplObjectStorage $os) - Remove all elements contained in $os */ +/* {{{ Remove all elements contained in $os */ PHP_METHOD(SplObjectStorage, removeAll) { zval *obj; @@ -463,8 +457,7 @@ PHP_METHOD(SplObjectStorage, removeAll) RETURN_LONG(zend_hash_num_elements(&intern->storage)); } /* }}} */ -/* {{{ proto bool SplObjectStorage::removeAllExcept(SplObjectStorage $os) - Remove elements not common to both this SplObjectStorage instance and $os */ +/* {{{ Remove elements not common to both this SplObjectStorage instance and $os */ PHP_METHOD(SplObjectStorage, removeAllExcept) { zval *obj; @@ -491,8 +484,7 @@ PHP_METHOD(SplObjectStorage, removeAllExcept) } /* }}} */ -/* {{{ proto bool SplObjectStorage::contains(object obj) - Determine whether an object is contained in the storage */ +/* {{{ Determine whether an object is contained in the storage */ PHP_METHOD(SplObjectStorage, contains) { zval *obj; @@ -504,8 +496,7 @@ PHP_METHOD(SplObjectStorage, contains) RETURN_BOOL(spl_object_storage_contains(intern, obj)); } /* }}} */ -/* {{{ proto int SplObjectStorage::count() - Determine number of objects in storage */ +/* {{{ Determine number of objects in storage */ PHP_METHOD(SplObjectStorage, count) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -531,8 +522,7 @@ PHP_METHOD(SplObjectStorage, count) RETURN_LONG(zend_hash_num_elements(&intern->storage)); } /* }}} */ -/* {{{ proto void SplObjectStorage::rewind() - Rewind to first position */ +/* {{{ Rewind to first position */ PHP_METHOD(SplObjectStorage, rewind) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -545,8 +535,7 @@ PHP_METHOD(SplObjectStorage, rewind) intern->index = 0; } /* }}} */ -/* {{{ proto bool SplObjectStorage::valid() - Returns whether current position is valid */ +/* {{{ Returns whether current position is valid */ PHP_METHOD(SplObjectStorage, valid) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -558,8 +547,7 @@ PHP_METHOD(SplObjectStorage, valid) RETURN_BOOL(zend_hash_has_more_elements_ex(&intern->storage, &intern->pos) == SUCCESS); } /* }}} */ -/* {{{ proto mixed SplObjectStorage::key() - Returns current key */ +/* {{{ Returns current key */ PHP_METHOD(SplObjectStorage, key) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -571,8 +559,7 @@ PHP_METHOD(SplObjectStorage, key) RETURN_LONG(intern->index); } /* }}} */ -/* {{{ proto mixed SplObjectStorage::current() - Returns current element */ +/* {{{ Returns current element */ PHP_METHOD(SplObjectStorage, current) { spl_SplObjectStorageElement *element; @@ -588,8 +575,7 @@ PHP_METHOD(SplObjectStorage, current) ZVAL_COPY(return_value, &element->obj); } /* }}} */ -/* {{{ proto mixed SplObjectStorage::getInfo() - Returns associated information to current element */ +/* {{{ Returns associated information to current element */ PHP_METHOD(SplObjectStorage, getInfo) { spl_SplObjectStorageElement *element; @@ -605,8 +591,7 @@ PHP_METHOD(SplObjectStorage, getInfo) ZVAL_COPY(return_value, &element->inf); } /* }}} */ -/* {{{ proto mixed SplObjectStorage::setInfo(mixed $inf) - Sets associated information of current element to $inf */ +/* {{{ Sets associated information of current element to $inf */ PHP_METHOD(SplObjectStorage, setInfo) { spl_SplObjectStorageElement *element; @@ -624,8 +609,7 @@ PHP_METHOD(SplObjectStorage, setInfo) ZVAL_COPY(&element->inf, inf); } /* }}} */ -/* {{{ proto void SplObjectStorage::next() - Moves position forward */ +/* {{{ Moves position forward */ PHP_METHOD(SplObjectStorage, next) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -638,8 +622,7 @@ PHP_METHOD(SplObjectStorage, next) intern->index++; } /* }}} */ -/* {{{ proto string SplObjectStorage::serialize() - Serializes storage */ +/* {{{ Serializes storage */ PHP_METHOD(SplObjectStorage, serialize) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -689,8 +672,7 @@ PHP_METHOD(SplObjectStorage, serialize) RETURN_NEW_STR(buf.s); } /* }}} */ -/* {{{ proto void SplObjectStorage::unserialize(string serialized) - Unserializes storage */ +/* {{{ Unserializes storage */ PHP_METHOD(SplObjectStorage, unserialize) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -818,7 +800,7 @@ outexcept: } /* }}} */ -/* {{{ proto auto SplObjectStorage::__serialize() */ +/* {{{ */ PHP_METHOD(SplObjectStorage, __serialize) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -847,7 +829,7 @@ PHP_METHOD(SplObjectStorage, __serialize) zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &tmp); } /* }}} */ -/* {{{ proto void SplObjectStorage::__unserialize(array serialized) */ +/* {{{ */ PHP_METHOD(SplObjectStorage, __unserialize) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -890,7 +872,7 @@ PHP_METHOD(SplObjectStorage, __unserialize) object_properties_load(&intern->std, Z_ARRVAL_P(members_zv)); } -/* {{{ proto array SplObjectStorage::__debugInfo() */ +/* {{{ */ PHP_METHOD(SplObjectStorage, __debugInfo) { if (zend_parse_parameters_none() == FAILURE) { @@ -911,8 +893,7 @@ typedef enum { #define SPL_MULTIPLE_ITERATOR_GET_ALL_CURRENT 1 #define SPL_MULTIPLE_ITERATOR_GET_ALL_KEY 2 -/* {{{ proto MultipleIterator::__construct([int flags = MIT_NEED_ALL|MIT_KEYS_NUMERIC]) - Iterator that iterates over several iterators one after the other */ +/* {{{ Iterator that iterates over several iterators one after the other */ PHP_METHOD(MultipleIterator, __construct) { spl_SplObjectStorage *intern; @@ -927,8 +908,7 @@ PHP_METHOD(MultipleIterator, __construct) } /* }}} */ -/* {{{ proto int MultipleIterator::getFlags() - Return current flags */ +/* {{{ Return current flags */ PHP_METHOD(MultipleIterator, getFlags) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(ZEND_THIS); @@ -940,8 +920,7 @@ PHP_METHOD(MultipleIterator, getFlags) } /* }}} */ -/* {{{ proto int MultipleIterator::setFlags(int flags) - Set flags */ +/* {{{ Set flags */ PHP_METHOD(MultipleIterator, setFlags) { spl_SplObjectStorage *intern; @@ -953,8 +932,7 @@ PHP_METHOD(MultipleIterator, setFlags) } /* }}} */ -/* {{{ proto void attachIterator(Iterator iterator[, mixed info]) throws InvalidArgumentException - Attach a new iterator */ +/* {{{ Attach a new iterator */ PHP_METHOD(MultipleIterator, attachIterator) { spl_SplObjectStorage *intern; @@ -988,8 +966,7 @@ PHP_METHOD(MultipleIterator, attachIterator) } /* }}} */ -/* {{{ proto void MultipleIterator::detachIterator(Iterator iterator) - Detaches an iterator */ +/* {{{ Detaches an iterator */ PHP_METHOD(MultipleIterator, detachIterator) { zval *iterator; @@ -1004,8 +981,7 @@ PHP_METHOD(MultipleIterator, detachIterator) intern->index = 0; } /* }}} */ -/* {{{ proto bool MultipleIterator::containsIterator(Iterator iterator) - Determine whether the iterator exists */ +/* {{{ Determine whether the iterator exists */ PHP_METHOD(MultipleIterator, containsIterator) { zval *iterator; @@ -1017,8 +993,7 @@ PHP_METHOD(MultipleIterator, containsIterator) RETURN_BOOL(spl_object_storage_contains(intern, iterator)); } /* }}} */ -/* {{{ proto void MultipleIterator::rewind() - Rewind all attached iterator instances */ +/* {{{ Rewind all attached iterator instances */ PHP_METHOD(MultipleIterator, rewind) { spl_SplObjectStorage *intern; @@ -1040,8 +1015,7 @@ PHP_METHOD(MultipleIterator, rewind) } /* }}} */ -/* {{{ proto void MultipleIterator::next() - Move all attached iterator instances forward */ +/* {{{ Move all attached iterator instances forward */ PHP_METHOD(MultipleIterator, next) { spl_SplObjectStorage *intern; @@ -1063,8 +1037,7 @@ PHP_METHOD(MultipleIterator, next) } /* }}} */ -/* {{{ proto bool MultipleIterator::valid() - Return whether all or one sub iterator is valid depending on flags */ +/* {{{ Return whether all or one sub iterator is valid depending on flags */ PHP_METHOD(MultipleIterator, valid) { spl_SplObjectStorage *intern; @@ -1175,8 +1148,7 @@ static void spl_multiple_iterator_get_all(spl_SplObjectStorage *intern, int get_ } /* }}} */ -/* {{{ proto array current() throws RuntimeException throws InvalidArgumentException - Return an array of all registered Iterator instances current() result */ +/* {{{ Return an array of all registered Iterator instances current() result */ PHP_METHOD(MultipleIterator, current) { spl_SplObjectStorage *intern; @@ -1190,8 +1162,7 @@ PHP_METHOD(MultipleIterator, current) } /* }}} */ -/* {{{ proto array MultipleIterator::key() - Return an array of all registered Iterator instances key() result */ +/* {{{ Return an array of all registered Iterator instances key() result */ PHP_METHOD(MultipleIterator, key) { spl_SplObjectStorage *intern; diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 3102592238..acb191c665 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -39,8 +39,7 @@ static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, c static void sqlite3_param_dtor(zval *data); static int php_sqlite3_compare_stmt_zval_free(php_sqlite3_free_list **free_list, zval *statement); -/* {{{ Error Handler -*/ +/* {{{ Error Handler */ static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...) { va_list arg; @@ -74,8 +73,7 @@ static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...) RETURN_FALSE; \ } -/* {{{ PHP_INI -*/ +/* {{{ PHP_INI */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("sqlite3.extension_dir", NULL, PHP_INI_SYSTEM, OnUpdateString, extension_dir, zend_sqlite3_globals, sqlite3_globals) #if SQLITE_VERSION_NUMBER >= 3026000 @@ -94,8 +92,7 @@ zend_class_entry *php_sqlite3_sc_entry; zend_class_entry *php_sqlite3_stmt_entry; zend_class_entry *php_sqlite3_result_entry; -/* {{{ proto void SQLite3::open(String filename [, int Flags [, string Encryption Key]]) - Opens a SQLite 3 Database, if the build includes encryption then it will attempt to use the key. */ +/* {{{ Opens a SQLite 3 Database, if the build includes encryption then it will attempt to use the key. */ PHP_METHOD(SQLite3, open) { php_sqlite3_db_object *db_obj; @@ -176,8 +173,7 @@ PHP_METHOD(SQLite3, open) } /* }}} */ -/* {{{ proto bool SQLite3::close() - Close a SQLite 3 Database. */ +/* {{{ Close a SQLite 3 Database. */ PHP_METHOD(SQLite3, close) { php_sqlite3_db_object *db_obj; @@ -205,8 +201,7 @@ PHP_METHOD(SQLite3, close) } /* }}} */ -/* {{{ proto bool SQLite3::exec(String Query) - Executes a result-less query against a given database. */ +/* {{{ Executes a result-less query against a given database. */ PHP_METHOD(SQLite3, exec) { php_sqlite3_db_object *db_obj; @@ -231,8 +226,7 @@ PHP_METHOD(SQLite3, exec) } /* }}} */ -/* {{{ proto Array SQLite3::version() - Returns the SQLite3 Library version as a string constant and as a number. */ +/* {{{ Returns the SQLite3 Library version as a string constant and as a number. */ PHP_METHOD(SQLite3, version) { if (zend_parse_parameters_none() == FAILURE) { @@ -248,8 +242,7 @@ PHP_METHOD(SQLite3, version) } /* }}} */ -/* {{{ proto int SQLite3::lastInsertRowID() - Returns the rowid of the most recent INSERT into the database from the database connection. */ +/* {{{ Returns the rowid of the most recent INSERT into the database from the database connection. */ PHP_METHOD(SQLite3, lastInsertRowID) { php_sqlite3_db_object *db_obj; @@ -266,8 +259,7 @@ PHP_METHOD(SQLite3, lastInsertRowID) } /* }}} */ -/* {{{ proto int SQLite3::lastErrorCode() - Returns the numeric result code of the most recent failed sqlite API call for the database connection. */ +/* {{{ Returns the numeric result code of the most recent failed sqlite API call for the database connection. */ PHP_METHOD(SQLite3, lastErrorCode) { php_sqlite3_db_object *db_obj; @@ -288,8 +280,7 @@ PHP_METHOD(SQLite3, lastErrorCode) } /* }}} */ -/* {{{ proto int SQLite3::lastExtendedErrorCode() - Returns the numeric extended result code of the most recent failed sqlite API call for the database connection. */ +/* {{{ Returns the numeric extended result code of the most recent failed sqlite API call for the database connection. */ PHP_METHOD(SQLite3, lastExtendedErrorCode) { php_sqlite3_db_object *db_obj; @@ -310,8 +301,7 @@ PHP_METHOD(SQLite3, lastExtendedErrorCode) } /* }}} */ -/* {{{ proto bool SQLite3::enableExtendedResultCodes([bool enable = true]) - Turns on or off the extended result codes feature of SQLite. */ +/* {{{ Turns on or off the extended result codes feature of SQLite. */ PHP_METHOD(SQLite3, enableExtendedResultCodes) { php_sqlite3_db_object *db_obj; @@ -338,8 +328,7 @@ PHP_METHOD(SQLite3, enableExtendedResultCodes) } /* }}} */ -/* {{{ proto string SQLite3::lastErrorMsg() - Returns english text describing the most recent failed sqlite API call for the database connection. */ +/* {{{ Returns english text describing the most recent failed sqlite API call for the database connection. */ PHP_METHOD(SQLite3, lastErrorMsg) { php_sqlite3_db_object *db_obj; @@ -360,8 +349,7 @@ PHP_METHOD(SQLite3, lastErrorMsg) } /* }}} */ -/* {{{ proto bool SQLite3::busyTimeout(int msecs) - Sets a busy handler that will sleep until database is not locked or timeout is reached. Passing a value less than or equal to zero turns off all busy handlers. */ +/* {{{ Sets a busy handler that will sleep until database is not locked or timeout is reached. Passing a value less than or equal to zero turns off all busy handlers. */ PHP_METHOD(SQLite3, busyTimeout) { php_sqlite3_db_object *db_obj; @@ -394,8 +382,7 @@ PHP_METHOD(SQLite3, busyTimeout) #ifndef SQLITE_OMIT_LOAD_EXTENSION -/* {{{ proto bool SQLite3::loadExtension(String Shared Library) - Attempts to load an SQLite extension library. */ +/* {{{ Attempts to load an SQLite extension library. */ PHP_METHOD(SQLite3, loadExtension) { php_sqlite3_db_object *db_obj; @@ -467,8 +454,7 @@ PHP_METHOD(SQLite3, loadExtension) /* }}} */ #endif -/* {{{ proto int SQLite3::changes() - Returns the number of database rows that were changed (or inserted or deleted) by the most recent SQL statement. */ +/* {{{ Returns the number of database rows that were changed (or inserted or deleted) by the most recent SQL statement. */ PHP_METHOD(SQLite3, changes) { php_sqlite3_db_object *db_obj; @@ -485,8 +471,7 @@ PHP_METHOD(SQLite3, changes) } /* }}} */ -/* {{{ proto String SQLite3::escapeString(String value) - Returns a string that has been properly escaped. */ +/* {{{ Returns a string that has been properly escaped. */ PHP_METHOD(SQLite3, escapeString) { zend_string *sql; @@ -508,8 +493,7 @@ PHP_METHOD(SQLite3, escapeString) } /* }}} */ -/* {{{ proto SQLite3Stmt SQLite3::prepare(String Query) - Returns a prepared SQL statement for execution. */ +/* {{{ Returns a prepared SQL statement for execution. */ PHP_METHOD(SQLite3, prepare) { php_sqlite3_db_object *db_obj; @@ -553,8 +537,7 @@ PHP_METHOD(SQLite3, prepare) } /* }}} */ -/* {{{ proto SQLite3Result SQLite3::query(String Query) - Returns true or false, for queries that return data it will return a SQLite3Result object. */ +/* {{{ Returns true or false, for queries that return data it will return a SQLite3Result object. */ PHP_METHOD(SQLite3, query) { php_sqlite3_db_object *db_obj; @@ -669,8 +652,7 @@ static void sqlite_value_to_zval(sqlite3_stmt *stmt, int column, zval *data) /* } /* }}} */ -/* {{{ proto SQLite3Result SQLite3::querySingle(String Query [, bool entire_row = false]) - Returns a string of the first column, or an array of the entire row. */ +/* {{{ Returns a string of the first column, or an array of the entire row. */ PHP_METHOD(SQLite3, querySingle) { php_sqlite3_db_object *db_obj; @@ -962,8 +944,7 @@ static int php_sqlite3_callback_compare(void *coll, int a_len, const void *a, in } /* }}} */ -/* {{{ proto bool SQLite3::createFunction(string name, mixed callback [, int argcount, int flags]) - Allows registration of a PHP function as a SQLite UDF that can be called within SQL statements. */ +/* {{{ Allows registration of a PHP function as a SQLite UDF that can be called within SQL statements. */ PHP_METHOD(SQLite3, createFunction) { php_sqlite3_db_object *db_obj; @@ -1012,8 +993,7 @@ PHP_METHOD(SQLite3, createFunction) } /* }}} */ -/* {{{ proto bool SQLite3::createAggregate(string name, mixed step, mixed final [, int argcount]) - Allows registration of a PHP function for use as an aggregate. */ +/* {{{ Allows registration of a PHP function for use as an aggregate. */ PHP_METHOD(SQLite3, createAggregate) { php_sqlite3_db_object *db_obj; @@ -1069,8 +1049,7 @@ PHP_METHOD(SQLite3, createAggregate) } /* }}} */ -/* {{{ proto bool SQLite3::createCollation(string name, mixed callback) - Registers a PHP function as a comparator that can be used with the SQL COLLATE operator. Callback must accept two strings and return an integer (as strcmp()). */ +/* {{{ Registers a PHP function as a comparator that can be used with the SQL COLLATE operator. Callback must accept two strings and return an integer (as strcmp()). */ PHP_METHOD(SQLite3, createCollation) { php_sqlite3_db_object *db_obj; @@ -1275,8 +1254,7 @@ static const php_stream_ops php_stream_sqlite3_ops = { NULL }; -/* {{{ proto resource SQLite3::openBlob(string table, string column, int rowid [, string dbname [, int flags]]) - Open a blob as a stream which we can read / write to. */ +/* {{{ Open a blob as a stream which we can read / write to. */ PHP_METHOD(SQLite3, openBlob) { php_sqlite3_db_object *db_obj; @@ -1328,8 +1306,7 @@ PHP_METHOD(SQLite3, openBlob) } /* }}} */ -/* {{{ proto bool SQLite3::enableExceptions([bool enableExceptions = false]) - Enables an exception error mode. */ +/* {{{ Enables an exception error mode. */ PHP_METHOD(SQLite3, enableExceptions) { php_sqlite3_db_object *db_obj; @@ -1348,8 +1325,7 @@ PHP_METHOD(SQLite3, enableExceptions) } /* }}} */ -/* {{{ proto bool SQLite3::setAuthorizer(mixed callback) - Register a callback function to be used as an authorizer by SQLite. The callback should return SQLite3::OK, SQLite3::IGNORE or SQLite3::DENY. */ +/* {{{ Register a callback function to be used as an authorizer by SQLite. The callback should return SQLite3::OK, SQLite3::IGNORE or SQLite3::DENY. */ PHP_METHOD(SQLite3, setAuthorizer) { php_sqlite3_db_object *db_obj; @@ -1383,8 +1359,7 @@ PHP_METHOD(SQLite3, setAuthorizer) #if SQLITE_VERSION_NUMBER >= 3006011 -/* {{{ proto bool SQLite3::backup(SQLite3 destination_db[, string source_dbname = "main"[, string destination_dbname = "main"]]) - Backups the current database to another one. */ +/* {{{ Backups the current database to another one. */ PHP_METHOD(SQLite3, backup) { php_sqlite3_db_object *source_obj; @@ -1449,8 +1424,7 @@ PHP_METHOD(SQLite3, backup) /* }}} */ #endif -/* {{{ proto int SQLite3Stmt::paramCount() - Returns the number of parameters within the prepared statement. */ +/* {{{ Returns the number of parameters within the prepared statement. */ PHP_METHOD(SQLite3Stmt, paramCount) { php_sqlite3_stmt *stmt_obj; @@ -1468,8 +1442,7 @@ PHP_METHOD(SQLite3Stmt, paramCount) } /* }}} */ -/* {{{ proto bool SQLite3Stmt::close() - Closes the prepared statement. */ +/* {{{ Closes the prepared statement. */ PHP_METHOD(SQLite3Stmt, close) { php_sqlite3_stmt *stmt_obj; @@ -1490,8 +1463,7 @@ PHP_METHOD(SQLite3Stmt, close) } /* }}} */ -/* {{{ proto bool SQLite3Stmt::reset() - Reset the prepared statement to the state before it was executed, bindings still remain. */ +/* {{{ Reset the prepared statement to the state before it was executed, bindings still remain. */ PHP_METHOD(SQLite3Stmt, reset) { php_sqlite3_stmt *stmt_obj; @@ -1513,8 +1485,7 @@ PHP_METHOD(SQLite3Stmt, reset) } /* }}} */ -/* {{{ proto bool SQLite3Stmt::clear() - Clear all current bound parameters. */ +/* {{{ Clear all current bound parameters. */ PHP_METHOD(SQLite3Stmt, clear) { php_sqlite3_stmt *stmt_obj; @@ -1543,8 +1514,7 @@ PHP_METHOD(SQLite3Stmt, clear) } /* }}} */ -/* {{{ proto bool SQLite3Stmt::readOnly() - Returns true if a statement is definitely read only */ +/* {{{ Returns true if a statement is definitely read only */ PHP_METHOD(SQLite3Stmt, readOnly) { php_sqlite3_stmt *stmt_obj; @@ -1673,8 +1643,7 @@ static int php_sqlite3_bind_params(php_sqlite3_stmt *stmt_obj) /* {{{ */ /* }}} */ -/* {{{ proto string SQLite3Stmt::getSQL([expanded = false]) - Returns the SQL statement used to prepare the query. If expanded is true, binded parameters and values will be expanded. */ +/* {{{ Returns the SQL statement used to prepare the query. If expanded is true, binded parameters and values will be expanded. */ PHP_METHOD(SQLite3Stmt, getSQL) { php_sqlite3_stmt *stmt_obj; @@ -1818,16 +1787,14 @@ static void sqlite3stmt_bind(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type]) - Bind Parameter to a stmt variable. */ +/* {{{ Bind Parameter to a stmt variable. */ PHP_METHOD(SQLite3Stmt, bindParam) { sqlite3stmt_bind(INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto bool SQLite3Stmt::bindValue(int parameter_number, mixed parameter [, int type]) - Bind Value of a parameter to a stmt variable. */ +/* {{{ Bind Value of a parameter to a stmt variable. */ PHP_METHOD(SQLite3Stmt, bindValue) { sqlite3stmt_bind(INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -1836,8 +1803,7 @@ PHP_METHOD(SQLite3Stmt, bindValue) #undef PHP_SQLITE3_SET_TYPE -/* {{{ proto SQLite3Result SQLite3Stmt::execute() - Executes a prepared statement and returns a result set object. */ +/* {{{ Executes a prepared statement and returns a result set object. */ PHP_METHOD(SQLite3Stmt, execute) { php_sqlite3_stmt *stmt_obj; @@ -1896,8 +1862,7 @@ PHP_METHOD(SQLite3Stmt, execute) } /* }}} */ -/* {{{ proto SQLite3Stmt::__construct(SQLite3 dbobject, String Statement) - __constructor for SQLite3Stmt. */ +/* {{{ __constructor for SQLite3Stmt. */ PHP_METHOD(SQLite3Stmt, __construct) { php_sqlite3_stmt *stmt_obj; @@ -1945,8 +1910,7 @@ PHP_METHOD(SQLite3Stmt, __construct) } /* }}} */ -/* {{{ proto int SQLite3Result::numColumns() - Number of columns in the result set. */ +/* {{{ Number of columns in the result set. */ PHP_METHOD(SQLite3Result, numColumns) { php_sqlite3_result *result_obj; @@ -1963,8 +1927,7 @@ PHP_METHOD(SQLite3Result, numColumns) } /* }}} */ -/* {{{ proto string SQLite3Result::columnName(int column) - Returns the name of the nth column. */ +/* {{{ Returns the name of the nth column. */ PHP_METHOD(SQLite3Result, columnName) { php_sqlite3_result *result_obj; @@ -1989,8 +1952,7 @@ PHP_METHOD(SQLite3Result, columnName) } /* }}} */ -/* {{{ proto int SQLite3Result::columnType(int column) - Returns the type of the nth column. */ +/* {{{ Returns the type of the nth column. */ PHP_METHOD(SQLite3Result, columnType) { php_sqlite3_result *result_obj; @@ -2012,8 +1974,7 @@ PHP_METHOD(SQLite3Result, columnType) } /* }}} */ -/* {{{ proto array SQLite3Result::fetchArray([int mode]) - Fetch a result row as both an associative or numerically indexed array or both. */ +/* {{{ Fetch a result row as both an associative or numerically indexed array or both. */ PHP_METHOD(SQLite3Result, fetchArray) { php_sqlite3_result *result_obj; @@ -2068,8 +2029,7 @@ PHP_METHOD(SQLite3Result, fetchArray) } /* }}} */ -/* {{{ proto bool SQLite3Result::reset() - Resets the result set back to the first row. */ +/* {{{ Resets the result set back to the first row. */ PHP_METHOD(SQLite3Result, reset) { php_sqlite3_result *result_obj; @@ -2090,8 +2050,7 @@ PHP_METHOD(SQLite3Result, reset) } /* }}} */ -/* {{{ proto bool SQLite3Result::finalize() - Closes the result set. */ +/* {{{ Closes the result set. */ PHP_METHOD(SQLite3Result, finalize) { php_sqlite3_result *result_obj; @@ -2116,16 +2075,14 @@ PHP_METHOD(SQLite3Result, finalize) } /* }}} */ -/* {{{ proto SQLite3Result::__construct() - __constructor for SQLite3Result. */ +/* {{{ __constructor for SQLite3Result. */ PHP_METHOD(SQLite3Result, __construct) { zend_throw_exception(zend_ce_exception, "SQLite3Result cannot be directly instantiated", 0); } /* }}} */ -/* {{{ Authorization Callback -*/ +/* {{{ Authorization Callback */ static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, const char *arg2, const char *arg3, const char *arg4) { /* Check open_basedir restrictions first */ @@ -2215,8 +2172,7 @@ static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, c } /* }}} */ -/* {{{ php_sqlite3_free_list_dtor -*/ +/* {{{ php_sqlite3_free_list_dtor */ static void php_sqlite3_free_list_dtor(void **item) { php_sqlite3_free_list *free_item = (php_sqlite3_free_list *)*item; @@ -2413,8 +2369,7 @@ static void sqlite3_param_dtor(zval *data) /* {{{ */ } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION -*/ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(sqlite3) { zend_class_entry ce; @@ -2530,8 +2485,7 @@ PHP_MINIT_FUNCTION(sqlite3) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION -*/ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(sqlite3) { UNREGISTER_INI_ENTRIES(); @@ -2540,8 +2494,7 @@ PHP_MSHUTDOWN_FUNCTION(sqlite3) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION -*/ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sqlite3) { php_info_print_table_start(); @@ -2553,8 +2506,7 @@ PHP_MINFO_FUNCTION(sqlite3) } /* }}} */ -/* {{{ PHP_GINIT_FUNCTION -*/ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(sqlite3) { #if defined(COMPILE_DL_SQLITE3) && defined(ZTS) @@ -2564,8 +2516,7 @@ static PHP_GINIT_FUNCTION(sqlite3) } /* }}} */ -/* {{{ sqlite3_module_entry -*/ +/* {{{ sqlite3_module_entry */ zend_module_entry sqlite3_module_entry = { STANDARD_MODULE_HEADER, "sqlite3", diff --git a/ext/standard/array.c b/ext/standard/array.c index 8f326f38d8..530e72c4af 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -78,8 +78,7 @@ ZEND_DECLARE_MODULE_GLOBALS(array) -/* {{{ php_array_init_globals -*/ +/* {{{ php_array_init_globals */ static void php_array_init_globals(zend_array_globals *array_globals) { memset(array_globals, 0, sizeof(zend_array_globals)); @@ -654,8 +653,7 @@ static bucket_compare_func_t php_get_data_compare_func_unstable(zend_long sort_t } /* }}} */ -/* {{{ proto bool krsort(array &array_arg [, int sort_flags]) - Sort an array by key value in reverse order */ +/* {{{ Sort an array by key value in reverse order */ PHP_FUNCTION(krsort) { zval *array; @@ -676,8 +674,7 @@ PHP_FUNCTION(krsort) } /* }}} */ -/* {{{ proto bool ksort(array &array_arg [, int sort_flags]) - Sort an array by key */ +/* {{{ Sort an array by key */ PHP_FUNCTION(ksort) { zval *array; @@ -727,8 +724,7 @@ PHPAPI zend_long php_count_recursive(HashTable *ht) /* {{{ */ } /* }}} */ -/* {{{ proto int count(mixed var [, int mode]) - Count the number of elements in a variable (usually an array) */ +/* {{{ Count the number of elements in a variable (usually an array) */ PHP_FUNCTION(count) { zval *array; @@ -815,24 +811,21 @@ static void php_natsort(INTERNAL_FUNCTION_PARAMETERS, int fold_case) /* {{{ */ } /* }}} */ -/* {{{ proto void natsort(array &array_arg) - Sort an array using natural sort */ +/* {{{ Sort an array using natural sort */ PHP_FUNCTION(natsort) { php_natsort(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto void natcasesort(array &array_arg) - Sort an array using case-insensitive natural sort */ +/* {{{ Sort an array using case-insensitive natural sort */ PHP_FUNCTION(natcasesort) { php_natsort(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool asort(array &array_arg [, int sort_flags]) - Sort an array and maintain index association */ +/* {{{ Sort an array and maintain index association */ PHP_FUNCTION(asort) { zval *array; @@ -853,8 +846,7 @@ PHP_FUNCTION(asort) } /* }}} */ -/* {{{ proto bool arsort(array &array_arg [, int sort_flags]) - Sort an array in reverse order and maintain index association */ +/* {{{ Sort an array in reverse order and maintain index association */ PHP_FUNCTION(arsort) { zval *array; @@ -875,8 +867,7 @@ PHP_FUNCTION(arsort) } /* }}} */ -/* {{{ proto bool sort(array &array_arg [, int sort_flags]) - Sort an array */ +/* {{{ Sort an array */ PHP_FUNCTION(sort) { zval *array; @@ -897,8 +888,7 @@ PHP_FUNCTION(sort) } /* }}} */ -/* {{{ proto bool rsort(array &array_arg [, int sort_flags]) - Sort an array in reverse order */ +/* {{{ Sort an array in reverse order */ PHP_FUNCTION(rsort) { zval *array; @@ -1039,16 +1029,14 @@ static void php_usort(INTERNAL_FUNCTION_PARAMETERS, bucket_compare_func_t compar } /* }}} */ -/* {{{ proto bool usort(array array_arg, string cmp_function) - Sort an array by values using a user-defined comparison function */ +/* {{{ Sort an array by values using a user-defined comparison function */ PHP_FUNCTION(usort) { php_usort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_array_user_compare, 1); } /* }}} */ -/* {{{ proto bool uasort(array array_arg, string cmp_function) - Sort an array with a user-defined comparison function and maintain index association */ +/* {{{ Sort an array with a user-defined comparison function and maintain index association */ PHP_FUNCTION(uasort) { php_usort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_array_user_compare, 0); @@ -1129,16 +1117,14 @@ static int php_array_user_key_compare(Bucket *a, Bucket *b) /* {{{ */ } /* }}} */ -/* {{{ proto bool uksort(array array_arg, string cmp_function) - Sort an array by keys using a user-defined comparison function */ +/* {{{ Sort an array by keys using a user-defined comparison function */ PHP_FUNCTION(uksort) { php_usort(INTERNAL_FUNCTION_PARAM_PASSTHRU, php_array_user_key_compare, 0); } /* }}} */ -/* {{{ proto mixed end(array array_arg) - Advances array argument's internal pointer to the last element and return it */ +/* {{{ Advances array argument's internal pointer to the last element and return it */ PHP_FUNCTION(end) { HashTable *array; @@ -1164,8 +1150,7 @@ PHP_FUNCTION(end) } /* }}} */ -/* {{{ proto mixed prev(array array_arg) - Move array argument's internal pointer to the previous element and return it */ +/* {{{ Move array argument's internal pointer to the previous element and return it */ PHP_FUNCTION(prev) { HashTable *array; @@ -1191,8 +1176,7 @@ PHP_FUNCTION(prev) } /* }}} */ -/* {{{ proto mixed next(array array_arg) - Move array argument's internal pointer to the next element and return it */ +/* {{{ Move array argument's internal pointer to the next element and return it */ PHP_FUNCTION(next) { HashTable *array; @@ -1218,8 +1202,7 @@ PHP_FUNCTION(next) } /* }}} */ -/* {{{ proto mixed reset(array array_arg) - Set array argument's internal pointer to the first element and return it */ +/* {{{ Set array argument's internal pointer to the first element and return it */ PHP_FUNCTION(reset) { HashTable *array; @@ -1245,8 +1228,7 @@ PHP_FUNCTION(reset) } /* }}} */ -/* {{{ proto mixed current(array array_arg) - Return the element currently pointed to by the internal array pointer */ +/* {{{ Return the element currently pointed to by the internal array pointer */ PHP_FUNCTION(current) { HashTable *array; @@ -1268,8 +1250,7 @@ PHP_FUNCTION(current) } /* }}} */ -/* {{{ proto mixed key(array array_arg) - Return the key of the element currently pointed to by the internal array pointer */ +/* {{{ Return the key of the element currently pointed to by the internal array pointer */ PHP_FUNCTION(key) { HashTable *array; @@ -1504,8 +1485,7 @@ static int php_array_walk(zval *array, zval *userdata, int recursive) /* {{{ */ } /* }}} */ -/* {{{ proto bool array_walk(array input, string funcname [, mixed userdata]) - Apply a user function to every member of an array */ +/* {{{ Apply a user function to every member of an array */ PHP_FUNCTION(array_walk) { zval *array; @@ -1535,8 +1515,7 @@ PHP_FUNCTION(array_walk) } /* }}} */ -/* {{{ proto bool array_walk_recursive(array input, string funcname [, mixed userdata]) - Apply a user function recursively to every member of an array */ +/* {{{ Apply a user function recursively to every member of an array */ PHP_FUNCTION(array_walk_recursive) { zval *array; @@ -1673,16 +1652,14 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) } /* }}} */ -/* {{{ proto bool in_array(mixed needle, array haystack [, bool strict]) - Checks if the given value exists in the array */ +/* {{{ Checks if the given value exists in the array */ PHP_FUNCTION(in_array) { php_search_array(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto mixed array_search(mixed needle, array haystack [, bool strict]) - Searches the array for a given value and returns the corresponding key if successful */ +/* {{{ Searches the array for a given value and returns the corresponding key if successful */ PHP_FUNCTION(array_search) { php_search_array(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -2467,8 +2444,7 @@ static zend_long php_extract_skip(zend_array *arr, zend_array *symbol_table) /* } /* }}} */ -/* {{{ proto int extract(array var_array [, int extract_type [, string prefix]]) - Imports variables into symbol table from an array */ +/* {{{ Imports variables into symbol table from an array */ PHP_FUNCTION(extract) { zval *var_array_param; @@ -2610,8 +2586,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu } /* }}} */ -/* {{{ proto array compact(mixed var_names [, mixed ...]) - Creates a hash containing variables and their values */ +/* {{{ Creates a hash containing variables and their values */ PHP_FUNCTION(compact) { zval *args = NULL; /* function arguments array */ @@ -2644,8 +2619,7 @@ PHP_FUNCTION(compact) } /* }}} */ -/* {{{ proto array array_fill(int start_key, int num, mixed val) - Create an array containing num elements starting with index start_key each initialized to val */ +/* {{{ Create an array containing num elements starting with index start_key each initialized to val */ PHP_FUNCTION(array_fill) { zval *val; @@ -2714,8 +2688,7 @@ PHP_FUNCTION(array_fill) } /* }}} */ -/* {{{ proto array array_fill_keys(array keys, mixed val) - Create an array using the elements of the first parameter as keys each initialized to val */ +/* {{{ Create an array using the elements of the first parameter as keys each initialized to val */ PHP_FUNCTION(array_fill_keys) { zval *keys, *val, *entry; @@ -2767,8 +2740,7 @@ PHP_FUNCTION(array_fill_keys) zend_hash_real_init_packed(Z_ARRVAL_P(return_value)); \ } while (0) -/* {{{ proto array range(mixed low, mixed high[, int step]) - Create an array containing the range of integers or characters from low to high (inclusive) */ +/* {{{ Create an array containing the range of integers or characters from low to high (inclusive) */ PHP_FUNCTION(range) { zval *zlow, *zhigh, *zstep = NULL, tmp; @@ -3039,8 +3011,7 @@ static void php_array_data_shuffle(zval *array) /* {{{ */ } /* }}} */ -/* {{{ proto bool shuffle(array array_arg) - Randomly shuffle the contents of an array */ +/* {{{ Randomly shuffle the contents of an array */ PHP_FUNCTION(shuffle) { zval *array; @@ -3190,8 +3161,7 @@ static void php_splice(HashTable *in_hash, zend_long offset, zend_long length, H } /* }}} */ -/* {{{ proto int array_push(array stack, mixed var [, mixed ...]) - Pushes elements onto the end of the array */ +/* {{{ Pushes elements onto the end of the array */ PHP_FUNCTION(array_push) { zval *args, /* Function arguments array */ @@ -3222,8 +3192,7 @@ PHP_FUNCTION(array_push) } /* }}} */ -/* {{{ proto mixed array_pop(array stack) - Pops an element off the end of the array */ +/* {{{ Pops an element off the end of the array */ PHP_FUNCTION(array_pop) { zval *stack, /* Input stack */ @@ -3272,8 +3241,7 @@ PHP_FUNCTION(array_pop) } /* }}} */ -/* {{{ proto mixed array_shift(array stack) - Pops an element off the beginning of the array */ +/* {{{ Pops an element off the beginning of the array */ PHP_FUNCTION(array_shift) { zval *stack, /* Input stack */ @@ -3379,8 +3347,7 @@ PHP_FUNCTION(array_shift) } /* }}} */ -/* {{{ proto int array_unshift(array stack, mixed var [, mixed ...]) - Pushes elements onto the beginning of the array */ +/* {{{ Pushes elements onto the beginning of the array */ PHP_FUNCTION(array_unshift) { zval *args, /* Function arguments array */ @@ -3436,8 +3403,7 @@ PHP_FUNCTION(array_unshift) } /* }}} */ -/* {{{ proto array array_splice(array input, int offset [, int length [, array replacement]]) - Removes the elements designated by offset and length and replace them with supplied array */ +/* {{{ Removes the elements designated by offset and length and replace them with supplied array */ PHP_FUNCTION(array_splice) { zval *array, /* Input array */ @@ -3526,8 +3492,7 @@ static inline Bucket* find_bucket_at_offset(HashTable* ht, zend_long offset) } /* }}} */ -/* {{{ proto array array_slice(array input, int offset [, int length [, bool preserve_keys]]) - Returns elements specified by offset and length */ +/* {{{ Returns elements specified by offset and length */ PHP_FUNCTION(array_slice) { zval *input; /* Input array */ @@ -3953,40 +3918,35 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET } /* }}} */ -/* {{{ proto array array_merge([array ...]) - Merges elements from passed arrays into one array */ +/* {{{ Merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge) { php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto array array_merge_recursive([array ...]) - Recursively merges elements from passed arrays into one array */ +/* {{{ Recursively merges elements from passed arrays into one array */ PHP_FUNCTION(array_merge_recursive) { php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto array array_replace(array arr1 [, array ...]) - Replaces elements from passed arrays into one array */ +/* {{{ Replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace) { php_array_replace_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto array array_replace_recursive(array arr1 [, array ...]) - Recursively replaces elements from passed arrays into one array */ +/* {{{ Recursively replaces elements from passed arrays into one array */ PHP_FUNCTION(array_replace_recursive) { php_array_replace_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto array array_keys(array input [, mixed search_value[, bool strict]]) - Return just the keys from the input array, optionally only for the specified search_value */ +/* {{{ Return just the keys from the input array, optionally only for the specified search_value */ PHP_FUNCTION(array_keys) { zval *input, /* Input array */ @@ -4069,8 +4029,7 @@ PHP_FUNCTION(array_keys) } /* }}} */ -/* {{{ proto int|string|false array_key_first(array stack) - Get the key of the first element of the array */ +/* {{{ Get the key of the first element of the array */ PHP_FUNCTION(array_key_first) { zval *stack; /* Input stack */ @@ -4085,8 +4044,7 @@ PHP_FUNCTION(array_key_first) } /* }}} */ -/* {{{ proto int|string|false array_key_last(array stack) - Get the key of the last element of the array */ +/* {{{ Get the key of the last element of the array */ PHP_FUNCTION(array_key_last) { zval *stack; /* Input stack */ @@ -4102,8 +4060,7 @@ PHP_FUNCTION(array_key_last) } /* }}} */ -/* {{{ proto array array_values(array input) - Return just the values from the input array */ +/* {{{ Return just the values from the input array */ PHP_FUNCTION(array_values) { zval *input, /* Input array */ @@ -4146,8 +4103,7 @@ PHP_FUNCTION(array_values) } /* }}} */ -/* {{{ proto array array_count_values(array input) - Return the value as key and the frequency of that value in input as value */ +/* {{{ Return the value as key and the frequency of that value in input as value */ PHP_FUNCTION(array_count_values) { zval *input, /* Input array */ @@ -4232,8 +4188,7 @@ static inline zval *array_column_fetch_prop(zval *data, zend_string *name_str, z } /* }}} */ -/* {{{ proto array array_column(array input, string|int|null column_key[, string|int|null index_key]) - Return the values from a single column in the input array, identified by the +/* {{{ Return the values from a single column in the input array, identified by the value_key and optionally indexed by the index_key */ PHP_FUNCTION(array_column) { @@ -4294,8 +4249,7 @@ PHP_FUNCTION(array_column) } /* }}} */ -/* {{{ proto array array_reverse(array input [, bool preserve keys]) - Return input as a new array with the order of the entries reversed */ +/* {{{ Return input as a new array with the order of the entries reversed */ PHP_FUNCTION(array_reverse) { zval *input, /* Input array */ @@ -4341,8 +4295,7 @@ PHP_FUNCTION(array_reverse) } /* }}} */ -/* {{{ proto array array_pad(array input, int pad_size, mixed pad_value) - Returns a copy of input array padded with pad_value to size pad_size */ +/* {{{ Returns a copy of input array padded with pad_value to size pad_size */ PHP_FUNCTION(array_pad) { zval *input; /* Input array */ @@ -4431,8 +4384,7 @@ PHP_FUNCTION(array_pad) } /* }}} */ -/* {{{ proto array array_flip(array input) - Return array with key <-> value flipped */ +/* {{{ Return array with key <-> value flipped */ PHP_FUNCTION(array_flip) { zval *array, *entry, data; @@ -4468,8 +4420,7 @@ PHP_FUNCTION(array_flip) } /* }}} */ -/* {{{ proto array array_change_key_case(array input [, int case=CASE_LOWER]) - Returns an array with all string keys lowercased [or uppercased] */ +/* {{{ Returns an array with all string keys lowercased [or uppercased] */ PHP_FUNCTION(array_change_key_case) { zval *array, *entry; @@ -4504,8 +4455,7 @@ PHP_FUNCTION(array_change_key_case) } /* }}} */ -/* {{{ proto array array_unique(array input [, int sort_flags]) - Removes duplicate values from array */ +/* {{{ Removes duplicate values from array */ PHP_FUNCTION(array_unique) { zval *array; @@ -4956,64 +4906,56 @@ out: } /* }}} */ -/* {{{ proto array array_intersect_key(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have keys which are present in all the other arguments. Kind of equivalent to array_diff(array_keys($arr1), array_keys($arr2)[,array_keys(...)]). Equivalent of array_intersect_assoc() but does not do compare of the data. */ +/* {{{ Returns the entries of arr1 that have keys which are present in all the other arguments. Kind of equivalent to array_diff(array_keys($arr1), array_keys($arr2)[,array_keys(...)]). Equivalent of array_intersect_assoc() but does not do compare of the data. */ PHP_FUNCTION(array_intersect_key) { php_array_intersect_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_COMP_DATA_NONE); } /* }}} */ -/* {{{ proto array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - Returns the entries of arr1 that have keys which are present in all the other arguments. Kind of equivalent to array_diff(array_keys($arr1), array_keys($arr2)[,array_keys(...)]). The comparison of the keys is performed by a user supplied function. Equivalent of array_intersect_uassoc() but does not do compare of the data. */ +/* {{{ Returns the entries of arr1 that have keys which are present in all the other arguments. Kind of equivalent to array_diff(array_keys($arr1), array_keys($arr2)[,array_keys(...)]). The comparison of the keys is performed by a user supplied function. Equivalent of array_intersect_uassoc() but does not do compare of the data. */ PHP_FUNCTION(array_intersect_ukey) { php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY, INTERSECT_COMP_DATA_INTERNAL, INTERSECT_COMP_KEY_USER); } /* }}} */ -/* {{{ proto array array_intersect(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have values which are present in all the other arguments */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments */ PHP_FUNCTION(array_intersect) { php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_NORMAL, INTERSECT_COMP_DATA_INTERNAL, INTERSECT_COMP_KEY_INTERNAL); } /* }}} */ -/* {{{ proto array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using a user-supplied callback. */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using a user-supplied callback. */ PHP_FUNCTION(array_uintersect) { php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_NORMAL, INTERSECT_COMP_DATA_USER, INTERSECT_COMP_KEY_INTERNAL); } /* }}} */ -/* {{{ proto array array_intersect_assoc(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check */ PHP_FUNCTION(array_intersect_assoc) { php_array_intersect_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_COMP_DATA_INTERNAL); } /* }}} */ -/* {{{ proto array array_intersect_uassoc(array arr1, array arr2 [, array ...], callback key_compare_func) U - Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check and they are compared by using a user-supplied callback. */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check and they are compared by using a user-supplied callback. */ PHP_FUNCTION(array_intersect_uassoc) { php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_ASSOC, INTERSECT_COMP_DATA_INTERNAL, INTERSECT_COMP_KEY_USER); } /* }}} */ -/* {{{ proto array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) U - Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Data is compared by using a user-supplied callback. */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Data is compared by using a user-supplied callback. */ PHP_FUNCTION(array_uintersect_assoc) { php_array_intersect_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_COMP_DATA_USER); } /* }}} */ -/* {{{ proto array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. */ +/* {{{ Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. */ PHP_FUNCTION(array_uintersect_uassoc) { php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_ASSOC, INTERSECT_COMP_DATA_USER, INTERSECT_COMP_KEY_USER); @@ -5361,24 +5303,21 @@ out: } /* }}} */ -/* {{{ proto array array_diff_key(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have keys which are not present in any of the others arguments. This function is like array_diff() but works on the keys instead of the values. The associativity is preserved. */ +/* {{{ Returns the entries of arr1 that have keys which are not present in any of the others arguments. This function is like array_diff() but works on the keys instead of the values. The associativity is preserved. */ PHP_FUNCTION(array_diff_key) { php_array_diff_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_COMP_DATA_NONE); } /* }}} */ -/* {{{ proto array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. */ +/* {{{ Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. */ PHP_FUNCTION(array_diff_ukey) { php_array_diff(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_KEY, DIFF_COMP_DATA_INTERNAL, DIFF_COMP_KEY_USER); } /* }}} */ -/* {{{ proto array array_diff(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have values which are not present in any of the others arguments. */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments. */ PHP_FUNCTION(array_diff) { zval *args; @@ -5507,40 +5446,35 @@ PHP_FUNCTION(array_diff) } /* }}} */ -/* {{{ proto array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. */ PHP_FUNCTION(array_udiff) { php_array_diff(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_NORMAL, DIFF_COMP_DATA_USER, DIFF_COMP_KEY_INTERNAL); } /* }}} */ -/* {{{ proto array array_diff_assoc(array arr1, array arr2 [, array ...]) - Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal */ PHP_FUNCTION(array_diff_assoc) { php_array_diff_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_COMP_DATA_INTERNAL); } /* }}} */ -/* {{{ proto array array_diff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func) - Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Elements are compared by user supplied function. */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Elements are compared by user supplied function. */ PHP_FUNCTION(array_diff_uassoc) { php_array_diff(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_ASSOC, DIFF_COMP_DATA_INTERNAL, DIFF_COMP_KEY_USER); } /* }}} */ -/* {{{ proto array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. */ PHP_FUNCTION(array_udiff_assoc) { php_array_diff_key(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_COMP_DATA_USER); } /* }}} */ -/* {{{ proto array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. */ +/* {{{ Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. */ PHP_FUNCTION(array_udiff_uassoc) { php_array_diff(INTERNAL_FUNCTION_PARAM_PASSTHRU, DIFF_ASSOC, DIFF_COMP_DATA_USER, DIFF_COMP_KEY_USER); @@ -5587,8 +5521,7 @@ static void array_bucket_p_sawp(void *p, void *q) /* {{{ */ { } /* }}} */ -/* {{{ proto bool array_multisort(array &$array1 [, mixed $array1_sort_order [, mixed $array1_sort_flags [, mixed ... ]]] - Sort multiple arrays at once similar to how ORDER BY clause works in SQL */ +/* {{{ Sort multiple arrays at once similar to how ORDER BY clause works in SQL */ PHP_FUNCTION(array_multisort) { zval* args; @@ -5763,8 +5696,7 @@ PHP_FUNCTION(array_multisort) } /* }}} */ -/* {{{ proto int|string|array array_rand(array input [, int num_req]) - Return key/keys for random entry/entries in the array */ +/* {{{ Return key/keys for random entry/entries in the array */ PHP_FUNCTION(array_rand) { zval *input; @@ -5874,8 +5806,7 @@ PHP_FUNCTION(array_rand) } /* }}} */ -/* {{{ proto int|float array_sum(array input) - Returns the sum of the array entries */ +/* {{{ Returns the sum of the array entries */ PHP_FUNCTION(array_sum) { zval *input, @@ -5899,8 +5830,7 @@ PHP_FUNCTION(array_sum) } /* }}} */ -/* {{{ proto int|float array_product(array input) - Returns the product of the array entries */ +/* {{{ Returns the product of the array entries */ PHP_FUNCTION(array_product) { zval *input, @@ -5938,8 +5868,7 @@ PHP_FUNCTION(array_product) } /* }}} */ -/* {{{ proto mixed array_reduce(array input, mixed callback [, mixed initial]) - Iteratively reduce the array to a single value via the callback. */ +/* {{{ Iteratively reduce the array to a single value via the callback. */ PHP_FUNCTION(array_reduce) { zval *input; @@ -5999,8 +5928,7 @@ PHP_FUNCTION(array_reduce) } /* }}} */ -/* {{{ proto array array_filter(array input [, mixed callback [, int use_type]]) - Filters elements from the array via the callback. */ +/* {{{ Filters elements from the array via the callback. */ PHP_FUNCTION(array_filter) { zval *array; @@ -6092,8 +6020,7 @@ PHP_FUNCTION(array_filter) } /* }}} */ -/* {{{ proto array array_map(mixed callback, array input1 [, array input2 ,...]) - Applies the callback to the elements in given arrays. */ +/* {{{ Applies the callback to the elements in given arrays. */ PHP_FUNCTION(array_map) { zval *arrays = NULL; @@ -6251,8 +6178,7 @@ PHP_FUNCTION(array_map) } /* }}} */ -/* {{{ proto bool array_key_exists(mixed key, array search) - Checks if the given key or index exists in the array */ +/* {{{ Checks if the given key or index exists in the array */ PHP_FUNCTION(array_key_exists) { zval *key; @@ -6293,8 +6219,7 @@ PHP_FUNCTION(array_key_exists) } /* }}} */ -/* {{{ proto array array_chunk(array input, int size [, bool preserve_keys]) - Split array into chunks */ +/* {{{ Split array into chunks */ PHP_FUNCTION(array_chunk) { int num_in; @@ -6366,8 +6291,7 @@ PHP_FUNCTION(array_chunk) } /* }}} */ -/* {{{ proto array array_combine(array keys, array values) - Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding values */ +/* {{{ Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding values */ PHP_FUNCTION(array_combine) { HashTable *values, *keys; diff --git a/ext/standard/assert.c b/ext/standard/assert.c index cc49786aa7..3aac8d6e48 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -135,8 +135,7 @@ PHP_MINFO_FUNCTION(assert) /* {{{ */ } /* }}} */ -/* {{{ proto int assert(string|bool assertion[, mixed description]) - Checks if assertion is false */ +/* {{{ Checks if assertion is false */ PHP_FUNCTION(assert) { zval *assertion; @@ -218,8 +217,7 @@ PHP_FUNCTION(assert) } /* }}} */ -/* {{{ proto mixed assert_options(int what [, mixed value]) - Set/get the various assert flags */ +/* {{{ Set/get the various assert flags */ PHP_FUNCTION(assert_options) { zval *value = NULL; diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 79825597ac..2d67f88f66 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -925,8 +925,7 @@ PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length #endif /* }}} */ -/* {{{ proto string base64_encode(string str) - Encodes string using MIME base64 algorithm */ +/* {{{ Encodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_encode) { char *str; @@ -942,8 +941,7 @@ PHP_FUNCTION(base64_encode) } /* }}} */ -/* {{{ proto string|false base64_decode(string str[, bool strict]) - Decodes string using MIME base64 algorithm */ +/* {{{ Decodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_decode) { char *str; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index a02a26b1a6..ee82fa32e0 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -564,8 +564,7 @@ PHP_MINFO_FUNCTION(basic) /* {{{ */ } /* }}} */ -/* {{{ proto mixed constant(string const_name) - Given the name of a constant this function will return the constant's associated value */ +/* {{{ Given the name of a constant this function will return the constant's associated value */ PHP_FUNCTION(constant) { zend_string *const_name; @@ -592,8 +591,7 @@ PHP_FUNCTION(constant) /* }}} */ #ifdef HAVE_INET_NTOP -/* {{{ proto string|false inet_ntop(string in_addr) - Converts a packed inet address to a human readable IP address string */ +/* {{{ Converts a packed inet address to a human readable IP address string */ PHP_FUNCTION(inet_ntop) { char *address; @@ -624,8 +622,7 @@ PHP_FUNCTION(inet_ntop) #endif /* HAVE_INET_NTOP */ #ifdef HAVE_INET_PTON -/* {{{ proto string|false inet_pton(string ip_address) - Converts a human readable IP address to a packed binary string */ +/* {{{ Converts a human readable IP address to a packed binary string */ PHP_FUNCTION(inet_pton) { int ret, af = AF_INET; @@ -659,8 +656,7 @@ PHP_FUNCTION(inet_pton) /* }}} */ #endif /* HAVE_INET_PTON */ -/* {{{ proto int|false ip2long(string ip_address) - Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address */ +/* {{{ Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address */ PHP_FUNCTION(ip2long) { char *addr; @@ -697,8 +693,7 @@ PHP_FUNCTION(ip2long) } /* }}} */ -/* {{{ proto string|false long2ip(int proper_address) - Converts an (IPv4) Internet network address into a string in Internet standard dotted format */ +/* {{{ Converts an (IPv4) Internet network address into a string in Internet standard dotted format */ PHP_FUNCTION(long2ip) { zend_ulong ip; @@ -732,8 +727,7 @@ PHP_FUNCTION(long2ip) * System Functions * ********************/ -/* {{{ proto string|array|false getenv([ string varname[, bool local_only]]) - Get the value of an environment variable or every available environment variable +/* {{{ Get the value of an environment variable or every available environment variable if no varname is present */ PHP_FUNCTION(getenv) { @@ -830,8 +824,7 @@ PHP_FUNCTION(getenv) /* }}} */ #ifdef HAVE_PUTENV -/* {{{ proto bool putenv(string setting) - Set the value of an environment variable */ +/* {{{ Set the value of an environment variable */ PHP_FUNCTION(putenv) { char *setting; @@ -1028,8 +1021,7 @@ static int parse_opts(char * opts, opt_struct ** result) } /* }}} */ -/* {{{ proto array|false getopt(string options [, array longopts [, int &optind]]) - Get options from the command line argument list */ +/* {{{ Get options from the command line argument list */ PHP_FUNCTION(getopt) { char *options = NULL, **argv = NULL; @@ -1210,8 +1202,7 @@ PHP_FUNCTION(getopt) } /* }}} */ -/* {{{ proto void flush(void) - Flush the output buffer */ +/* {{{ Flush the output buffer */ PHP_FUNCTION(flush) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1220,8 +1211,7 @@ PHP_FUNCTION(flush) } /* }}} */ -/* {{{ proto int sleep(int seconds) - Delay for a given number of seconds */ +/* {{{ Delay for a given number of seconds */ PHP_FUNCTION(sleep) { zend_long num; @@ -1239,8 +1229,7 @@ PHP_FUNCTION(sleep) } /* }}} */ -/* {{{ proto void usleep(int micro_seconds) - Delay for a given number of micro seconds */ +/* {{{ Delay for a given number of micro seconds */ PHP_FUNCTION(usleep) { zend_long num; @@ -1261,8 +1250,7 @@ PHP_FUNCTION(usleep) /* }}} */ #if HAVE_NANOSLEEP -/* {{{ proto mixed time_nanosleep(int seconds, int nanoseconds) - Delay for a number of seconds and nano seconds */ +/* {{{ Delay for a number of seconds and nano seconds */ PHP_FUNCTION(time_nanosleep) { zend_long tv_sec, tv_nsec; @@ -1300,8 +1288,7 @@ PHP_FUNCTION(time_nanosleep) } /* }}} */ -/* {{{ proto bool time_sleep_until(float timestamp) - Make the script sleep until the specified time */ +/* {{{ Make the script sleep until the specified time */ PHP_FUNCTION(time_sleep_until) { double target_secs; @@ -1343,8 +1330,7 @@ PHP_FUNCTION(time_sleep_until) /* }}} */ #endif -/* {{{ proto string get_current_user(void) - Get the name of the owner of the current PHP script */ +/* {{{ Get the name of the owner of the current PHP script */ PHP_FUNCTION(get_current_user) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1355,8 +1341,7 @@ PHP_FUNCTION(get_current_user) static void add_config_entries(HashTable *hash, zval *return_value); -/* {{{ add_config_entry - */ +/* {{{ add_config_entry */ static void add_config_entry(zend_ulong h, zend_string *key, zval *entry, zval *retval) { if (Z_TYPE_P(entry) == IS_STRING) { @@ -1383,8 +1368,7 @@ static void add_config_entry(zend_ulong h, zend_string *key, zval *entry, zval * } /* }}} */ -/* {{{ add_config_entries - */ +/* {{{ add_config_entries */ static void add_config_entries(HashTable *hash, zval *return_value) /* {{{ */ { zend_ulong h; @@ -1397,8 +1381,7 @@ static void add_config_entries(HashTable *hash, zval *return_value) /* {{{ */ } /* }}} */ -/* {{{ proto string|array|false get_cfg_var(string option_name) - Get the value of a PHP configuration option */ +/* {{{ Get the value of a PHP configuration option */ PHP_FUNCTION(get_cfg_var) { char *varname; @@ -1439,8 +1422,7 @@ error options: 4 = send to SAPI logger directly */ -/* {{{ proto bool error_log(string message [, int message_type [, string destination [, string extra_headers]]]) - Send an error message somewhere */ +/* {{{ Send an error message somewhere */ PHP_FUNCTION(error_log) { char *message, *opt = NULL, *headers = NULL; @@ -1521,8 +1503,7 @@ PHPAPI int _php_error_log_ex(int opt_err, const char *message, size_t message_le } /* }}} */ -/* {{{ proto array error_get_last() - Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet. */ +/* {{{ Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet. */ PHP_FUNCTION(error_get_last) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1538,8 +1519,7 @@ PHP_FUNCTION(error_get_last) } /* }}} */ -/* {{{ proto void error_clear_last(void) - Clear the last occurred error. */ +/* {{{ Clear the last occurred error. */ PHP_FUNCTION(error_clear_last) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1559,8 +1539,7 @@ PHP_FUNCTION(error_clear_last) } /* }}} */ -/* {{{ proto mixed call_user_func(mixed function_name [, mixed parameter] [, mixed ...]) - Call a user function which is the first parameter +/* {{{ Call a user function which is the first parameter Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(call_user_func) { @@ -1584,8 +1563,7 @@ PHP_FUNCTION(call_user_func) } /* }}} */ -/* {{{ proto mixed call_user_func_array(callable function, array parameters) - Call a user function which is the first parameter with the arguments contained in array +/* {{{ Call a user function which is the first parameter with the arguments contained in array Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(call_user_func_array) { @@ -1612,8 +1590,7 @@ PHP_FUNCTION(call_user_func_array) } /* }}} */ -/* {{{ proto mixed forward_static_call(mixed function_name [, mixed parameter] [, mixed ...]) U - Call a user function which is the first parameter */ +/* {{{ Call a user function which is the first parameter */ PHP_FUNCTION(forward_static_call) { zval retval; @@ -1648,8 +1625,7 @@ PHP_FUNCTION(forward_static_call) } /* }}} */ -/* {{{ proto mixed forward_static_call_array(callable function, array parameters) - Call a static method which is the first parameter with the arguments contained in array */ +/* {{{ Call a static method which is the first parameter with the arguments contained in array */ PHP_FUNCTION(forward_static_call_array) { zval *params, retval; @@ -1825,8 +1801,7 @@ PHPAPI void php_free_shutdown_functions(void) /* {{{ */ } /* }}} */ -/* {{{ proto false|null register_shutdown_function(callback function) U - Register a user-level function to be called on request termination */ +/* {{{ Register a user-level function to be called on request termination */ PHP_FUNCTION(register_shutdown_function) { php_shutdown_function_entry shutdown_function_entry; @@ -1910,8 +1885,7 @@ ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highl } /* }}} */ -/* {{{ proto bool highlight_file(string file_name [, bool return] ) - Syntax highlight a source file */ +/* {{{ Syntax highlight a source file */ PHP_FUNCTION(highlight_file) { char *filename; @@ -1954,8 +1928,7 @@ PHP_FUNCTION(highlight_file) } /* }}} */ -/* {{{ proto string php_strip_whitespace(string file_name) - Return source with stripped comments and whitespace */ +/* {{{ Return source with stripped comments and whitespace */ PHP_FUNCTION(php_strip_whitespace) { char *filename; @@ -1987,8 +1960,7 @@ PHP_FUNCTION(php_strip_whitespace) } /* }}} */ -/* {{{ proto bool highlight_string(string string [, bool return] ) - Syntax highlight a string or optionally return it */ +/* {{{ Syntax highlight a string or optionally return it */ PHP_FUNCTION(highlight_string) { zval *expr; @@ -2053,8 +2025,7 @@ PHP_FUNCTION(highlight_string) } \ } while (0) -/* {{{ proto string|false ini_get(string varname) - Get a configuration option */ +/* {{{ Get a configuration option */ PHP_FUNCTION(ini_get) { zend_string *varname, *val; @@ -2073,8 +2044,7 @@ PHP_FUNCTION(ini_get) } /* }}} */ -/* {{{ proto array|false ini_get_all([string extension[, bool details = true]]) - Get all configuration options */ +/* {{{ Get all configuration options */ PHP_FUNCTION(ini_get_all) { char *extname = NULL; @@ -2155,8 +2125,7 @@ static int php_ini_check_path(char *option_name, size_t option_len, char *new_op } /* }}} */ -/* {{{ proto string|false ini_set(string varname, string newvalue) - Set a configuration option, returns false on error and the old value of the configuration option on success */ +/* {{{ Set a configuration option, returns false on error and the old value of the configuration option on success */ PHP_FUNCTION(ini_set) { zend_string *varname; @@ -2202,8 +2171,7 @@ PHP_FUNCTION(ini_set) #undef INI_RETVAL_STR -/* {{{ proto void ini_restore(string varname) - Restore the value of a configuration option specified by varname */ +/* {{{ Restore the value of a configuration option specified by varname */ PHP_FUNCTION(ini_restore) { zend_string *varname; @@ -2216,8 +2184,7 @@ PHP_FUNCTION(ini_restore) } /* }}} */ -/* {{{ proto string|false set_include_path(string new_include_path) - Sets the include_path configuration option */ +/* {{{ Sets the include_path configuration option */ PHP_FUNCTION(set_include_path) { zend_string *new_value; @@ -2246,8 +2213,7 @@ PHP_FUNCTION(set_include_path) } /* }}} */ -/* {{{ proto string|false get_include_path() - Get the current include_path configuration option */ +/* {{{ Get the current include_path configuration option */ PHP_FUNCTION(get_include_path) { char *str; @@ -2264,8 +2230,7 @@ PHP_FUNCTION(get_include_path) } /* }}} */ -/* {{{ proto mixed print_r(mixed var [, bool return]) - Prints out or returns information about the specified variable */ +/* {{{ Prints out or returns information about the specified variable */ PHP_FUNCTION(print_r) { zval *var; @@ -2286,8 +2251,7 @@ PHP_FUNCTION(print_r) } /* }}} */ -/* {{{ proto int connection_aborted(void) - Returns true if client disconnected */ +/* {{{ Returns true if client disconnected */ PHP_FUNCTION(connection_aborted) { ZEND_PARSE_PARAMETERS_NONE(); @@ -2296,8 +2260,7 @@ PHP_FUNCTION(connection_aborted) } /* }}} */ -/* {{{ proto int connection_status(void) - Returns the connection status bitfield */ +/* {{{ Returns the connection status bitfield */ PHP_FUNCTION(connection_status) { ZEND_PARSE_PARAMETERS_NONE(); @@ -2306,8 +2269,7 @@ PHP_FUNCTION(connection_status) } /* }}} */ -/* {{{ proto int ignore_user_abort([bool value]) - Set whether we want to ignore a user abort event or not */ +/* {{{ Set whether we want to ignore a user abort event or not */ PHP_FUNCTION(ignore_user_abort) { zend_bool arg = 0; @@ -2331,8 +2293,7 @@ PHP_FUNCTION(ignore_user_abort) /* }}} */ #if HAVE_GETSERVBYNAME -/* {{{ proto int|false getservbyname(string service, string protocol) - Returns port associated with service. Protocol must be "tcp" or "udp" */ +/* {{{ Returns port associated with service. Protocol must be "tcp" or "udp" */ PHP_FUNCTION(getservbyname) { char *name, *proto; @@ -2374,8 +2335,7 @@ PHP_FUNCTION(getservbyname) #endif #if HAVE_GETSERVBYPORT -/* {{{ proto string|false getservbyport(int port, string protocol) - Returns service name associated with port. Protocol must be "tcp" or "udp" */ +/* {{{ Returns service name associated with port. Protocol must be "tcp" or "udp" */ PHP_FUNCTION(getservbyport) { char *proto; @@ -2400,8 +2360,7 @@ PHP_FUNCTION(getservbyport) #endif #if HAVE_GETPROTOBYNAME -/* {{{ proto int|false getprotobyname(string name) - Returns protocol number associated with name as per /etc/protocols */ +/* {{{ Returns protocol number associated with name as per /etc/protocols */ PHP_FUNCTION(getprotobyname) { char *name; @@ -2424,8 +2383,7 @@ PHP_FUNCTION(getprotobyname) #endif #if HAVE_GETPROTOBYNUMBER -/* {{{ proto string|false getprotobynumber(int proto) - Returns protocol name associated with protocol number proto */ +/* {{{ Returns protocol name associated with protocol number proto */ PHP_FUNCTION(getprotobynumber) { zend_long proto; @@ -2446,8 +2404,7 @@ PHP_FUNCTION(getprotobynumber) /* }}} */ #endif -/* {{{ proto bool register_tick_function(string function_name [, mixed arg [, mixed ... ]]) - Registers a tick callback function */ +/* {{{ Registers a tick callback function */ PHP_FUNCTION(register_tick_function) { user_tick_function_entry tick_fe; @@ -2499,8 +2456,7 @@ PHP_FUNCTION(register_tick_function) } /* }}} */ -/* {{{ proto void unregister_tick_function(string function_name) - Unregisters a tick callback function */ +/* {{{ Unregisters a tick callback function */ PHP_FUNCTION(unregister_tick_function) { zval *function; @@ -2526,8 +2482,7 @@ PHP_FUNCTION(unregister_tick_function) } /* }}} */ -/* {{{ proto bool is_uploaded_file(string path) - Check if file was created by rfc1867 upload */ +/* {{{ Check if file was created by rfc1867 upload */ PHP_FUNCTION(is_uploaded_file) { char *path; @@ -2549,8 +2504,7 @@ PHP_FUNCTION(is_uploaded_file) } /* }}} */ -/* {{{ proto bool move_uploaded_file(string path, string new_path) - Move a file if and only if it was created by an upload */ +/* {{{ Move a file if and only if it was created by an upload */ PHP_FUNCTION(move_uploaded_file) { char *path, *new_path; @@ -2605,8 +2559,7 @@ PHP_FUNCTION(move_uploaded_file) } /* }}} */ -/* {{{ php_simple_ini_parser_cb - */ +/* {{{ php_simple_ini_parser_cb */ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_type, zval *arr) { switch (callback_type) { @@ -2662,8 +2615,7 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int cal } /* }}} */ -/* {{{ php_ini_parser_cb_with_sections - */ +/* {{{ php_ini_parser_cb_with_sections */ static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, zval *arg3, int callback_type, zval *arr) { if (callback_type == ZEND_INI_PARSER_SECTION) { @@ -2683,8 +2635,7 @@ static void php_ini_parser_cb_with_sections(zval *arg1, zval *arg2, zval *arg3, } /* }}} */ -/* {{{ proto array|false parse_ini_file(string filename [, bool process_sections [, int scanner_mode]]) - Parse configuration file */ +/* {{{ Parse configuration file */ PHP_FUNCTION(parse_ini_file) { char *filename = NULL; @@ -2725,8 +2676,7 @@ PHP_FUNCTION(parse_ini_file) } /* }}} */ -/* {{{ proto array|false parse_ini_string(string ini_string [, bool process_sections [, int scanner_mode]]) - Parse configuration string */ +/* {{{ Parse configuration string */ PHP_FUNCTION(parse_ini_string) { char *string = NULL, *str = NULL; @@ -2784,8 +2734,7 @@ PHP_FUNCTION(config_get_hash) /* {{{ */ #endif #ifdef HAVE_GETLOADAVG -/* {{{ proto array|false sys_getloadavg() -*/ +/* {{{ */ PHP_FUNCTION(sys_getloadavg) { double load[3]; diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 8e99b925db..abb5d69df8 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -474,8 +474,7 @@ static void browscap_bdata_dtor(browser_data *bdata, int persistent) /* {{{ */ } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ PHP_INI_MH(OnChangeBrowscap) { if (stage == PHP_INI_STAGE_STARTUP) { @@ -676,8 +675,7 @@ static void browscap_zval_copy_ctor(zval *p) /* {{{ */ } /* }}} */ -/* {{{ proto mixed get_browser([string browser_name [, bool return_array]]) - Get information about the capabilities of a browser. If browser_name is omitted or null, HTTP_USER_AGENT is used. Returns an object by default; if return_array is true, returns an array. */ +/* {{{ Get information about the capabilities of a browser. If browser_name is omitted or null, HTTP_USER_AGENT is used. Returns an object by default; if return_array is true, returns an array. */ PHP_FUNCTION(get_browser) { zend_string *agent_name = NULL, *lookup_browser_name; diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c index 43f2ff74d0..6ab5c317bf 100644 --- a/ext/standard/crc32.c +++ b/ext/standard/crc32.c @@ -68,8 +68,7 @@ static uint32_t crc32_aarch64(uint32_t crc, char *p, size_t nr) { # pragma GCC pop_options #endif -/* {{{ proto string crc32(string str) - Calculate the crc32 polynomial of a string */ +/* {{{ Calculate the crc32 polynomial of a string */ PHP_FUNCTION(crc32) { char *p; diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index e592d3bf55..f994ff4c31 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -208,8 +208,7 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch /* }}} */ -/* {{{ proto string crypt(string str [, string salt]) - Hash a string */ +/* {{{ Hash a string */ PHP_FUNCTION(crypt) { char salt[PHP_MAX_SALT_LEN + 1]; diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index ba70db4b06..8ea14c6ff2 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -67,8 +67,7 @@ PHPAPI char *php_std_date(time_t t) char *strptime(const char *s, const char *format, struct tm *tm); #endif -/* {{{ proto array|false strptime(string timestamp, string format) - Parse a time/date generated with strftime() */ +/* {{{ Parse a time/date generated with strftime() */ PHP_FUNCTION(strptime) { char *ts; diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 547a3dbfd6..e480c245fe 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -227,24 +227,21 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject) } /* }}} */ -/* {{{ proto resource|false opendir(string path[, resource context]) - Open a directory and return a dir_handle */ +/* {{{ Open a directory and return a dir_handle */ PHP_FUNCTION(opendir) { _php_do_opendir(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto object|false dir(string directory[, resource context]) - Directory class with properties, handle and class and methods read, rewind and close */ +/* {{{ Directory class with properties, handle and class and methods read, rewind and close */ PHP_FUNCTION(getdir) { _php_do_opendir(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool closedir([resource dir_handle]) - Close directory connection identified by the dir_handle */ +/* {{{ Close directory connection identified by the dir_handle */ PHP_FUNCTION(closedir) { zval *id = NULL, *tmp, *myself; @@ -268,8 +265,7 @@ PHP_FUNCTION(closedir) /* }}} */ #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC -/* {{{ proto bool chroot(string directory) - Change root directory */ +/* {{{ Change root directory */ PHP_FUNCTION(chroot) { char *str; @@ -300,8 +296,7 @@ PHP_FUNCTION(chroot) /* }}} */ #endif -/* {{{ proto bool chdir(string directory) - Change the current directory */ +/* {{{ Change the current directory */ PHP_FUNCTION(chdir) { char *str; @@ -335,8 +330,7 @@ PHP_FUNCTION(chdir) } /* }}} */ -/* {{{ proto mixed getcwd(void) - Gets the current directory */ +/* {{{ Gets the current directory */ PHP_FUNCTION(getcwd) { char path[MAXPATHLEN]; @@ -358,8 +352,7 @@ PHP_FUNCTION(getcwd) } /* }}} */ -/* {{{ proto void rewinddir([resource dir_handle]) - Rewind dir_handle back to the start */ +/* {{{ Rewind dir_handle back to the start */ PHP_FUNCTION(rewinddir) { zval *id = NULL, *tmp, *myself; @@ -376,8 +369,7 @@ PHP_FUNCTION(rewinddir) } /* }}} */ -/* {{{ proto string|false readdir([resource dir_handle]) - Read directory entry from dir_handle */ +/* {{{ Read directory entry from dir_handle */ PHP_FUNCTION(readdir) { zval *id = NULL, *tmp, *myself; @@ -399,8 +391,7 @@ PHP_FUNCTION(readdir) /* }}} */ #ifdef HAVE_GLOB -/* {{{ proto array|false glob(string pattern [, int flags]) - Find pathnames matching a pattern */ +/* {{{ Find pathnames matching a pattern */ PHP_FUNCTION(glob) { size_t cwd_skip = 0; @@ -532,8 +523,7 @@ no_results: /* }}} */ #endif -/* {{{ proto array|false scandir(string dir [, int sorting_order [, resource context]]) - List files & directories inside the specified path */ +/* {{{ List files & directories inside the specified path */ PHP_FUNCTION(scandir) { char *dirn; diff --git a/ext/standard/dl.c b/ext/standard/dl.c index f70ab6fbb5..233103f83d 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -38,8 +38,7 @@ #endif #endif /* defined(HAVE_LIBDL) */ -/* {{{ proto bool dl(string extension_filename) - Load a PHP extension at runtime */ +/* {{{ Load a PHP extension at runtime */ PHPAPI PHP_FUNCTION(dl) { char *filename; @@ -68,8 +67,7 @@ PHPAPI PHP_FUNCTION(dl) #if defined(HAVE_LIBDL) -/* {{{ php_load_shlib - */ +/* {{{ php_load_shlib */ PHPAPI void *php_load_shlib(const char *path, char **errp) { void *handle; @@ -96,8 +94,7 @@ PHPAPI void *php_load_shlib(const char *path, char **errp) } /* }}} */ -/* {{{ php_load_extension - */ +/* {{{ php_load_extension */ PHPAPI int php_load_extension(const char *filename, int type, int start_now) { void *handle; @@ -265,8 +262,7 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now) #endif -/* {{{ php_dl - */ +/* {{{ php_dl */ PHPAPI void php_dl(const char *file, int type, zval *return_value, int start_now) { /* Load extension */ diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 18f44802c2..f77735ed72 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -118,8 +118,7 @@ static zend_string *php_gethostbyaddr(char *ip); static zend_string *php_gethostbyname(char *name); #ifdef HAVE_GETHOSTNAME -/* {{{ proto string|false gethostname() - Get the host name of the current machine */ +/* {{{ Get the host name of the current machine */ PHP_FUNCTION(gethostname) { char buf[HOST_NAME_MAX + 1]; @@ -140,8 +139,7 @@ PHP_FUNCTION(gethostname) we can have a dns.c, dns_unix.c and dns_win32.c instead of a messy dns.c full of #ifdef */ -/* {{{ proto string|false gethostbyaddr(string ip_address) - Get the Internet host name corresponding to a given IP address */ +/* {{{ Get the Internet host name corresponding to a given IP address */ PHP_FUNCTION(gethostbyaddr) { char *addr; @@ -202,8 +200,7 @@ static zend_string *php_gethostbyaddr(char *ip) } /* }}} */ -/* {{{ proto string gethostbyname(string hostname) - Get the IP address corresponding to a given Internet host name */ +/* {{{ Get the IP address corresponding to a given Internet host name */ PHP_FUNCTION(gethostbyname) { char *hostname; @@ -223,8 +220,7 @@ PHP_FUNCTION(gethostbyname) } /* }}} */ -/* {{{ proto array|false gethostbynamel(string hostname) - Return a list of IP addresses that a given hostname resolves to. */ +/* {{{ Return a list of IP addresses that a given hostname resolves to. */ PHP_FUNCTION(gethostbynamel) { char *hostname; @@ -354,8 +350,7 @@ static void _php_dns_free_res(struct __res_state *res) { /* {{{ */ #define php_dns_free_res(__res__) #endif -/* {{{ proto bool dns_check_record(string host [, string type]) - Check DNS records corresponding to a given Internet host name or IP address */ +/* {{{ Check DNS records corresponding to a given Internet host name or IP address */ PHP_FUNCTION(dns_check_record) { #ifndef MAXPACKET @@ -797,8 +792,7 @@ static u_char *php_parserr(u_char *cp, u_char *end, querybuf *answer, int type_t } /* }}} */ -/* {{{ proto array|false dns_get_record(string hostname [, int type[, array &authns[, array &addtl[, bool raw]]]]) - Get any Resource Record corresponding to a given Internet host name */ +/* {{{ Get any Resource Record corresponding to a given Internet host name */ PHP_FUNCTION(dns_get_record) { char *hostname; @@ -1037,8 +1031,7 @@ PHP_FUNCTION(dns_get_record) } /* }}} */ -/* {{{ proto bool dns_get_mx(string hostname, array mxhosts [, array weight]) - Get MX records corresponding to a given Internet host name */ +/* {{{ Get MX records corresponding to a given Internet host name */ PHP_FUNCTION(dns_get_mx) { char *hostname; diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index f9db359d73..838a40c94e 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -91,8 +91,7 @@ cleanup: } /* }}} */ -/* {{{ proto bool dns_check_record(string host [, string type]) - Check DNS records corresponding to a given Internet host name or IP address */ +/* {{{ Check DNS records corresponding to a given Internet host name or IP address */ PHP_FUNCTION(dns_check_record) { char *hostname, *rectype = NULL; @@ -344,8 +343,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, } /* }}} */ -/* {{{ proto array|false dns_get_record(string hostname [, int type[, array &authns[, array &addtl[, bool raw]]]]) - Get any Resource Record corresponding to a given Internet host name */ +/* {{{ Get any Resource Record corresponding to a given Internet host name */ PHP_FUNCTION(dns_get_record) { char *hostname; diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 8ba205a9ed..81135669f5 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -249,24 +249,21 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ } /* }}} */ -/* {{{ proto string|false exec(string command [, array &output [, int &return_value]]) - Execute an external program */ +/* {{{ Execute an external program */ PHP_FUNCTION(exec) { php_exec_ex(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int|false system(string command [, int &return_value]) - Execute an external program and display output */ +/* {{{ Execute an external program and display output */ PHP_FUNCTION(system) { php_exec_ex(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool passthru(string command [, int &return_value]) - Execute an external program and display raw output */ +/* {{{ Execute an external program and display raw output */ PHP_FUNCTION(passthru) { php_exec_ex(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); @@ -387,8 +384,7 @@ PHPAPI zend_string *php_escape_shell_cmd(const char *str) } /* }}} */ -/* {{{ php_escape_shell_arg - */ +/* {{{ php_escape_shell_arg */ PHPAPI zend_string *php_escape_shell_arg(const char *str) { size_t x, y = 0; @@ -472,8 +468,7 @@ PHPAPI zend_string *php_escape_shell_arg(const char *str) } /* }}} */ -/* {{{ proto string escapeshellcmd(string command) - Escape shell metacharacters */ +/* {{{ Escape shell metacharacters */ PHP_FUNCTION(escapeshellcmd) { char *command; @@ -495,8 +490,7 @@ PHP_FUNCTION(escapeshellcmd) } /* }}} */ -/* {{{ proto string escapeshellarg(string arg) - Quote and escape an argument for use in a shell command */ +/* {{{ Quote and escape an argument for use in a shell command */ PHP_FUNCTION(escapeshellarg) { char *argument; @@ -515,8 +509,7 @@ PHP_FUNCTION(escapeshellarg) } /* }}} */ -/* {{{ proto string|false shell_exec(string cmd) - Execute command via shell and return complete output as string */ +/* {{{ Execute command via shell and return complete output as string */ PHP_FUNCTION(shell_exec) { FILE *in; @@ -558,8 +551,7 @@ PHP_FUNCTION(shell_exec) /* }}} */ #ifdef HAVE_NICE -/* {{{ proto bool proc_nice(int priority) - Change the priority of the current process */ +/* {{{ Change the priority of the current process */ PHP_FUNCTION(proc_nice) { zend_long pri; diff --git a/ext/standard/file.c b/ext/standard/file.c index 763409d181..98578376b0 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -127,8 +127,7 @@ PHPAPI int php_le_stream_context(void) } /* }}} */ -/* {{{ Module-Stuff -*/ +/* {{{ Module-Stuff */ static ZEND_RSRC_DTOR_FUNC(file_context_dtor) { php_stream_context *context = (php_stream_context*)res->ptr; @@ -328,8 +327,7 @@ PHP_MSHUTDOWN_FUNCTION(file) /* {{{ */ static int flock_values[] = { LOCK_SH, LOCK_EX, LOCK_UN }; -/* {{{ proto bool flock(resource fp, int operation [, int &wouldblock]) - Portable file locking */ +/* {{{ Portable file locking */ PHP_FUNCTION(flock) { zval *res, *wouldblock = NULL; @@ -370,8 +368,7 @@ PHP_FUNCTION(flock) #define PHP_META_UNSAFE ".\\+*?[^]$() " -/* {{{ proto array|false get_meta_tags(string filename [, bool use_include_path]) - Extracts all meta tag content attributes from a file and returns an array */ +/* {{{ Extracts all meta tag content attributes from a file and returns an array */ PHP_FUNCTION(get_meta_tags) { char *filename; @@ -515,8 +512,7 @@ PHP_FUNCTION(get_meta_tags) } /* }}} */ -/* {{{ proto string|false file_get_contents(string filename [, bool use_include_path [, resource context [, int offset [, int maxlen]]]]) - Read the entire file into a string */ +/* {{{ Read the entire file into a string */ PHP_FUNCTION(file_get_contents) { char *filename; @@ -573,8 +569,7 @@ PHP_FUNCTION(file_get_contents) } /* }}} */ -/* {{{ proto int|false file_put_contents(string file, mixed data [, int flags [, resource context]]) - Write/Create a file with contents data and return the number of bytes written */ +/* {{{ Write/Create a file with contents data and return the number of bytes written */ PHP_FUNCTION(file_put_contents) { php_stream *stream; @@ -715,8 +710,7 @@ PHP_FUNCTION(file_put_contents) #define PHP_FILE_BUF_SIZE 80 -/* {{{ proto array|false file(string filename [, int flags[, resource context]]) - Read entire file into an array */ +/* {{{ Read entire file into an array */ PHP_FUNCTION(file) { char *filename; @@ -811,8 +805,7 @@ parse_eol: } /* }}} */ -/* {{{ proto string|false tempnam(string dir, string prefix) - Create a unique filename in a directory */ +/* {{{ Create a unique filename in a directory */ PHP_FUNCTION(tempnam) { char *dir, *prefix; @@ -845,8 +838,7 @@ PHP_FUNCTION(tempnam) } /* }}} */ -/* {{{ proto resource tmpfile(void) - Create a temporary file that will be deleted automatically after use */ +/* {{{ Create a temporary file that will be deleted automatically after use */ PHP_FUNCTION(tmpfile) { php_stream *stream; @@ -863,8 +855,7 @@ PHP_FUNCTION(tmpfile) } /* }}} */ -/* {{{ proto resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - Open a file or a URL and return a file pointer */ +/* {{{ Open a file or a URL and return a file pointer */ PHP_FUNCTION(fopen) { char *filename, *mode; @@ -894,8 +885,7 @@ PHP_FUNCTION(fopen) } /* }}} */ -/* {{{ proto bool fclose(resource fp) - Close an open file pointer */ +/* {{{ Close an open file pointer */ PHPAPI PHP_FUNCTION(fclose) { zval *res; @@ -920,8 +910,7 @@ PHPAPI PHP_FUNCTION(fclose) } /* }}} */ -/* {{{ proto resource|false popen(string command, string mode) - Execute a command and open either a read or a write pipe to it */ +/* {{{ Execute a command and open either a read or a write pipe to it */ PHP_FUNCTION(popen) { char *command, *mode; @@ -965,8 +954,7 @@ PHP_FUNCTION(popen) } /* }}} */ -/* {{{ proto int pclose(resource fp) - Close a file pointer opened by popen() */ +/* {{{ Close a file pointer opened by popen() */ PHP_FUNCTION(pclose) { zval *res; @@ -985,8 +973,7 @@ PHP_FUNCTION(pclose) } /* }}} */ -/* {{{ proto bool feof(resource fp) - Test for end-of-file on a file pointer */ +/* {{{ Test for end-of-file on a file pointer */ PHPAPI PHP_FUNCTION(feof) { zval *res; @@ -1006,8 +993,7 @@ PHPAPI PHP_FUNCTION(feof) } /* }}} */ -/* {{{ proto string fgets(resource fp[, int length]) - Get a line from file pointer */ +/* {{{ Get a line from file pointer */ PHPAPI PHP_FUNCTION(fgets) { zval *res; @@ -1058,8 +1044,7 @@ PHPAPI PHP_FUNCTION(fgets) } /* }}} */ -/* {{{ proto string fgetc(resource fp) - Get a character from file pointer */ +/* {{{ Get a character from file pointer */ PHPAPI PHP_FUNCTION(fgetc) { zval *res; @@ -1086,8 +1071,7 @@ PHPAPI PHP_FUNCTION(fgetc) } /* }}} */ -/* {{{ proto mixed fscanf(resource stream, string format [, string ...]) - Implements a mostly ANSI compatible fscanf() */ +/* {{{ Implements a mostly ANSI compatible fscanf() */ PHP_FUNCTION(fscanf) { int result, argc = 0; @@ -1128,8 +1112,7 @@ PHP_FUNCTION(fscanf) } /* }}} */ -/* {{{ proto int|false fwrite(resource fp, string str [, int length]) - Binary-safe file write */ +/* {{{ Binary-safe file write */ PHPAPI PHP_FUNCTION(fwrite) { zval *res; @@ -1170,8 +1153,7 @@ PHPAPI PHP_FUNCTION(fwrite) } /* }}} */ -/* {{{ proto bool fflush(resource fp) - Flushes output */ +/* {{{ Flushes output */ PHPAPI PHP_FUNCTION(fflush) { zval *res; @@ -1192,8 +1174,7 @@ PHPAPI PHP_FUNCTION(fflush) } /* }}} */ -/* {{{ proto bool rewind(resource fp) - Rewind the position of a file pointer */ +/* {{{ Rewind the position of a file pointer */ PHPAPI PHP_FUNCTION(rewind) { zval *res; @@ -1212,8 +1193,7 @@ PHPAPI PHP_FUNCTION(rewind) } /* }}} */ -/* {{{ proto int ftell(resource fp) - Get file pointer's read/write position */ +/* {{{ Get file pointer's read/write position */ PHPAPI PHP_FUNCTION(ftell) { zval *res; @@ -1234,8 +1214,7 @@ PHPAPI PHP_FUNCTION(ftell) } /* }}} */ -/* {{{ proto int fseek(resource fp, int offset [, int whence]) - Seek on a file pointer */ +/* {{{ Seek on a file pointer */ PHPAPI PHP_FUNCTION(fseek) { zval *res; @@ -1255,8 +1234,7 @@ PHPAPI PHP_FUNCTION(fseek) } /* }}} */ -/* {{{ php_mkdir -*/ +/* {{{ php_mkdir */ /* DEPRECATED APIs: Use php_stream_mkdir() instead */ PHPAPI int php_mkdir_ex(const char *dir, zend_long mode, int options) @@ -1280,8 +1258,7 @@ PHPAPI int php_mkdir(const char *dir, zend_long mode) } /* }}} */ -/* {{{ proto bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - Create a directory */ +/* {{{ Create a directory */ PHP_FUNCTION(mkdir) { char *dir; @@ -1305,8 +1282,7 @@ PHP_FUNCTION(mkdir) } /* }}} */ -/* {{{ proto bool rmdir(string dirname[, resource context]) - Remove a directory */ +/* {{{ Remove a directory */ PHP_FUNCTION(rmdir) { char *dir; @@ -1326,8 +1302,7 @@ PHP_FUNCTION(rmdir) } /* }}} */ -/* {{{ proto int readfile(string filename [, bool use_include_path[, resource context]]) - Output a file or a URL */ +/* {{{ Output a file or a URL */ PHP_FUNCTION(readfile) { char *filename; @@ -1358,8 +1333,7 @@ PHP_FUNCTION(readfile) } /* }}} */ -/* {{{ proto int umask([int mask]) - Return or change the umask */ +/* {{{ Return or change the umask */ PHP_FUNCTION(umask) { zend_long mask = 0; @@ -1386,8 +1360,7 @@ PHP_FUNCTION(umask) } /* }}} */ -/* {{{ proto int fpassthru(resource fp) - Output all remaining data from a file pointer */ +/* {{{ Output all remaining data from a file pointer */ PHPAPI PHP_FUNCTION(fpassthru) { zval *res; @@ -1405,8 +1378,7 @@ PHPAPI PHP_FUNCTION(fpassthru) } /* }}} */ -/* {{{ proto bool rename(string old_name, string new_name[, resource context]) - Rename a file */ +/* {{{ Rename a file */ PHP_FUNCTION(rename) { char *old_name, *new_name; @@ -1445,8 +1417,7 @@ PHP_FUNCTION(rename) } /* }}} */ -/* {{{ proto bool unlink(string filename[, context context]) - Delete a file */ +/* {{{ Delete a file */ PHP_FUNCTION(unlink) { char *filename; @@ -1478,8 +1449,7 @@ PHP_FUNCTION(unlink) } /* }}} */ -/* {{{ proto bool ftruncate(resource fp, int size) - Truncate file to 'size' length */ +/* {{{ Truncate file to 'size' length */ PHP_FUNCTION(ftruncate) { zval *fp; @@ -1507,8 +1477,7 @@ PHP_FUNCTION(ftruncate) } /* }}} */ -/* {{{ proto array fstat(resource fp) - Stat() on a filehandle */ +/* {{{ Stat() on a filehandle */ PHP_FUNCTION(fstat) { zval *fp; @@ -1590,8 +1559,7 @@ PHP_FUNCTION(fstat) } /* }}} */ -/* {{{ proto bool copy(string source_file, string destination_file [, resource context]) - Copy a file */ +/* {{{ Copy a file */ PHP_FUNCTION(copy) { char *source, *target; @@ -1620,24 +1588,21 @@ PHP_FUNCTION(copy) } /* }}} */ -/* {{{ php_copy_file - */ +/* {{{ php_copy_file */ PHPAPI int php_copy_file(const char *src, const char *dest) { return php_copy_file_ctx(src, dest, 0, NULL); } /* }}} */ -/* {{{ php_copy_file_ex - */ +/* {{{ php_copy_file_ex */ PHPAPI int php_copy_file_ex(const char *src, const char *dest, int src_flg) { return php_copy_file_ctx(src, dest, src_flg, NULL); } /* }}} */ -/* {{{ php_copy_file_ctx - */ +/* {{{ php_copy_file_ctx */ PHPAPI int php_copy_file_ctx(const char *src, const char *dest, int src_flg, php_stream_context *ctx) { php_stream *srcstream = NULL, *deststream = NULL; @@ -1730,8 +1695,7 @@ safe_to_copy: } /* }}} */ -/* {{{ proto string|false fread(resource fp, int length) - Binary-safe file read */ +/* {{{ Binary-safe file read */ PHPAPI PHP_FUNCTION(fread) { zval *res; @@ -1801,8 +1765,7 @@ quit_loop: #define FPUTCSV_FLD_CHK(c) memchr(ZSTR_VAL(field_str), c, ZSTR_LEN(field_str)) -/* {{{ proto int fputcsv(resource fp, array fields [, string delimiter [, string enclosure [, string escape_char]]]) - Format line as CSV and write to file pointer */ +/* {{{ Format line as CSV and write to file pointer */ PHP_FUNCTION(fputcsv) { char delimiter = ','; /* allow this to be set as parameter */ @@ -1930,8 +1893,7 @@ PHPAPI ssize_t php_fputcsv(php_stream *stream, zval *fields, char delimiter, cha } /* }}} */ -/* {{{ proto array|false fgetcsv(resource fp [,int length [, string delimiter [, string enclosure [, string escape]]]]) - Get line from file pointer and parse for CSV fields */ +/* {{{ Get line from file pointer and parse for CSV fields */ PHP_FUNCTION(fgetcsv) { char delimiter = ','; /* allow this to be set as parameter */ @@ -2290,8 +2252,7 @@ out: } /* }}} */ -/* {{{ proto string|false realpath(string path) - Return the resolved path */ +/* {{{ Return the resolved path */ PHP_FUNCTION(realpath) { char *filename; @@ -2427,8 +2388,7 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *md) /* }}} */ #ifdef HAVE_FNMATCH -/* {{{ proto bool fnmatch(string pattern, string filename [, int flags]) - Match filename against pattern */ +/* {{{ Match filename against pattern */ PHP_FUNCTION(fnmatch) { char *pattern, *filename; @@ -2456,8 +2416,7 @@ PHP_FUNCTION(fnmatch) /* }}} */ #endif -/* {{{ proto string sys_get_temp_dir() - Returns directory path used for temporary files */ +/* {{{ Returns directory path used for temporary files */ PHP_FUNCTION(sys_get_temp_dir) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index c4b4717c0e..d7b690689b 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -176,8 +176,7 @@ static int php_disk_total_space(char *path, double *space) /* {{{ */ /* }}} */ /* }}} */ -/* {{{ proto float|false disk_total_space(string path) - Get total disk space for filesystem that path is on */ +/* {{{ Get total disk space for filesystem that path is on */ PHP_FUNCTION(disk_total_space) { double bytestotal; @@ -270,8 +269,7 @@ static int php_disk_free_space(char *path, double *space) /* {{{ */ /* }}} */ /* }}} */ -/* {{{ proto float|false disk_free_space(string path) - Get free disk space for filesystem that path is on */ +/* {{{ Get free disk space for filesystem that path is on */ PHP_FUNCTION(disk_free_space) { double bytesfree; @@ -407,16 +405,14 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ } /* }}} */ -/* {{{ proto bool chgrp(string filename, mixed group) - Change file group */ +/* {{{ Change file group */ PHP_FUNCTION(chgrp) { php_do_chgrp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool lchgrp(string filename, mixed group) - Change symlink group */ +/* {{{ Change symlink group */ #if HAVE_LCHOWN PHP_FUNCTION(lchgrp) { @@ -545,16 +541,14 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */ /* }}} */ -/* {{{ proto bool chown(string filename, mixed user) - Change file owner */ +/* {{{ Change file owner */ PHP_FUNCTION(chown) { php_do_chown(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool chown(string filename, mixed user) - Change file owner */ +/* {{{ Change file owner */ #if HAVE_LCHOWN PHP_FUNCTION(lchown) { @@ -568,8 +562,7 @@ PHP_FUNCTION(lchown) #endif /* }}} */ -/* {{{ proto bool chmod(string filename, int mode) - Change file mode */ +/* {{{ Change file mode */ PHP_FUNCTION(chmod) { char *filename; @@ -615,8 +608,7 @@ PHP_FUNCTION(chmod) /* }}} */ #if HAVE_UTIME -/* {{{ proto bool touch(string filename [, int time [, int atime]]) - Set modification time of file */ +/* {{{ Set modification time of file */ PHP_FUNCTION(touch) { char *filename; @@ -704,8 +696,7 @@ PHP_FUNCTION(touch) /* }}} */ #endif -/* {{{ php_clear_stat_cache() -*/ +/* {{{ php_clear_stat_cache() */ PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char *filename, size_t filename_len) { /* always clear CurrentStatFile and CurrentLStatFile even if filename is not NULL @@ -729,8 +720,7 @@ PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char *fil } /* }}} */ -/* {{{ proto void clearstatcache([bool clear_realpath_cache[, string filename]]) - Clear file stat cache */ +/* {{{ Clear file stat cache */ PHP_FUNCTION(clearstatcache) { zend_bool clear_realpath_cache = 0; @@ -752,8 +742,7 @@ PHP_FUNCTION(clearstatcache) #define IS_ABLE_CHECK(__t) ((__t) == FS_IS_R || (__t) == FS_IS_W || (__t) == FS_IS_X) #define IS_ACCESS_CHECK(__t) (IS_ABLE_CHECK(type) || (__t) == FS_EXISTS) -/* {{{ php_stat - */ +/* {{{ php_stat */ PHPAPI void php_stat(const char *filename, size_t filename_length, int type, zval *return_value) { zend_stat_t *stat_sb; @@ -978,98 +967,79 @@ ZEND_NAMED_FUNCTION(name) { \ } /* }}} */ -/* {{{ proto int fileperms(string filename) - Get file permissions */ +/* {{{ Get file permissions */ FileFunction(PHP_FN(fileperms), FS_PERMS) /* }}} */ -/* {{{ proto int fileinode(string filename) - Get file inode */ +/* {{{ Get file inode */ FileFunction(PHP_FN(fileinode), FS_INODE) /* }}} */ -/* {{{ proto int filesize(string filename) - Get file size */ +/* {{{ Get file size */ FileFunction(PHP_FN(filesize), FS_SIZE) /* }}} */ -/* {{{ proto int fileowner(string filename) - Get file owner */ +/* {{{ Get file owner */ FileFunction(PHP_FN(fileowner), FS_OWNER) /* }}} */ -/* {{{ proto int filegroup(string filename) - Get file group */ +/* {{{ Get file group */ FileFunction(PHP_FN(filegroup), FS_GROUP) /* }}} */ -/* {{{ proto int fileatime(string filename) - Get last access time of file */ +/* {{{ Get last access time of file */ FileFunction(PHP_FN(fileatime), FS_ATIME) /* }}} */ -/* {{{ proto int filemtime(string filename) - Get last modification time of file */ +/* {{{ Get last modification time of file */ FileFunction(PHP_FN(filemtime), FS_MTIME) /* }}} */ -/* {{{ proto int filectime(string filename) - Get inode modification time of file */ +/* {{{ Get inode modification time of file */ FileFunction(PHP_FN(filectime), FS_CTIME) /* }}} */ -/* {{{ proto string filetype(string filename) - Get file type */ +/* {{{ Get file type */ FileFunction(PHP_FN(filetype), FS_TYPE) /* }}} */ -/* {{{ proto bool is_writable(string filename) - Returns true if file can be written */ +/* {{{ Returns true if file can be written */ FileFunction(PHP_FN(is_writable), FS_IS_W) /* }}} */ -/* {{{ proto bool is_readable(string filename) - Returns true if file can be read */ +/* {{{ Returns true if file can be read */ FileFunction(PHP_FN(is_readable), FS_IS_R) /* }}} */ -/* {{{ proto bool is_executable(string filename) - Returns true if file is executable */ +/* {{{ Returns true if file is executable */ FileFunction(PHP_FN(is_executable), FS_IS_X) /* }}} */ -/* {{{ proto bool is_file(string filename) - Returns true if file is a regular file */ +/* {{{ Returns true if file is a regular file */ FileFunction(PHP_FN(is_file), FS_IS_FILE) /* }}} */ -/* {{{ proto bool is_dir(string filename) - Returns true if file is directory */ +/* {{{ Returns true if file is directory */ FileFunction(PHP_FN(is_dir), FS_IS_DIR) /* }}} */ -/* {{{ proto bool is_link(string filename) - Returns true if file is symbolic link */ +/* {{{ Returns true if file is symbolic link */ FileFunction(PHP_FN(is_link), FS_IS_LINK) /* }}} */ -/* {{{ proto bool file_exists(string filename) - Returns true if filename exists */ +/* {{{ Returns true if filename exists */ FileFunction(PHP_FN(file_exists), FS_EXISTS) /* }}} */ -/* {{{ proto array lstat(string filename) - Give information about a file or symbolic link */ +/* {{{ Give information about a file or symbolic link */ FileFunction(PHP_FN(lstat), FS_LSTAT) /* }}} */ -/* {{{ proto array stat(string filename) - Give information about a file */ +/* {{{ Give information about a file */ FileFunction(PHP_FN(stat), FS_STAT) /* }}} */ -/* {{{ proto bool realpath_cache_size() - Get current size of realpath cache */ +/* {{{ Get current size of realpath cache */ PHP_FUNCTION(realpath_cache_size) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1077,8 +1047,7 @@ PHP_FUNCTION(realpath_cache_size) RETURN_LONG(realpath_cache_size()); } -/* {{{ proto bool realpath_cache_get() - Get current size of realpath cache */ +/* {{{ Get current size of realpath cache */ PHP_FUNCTION(realpath_cache_get) { realpath_cache_bucket **buckets = realpath_cache_get_buckets(), **end = buckets + realpath_cache_max_buckets(); diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index b39cc32860..d6a79e3699 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -754,8 +754,7 @@ static zval *php_formatted_print_get_array(zend_array *array, int *argc) } /* }}} */ -/* {{{ proto string sprintf(string format [, mixed arg1 [, mixed ...]]) - Return a formatted string */ +/* {{{ Return a formatted string */ PHP_FUNCTION(sprintf) { zend_string *result; @@ -777,8 +776,7 @@ PHP_FUNCTION(sprintf) } /* }}} */ -/* {{{ proto string vsprintf(string format, array args) - Return a formatted string */ +/* {{{ Return a formatted string */ PHP_FUNCTION(vsprintf) { zend_string *result; @@ -804,8 +802,7 @@ PHP_FUNCTION(vsprintf) } /* }}} */ -/* {{{ proto int printf(string format [, mixed arg1 [, mixed ...]]) - Output a formatted string */ +/* {{{ Output a formatted string */ PHP_FUNCTION(printf) { zend_string *result; @@ -830,8 +827,7 @@ PHP_FUNCTION(printf) } /* }}} */ -/* {{{ proto int vprintf(string format, array args) - Output a formatted string */ +/* {{{ Output a formatted string */ PHP_FUNCTION(vprintf) { zend_string *result; @@ -860,8 +856,7 @@ PHP_FUNCTION(vprintf) } /* }}} */ -/* {{{ proto int fprintf(resource stream, string format [, mixed arg1 [, mixed ...]]) - Output a formatted string into a stream */ +/* {{{ Output a formatted string into a stream */ PHP_FUNCTION(fprintf) { php_stream *stream; @@ -895,8 +890,7 @@ PHP_FUNCTION(fprintf) } /* }}} */ -/* {{{ proto int vfprintf(resource stream, string format, array args) - Output a formatted string into a stream */ +/* {{{ Output a formatted string into a stream */ PHP_FUNCTION(vfprintf) { php_stream *stream; diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index c0803fbbbb..6023234cd3 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -122,16 +122,14 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* }}} */ -/* {{{ proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - Open Internet or Unix domain socket connection */ +/* {{{ Open Internet or Unix domain socket connection */ PHP_FUNCTION(fsockopen) { php_fsockopen_stream(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource pfsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - Open persistent Internet or Unix domain socket connection */ +/* {{{ Open persistent Internet or Unix domain socket connection */ PHP_FUNCTION(pfsockopen) { php_fsockopen_stream(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c index 0e1210acc9..616890d283 100644 --- a/ext/standard/ftok.c +++ b/ext/standard/ftok.c @@ -27,8 +27,7 @@ #endif #if HAVE_FTOK -/* {{{ proto int ftok(string pathname, string proj) - Convert a pathname and a project identifier to a System V IPC key */ +/* {{{ Convert a pathname and a project identifier to a System V IPC key */ PHP_FUNCTION(ftok) { char *pathname, *proj; diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 7cc19a85b2..4dd38c4cba 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -73,8 +73,7 @@ typedef struct _php_ftp_dirstream_data { php_stream *dirstream; } php_ftp_dirstream_data; -/* {{{ get_ftp_result - */ +/* {{{ get_ftp_result */ static inline int get_ftp_result(php_stream *stream, char *buffer, size_t buffer_size) { buffer[0] = '\0'; /* in case read fails to read anything */ @@ -85,8 +84,7 @@ static inline int get_ftp_result(php_stream *stream, char *buffer, size_t buffer } /* }}} */ -/* {{{ php_stream_ftp_stream_stat - */ +/* {{{ php_stream_ftp_stream_stat */ static int php_stream_ftp_stream_stat(php_stream_wrapper *wrapper, php_stream *stream, php_stream_statbuf *ssb) { /* For now, we return with a failure code to prevent the underlying @@ -95,8 +93,7 @@ static int php_stream_ftp_stream_stat(php_stream_wrapper *wrapper, php_stream *s } /* }}} */ -/* {{{ php_stream_ftp_stream_close - */ +/* {{{ php_stream_ftp_stream_close */ static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream *stream) { php_stream *controlstream = stream->wrapperthis; @@ -124,8 +121,7 @@ static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream * } /* }}} */ -/* {{{ php_ftp_fopen_connect - */ +/* {{{ php_ftp_fopen_connect */ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context, php_stream **preuseid, php_url **presource, int *puse_ssl, int *puse_ssl_on_data) @@ -315,8 +311,7 @@ connect_errexit: } /* }}} */ -/* {{{ php_fopen_do_pasv - */ +/* {{{ php_fopen_do_pasv */ static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t ip_size, char **phoststart) { char tmp_line[512]; @@ -406,8 +401,7 @@ static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t ip_ } /* }}} */ -/* {{{ php_fopen_url_wrap_ftp - */ +/* {{{ php_fopen_url_wrap_ftp */ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC) { @@ -609,8 +603,7 @@ errexit: } /* }}} */ -/* {{{ php_ftp_dirsteam_read - */ +/* {{{ php_ftp_dirsteam_read */ static ssize_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t count) { php_stream_dirent *ent = (php_stream_dirent *)buf; @@ -650,8 +643,7 @@ static ssize_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t coun } /* }}} */ -/* {{{ php_ftp_dirstream_close - */ +/* {{{ php_ftp_dirstream_close */ static int php_ftp_dirstream_close(php_stream *stream, int close_handle) { php_ftp_dirstream_data *data = stream->abstract; @@ -686,8 +678,7 @@ static const php_stream_ops php_ftp_dirstream_ops = { NULL /* set option */ }; -/* {{{ php_stream_ftp_opendir - */ +/* {{{ php_stream_ftp_opendir */ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC) { @@ -779,8 +770,7 @@ opendir_errexit: } /* }}} */ -/* {{{ php_stream_ftp_url_stat - */ +/* {{{ php_stream_ftp_url_stat */ static int php_stream_ftp_url_stat(php_stream_wrapper *wrapper, const char *url, int flags, php_stream_statbuf *ssb, php_stream_context *context) { php_stream *stream = NULL; @@ -902,8 +892,7 @@ stat_errexit: } /* }}} */ -/* {{{ php_stream_ftp_unlink - */ +/* {{{ php_stream_ftp_unlink */ static int php_stream_ftp_unlink(php_stream_wrapper *wrapper, const char *url, int options, php_stream_context *context) { php_stream *stream = NULL; @@ -952,8 +941,7 @@ unlink_errexit: } /* }}} */ -/* {{{ php_stream_ftp_rename - */ +/* {{{ php_stream_ftp_rename */ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_from, const char *url_to, int options, php_stream_context *context) { php_stream *stream = NULL; @@ -1031,8 +1019,7 @@ rename_errexit: } /* }}} */ -/* {{{ php_stream_ftp_mkdir - */ +/* {{{ php_stream_ftp_mkdir */ static int php_stream_ftp_mkdir(php_stream_wrapper *wrapper, const char *url, int mode, int options, php_stream_context *context) { php_stream *stream = NULL; @@ -1124,8 +1111,7 @@ mkdir_errexit: } /* }}} */ -/* {{{ php_stream_ftp_rmdir - */ +/* {{{ php_stream_ftp_rmdir */ static int php_stream_ftp_rmdir(php_stream_wrapper *wrapper, const char *url, int options, php_stream_context *context) { php_stream *stream = NULL; diff --git a/ext/standard/head.c b/ext/standard/head.c index 06496f04aa..ceca0cbbef 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -28,8 +28,7 @@ /* Implementation of the language Header() function */ -/* {{{ proto void header(string header [, bool replace, [int http_response_code]]) - Sends a raw HTTP header */ +/* {{{ Sends a raw HTTP header */ PHP_FUNCTION(header) { zend_bool rep = 1; @@ -50,8 +49,7 @@ PHP_FUNCTION(header) } /* }}} */ -/* {{{ proto void header_remove([string name]) - Removes an HTTP header previously set using header() */ +/* {{{ Removes an HTTP header previously set using header() */ PHP_FUNCTION(header_remove) { sapi_header_line ctr = {0}; @@ -227,8 +225,7 @@ static void php_head_parse_cookie_options_array(zval *options, zend_long *expire } } -/* {{{ proto bool setcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly]]]]]]) - setcookie(string name [, string value [, array options]]) +/* {{{ setcookie(string name [, string value [, array options]]) Send a cookie */ PHP_FUNCTION(setcookie) { @@ -282,8 +279,7 @@ PHP_FUNCTION(setcookie) } /* }}} */ -/* {{{ proto bool setrawcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly]]]]]]) - setrawcookie(string name [, string value [, array options]]) +/* {{{ setrawcookie(string name [, string value [, array options]]) Send a cookie with no url encoding of the value */ PHP_FUNCTION(setrawcookie) { @@ -338,8 +334,7 @@ PHP_FUNCTION(setrawcookie) /* }}} */ -/* {{{ proto bool headers_sent([string &$file [, int &$line]]) - Returns true if headers have already been sent, false otherwise */ +/* {{{ Returns true if headers have already been sent, false otherwise */ PHP_FUNCTION(headers_sent) { zval *arg1 = NULL, *arg2 = NULL; @@ -388,8 +383,7 @@ static void php_head_apply_header_list_to_hash(void *data, void *arg) } } -/* {{{ proto array headers_list(void) - Return list of headers to be sent / already sent */ +/* {{{ Return list of headers to be sent / already sent */ PHP_FUNCTION(headers_list) { ZEND_PARSE_PARAMETERS_NONE(); @@ -399,8 +393,7 @@ PHP_FUNCTION(headers_list) } /* }}} */ -/* {{{ proto int http_response_code([int response_code]) - Sets a response code, or returns the current HTTP response code */ +/* {{{ Sets a response code, or returns the current HTTP response code */ PHP_FUNCTION(http_response_code) { zend_long response_code = 0; diff --git a/ext/standard/hrtime.c b/ext/standard/hrtime.c index 088bf6d9d8..29a1132209 100644 --- a/ext/standard/hrtime.c +++ b/ext/standard/hrtime.c @@ -155,8 +155,7 @@ static zend_always_inline php_hrtime_t _timer_current(void) } while (0) #endif -/* {{{ proto mixed hrtime([bool get_as_number = false]) - Returns an array of integers in form [seconds, nanoseconds] counted +/* {{{ Returns an array of integers in form [seconds, nanoseconds] counted from an arbitrary point in time. If an optional boolean argument is passed, returns an integer on 64-bit platforms or float on 32-bit containing the current high-resolution time in nanoseconds. The diff --git a/ext/standard/html.c b/ext/standard/html.c index 8e5b65d80c..58c2989c85 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -78,8 +78,7 @@ #define sjis_lead(c) ((c) != 0x80 && (c) != 0xA0 && (c) < 0xFD) #define sjis_trail(c) ((c) >= 0x40 && (c) != 0x7F && (c) < 0xFD) -/* {{{ get_default_charset - */ +/* {{{ get_default_charset */ static char *get_default_charset(void) { if (PG(internal_encoding) && PG(internal_encoding)[0]) { return PG(internal_encoding); @@ -90,8 +89,7 @@ static char *get_default_charset(void) { } /* }}} */ -/* {{{ get_next_char - */ +/* {{{ get_next_char */ static inline unsigned int get_next_char( enum entity_charset charset, const unsigned char *str, @@ -1101,8 +1099,7 @@ static inline void find_entity_for_char_basic( } /* }}} */ -/* {{{ php_escape_html_entities - */ +/* {{{ php_escape_html_entities */ PHPAPI zend_string *php_escape_html_entities_ex(const unsigned char *old, size_t oldlen, int all, int flags, const char *hint_charset, zend_bool double_encode, zend_bool quiet) { size_t cursor, maxlen, len; @@ -1315,8 +1312,7 @@ encode_amp: } /* }}} */ -/* {{{ php_html_entities - */ +/* {{{ php_html_entities */ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all) { zend_string *str, *hint_charset = NULL; @@ -1342,8 +1338,7 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all) #define HTML_SPECIALCHARS 0 #define HTML_ENTITIES 1 -/* {{{ register_html_constants - */ +/* {{{ register_html_constants */ void register_html_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS); @@ -1361,16 +1356,14 @@ void register_html_constants(INIT_FUNC_ARGS) } /* }}} */ -/* {{{ proto string htmlspecialchars(string string [, int quote_style[, string encoding[, bool double_encode]]]) - Convert special characters to HTML entities */ +/* {{{ Convert special characters to HTML entities */ PHP_FUNCTION(htmlspecialchars) { php_html_entities(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string htmlspecialchars_decode(string string [, int quote_style]) - Convert special HTML entities back to characters */ +/* {{{ Convert special HTML entities back to characters */ PHP_FUNCTION(htmlspecialchars_decode) { zend_string *str; @@ -1391,8 +1384,7 @@ PHP_FUNCTION(htmlspecialchars_decode) } /* }}} */ -/* {{{ proto string html_entity_decode(string string [, int quote_style][, string encoding]) - Convert all HTML entities to their applicable characters */ +/* {{{ Convert all HTML entities to their applicable characters */ PHP_FUNCTION(html_entity_decode) { zend_string *str, *hint_charset = NULL; @@ -1417,8 +1409,7 @@ PHP_FUNCTION(html_entity_decode) /* }}} */ -/* {{{ proto string htmlentities(string string [, int quote_style[, string encoding[, bool double_encode]]]) - Convert all applicable characters to HTML entities */ +/* {{{ Convert all applicable characters to HTML entities */ PHP_FUNCTION(htmlentities) { php_html_entities(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -1480,8 +1471,7 @@ static inline void write_s3row_data( } /* }}} */ -/* {{{ proto array get_html_translation_table([int table [, int flags [, string encoding]]]) - Returns the internal translation table used by htmlspecialchars and htmlentities */ +/* {{{ Returns the internal translation table used by htmlspecialchars and htmlentities */ PHP_FUNCTION(get_html_translation_table) { zend_long all = HTML_SPECIALCHARS, diff --git a/ext/standard/http.c b/ext/standard/http.c index 386a0df1eb..0536ea0aa4 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -228,8 +228,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, } /* }}} */ -/* {{{ proto string|false http_build_query(mixed formdata [, string prefix [, string arg_separator [, int enc_type]]]) - Generates a form-encoded query string from an associative array or object. */ +/* {{{ Generates a form-encoded query string from an associative array or object. */ PHP_FUNCTION(http_build_query) { zval *formdata; diff --git a/ext/standard/image.c b/ext/standard/image.c index 147a146e5c..73e1776a3a 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -117,8 +117,7 @@ static struct gfxinfo *php_handle_gif (php_stream * stream) } /* }}} */ -/* {{{ php_handle_psd - */ +/* {{{ php_handle_psd */ static struct gfxinfo *php_handle_psd (php_stream * stream) { struct gfxinfo *result = NULL; @@ -138,8 +137,7 @@ static struct gfxinfo *php_handle_psd (php_stream * stream) } /* }}} */ -/* {{{ php_handle_bmp - */ +/* {{{ php_handle_bmp */ static struct gfxinfo *php_handle_bmp (php_stream * stream) { struct gfxinfo *result = NULL; @@ -189,8 +187,7 @@ static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int p /* }}} */ #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) -/* {{{ php_handle_swc - */ +/* {{{ php_handle_swc */ static struct gfxinfo *php_handle_swc(php_stream * stream) { struct gfxinfo *result = NULL; @@ -271,8 +268,7 @@ static struct gfxinfo *php_handle_swc(php_stream * stream) /* }}} */ #endif -/* {{{ php_handle_swf - */ +/* {{{ php_handle_swf */ static struct gfxinfo *php_handle_swf (php_stream * stream) { struct gfxinfo *result = NULL; @@ -365,8 +361,7 @@ static struct gfxinfo *php_handle_png (php_stream * stream) #define M_PSEUDO 0xFFD8 /* pseudo marker for start of image(byte 0) */ -/* {{{ php_read2 - */ +/* {{{ php_read2 */ static unsigned short php_read2(php_stream * stream) { unsigned char a[2]; @@ -429,8 +424,7 @@ static int php_skip_variable(php_stream * stream) } /* }}} */ -/* {{{ php_read_APP - */ +/* {{{ php_read_APP */ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info) { size_t length; @@ -552,8 +546,7 @@ static struct gfxinfo *php_handle_jpeg (php_stream * stream, zval *info) } /* }}} */ -/* {{{ php_read4 - */ +/* {{{ php_read4 */ static unsigned int php_read4(php_stream * stream) { unsigned char a[4]; @@ -723,8 +716,7 @@ static struct gfxinfo *php_handle_jp2(php_stream *stream) } /* }}} */ -/* {{{ tiff constants - */ +/* {{{ tiff constants */ PHPAPI const int php_tiff_bytes_per_format[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8}; /* uncompressed only */ @@ -871,8 +863,7 @@ static struct gfxinfo *php_handle_tiff (php_stream * stream, zval *info, int mot } /* }}} */ -/* {{{ php_handle_psd - */ +/* {{{ php_handle_psd */ static struct gfxinfo *php_handle_iff(php_stream * stream) { struct gfxinfo * result; @@ -994,8 +985,7 @@ static int php_get_wbmp(php_stream *stream, struct gfxinfo **result, int check) } /* }}} */ -/* {{{ php_handle_wbmp -*/ +/* {{{ php_handle_wbmp */ static struct gfxinfo *php_handle_wbmp(php_stream * stream) { struct gfxinfo *result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo)); @@ -1009,8 +999,7 @@ static struct gfxinfo *php_handle_wbmp(php_stream * stream) } /* }}} */ -/* {{{ php_get_xbm - */ +/* {{{ php_get_xbm */ static int php_get_xbm(php_stream *stream, struct gfxinfo **result) { char *fline; @@ -1069,8 +1058,7 @@ static int php_get_xbm(php_stream *stream, struct gfxinfo **result) } /* }}} */ -/* {{{ php_handle_xbm - */ +/* {{{ php_handle_xbm */ static struct gfxinfo *php_handle_xbm(php_stream * stream) { struct gfxinfo *result; @@ -1079,8 +1067,7 @@ static struct gfxinfo *php_handle_xbm(php_stream * stream) } /* }}} */ -/* {{{ php_handle_ico - */ +/* {{{ php_handle_ico */ static struct gfxinfo *php_handle_ico(php_stream * stream) { struct gfxinfo *result = NULL; @@ -1115,8 +1102,7 @@ static struct gfxinfo *php_handle_ico(php_stream * stream) } /* }}} */ -/* {{{ php_handle_webp - */ +/* {{{ php_handle_webp */ static struct gfxinfo *php_handle_webp(php_stream * stream) { struct gfxinfo *result = NULL; @@ -1204,8 +1190,7 @@ PHPAPI char * php_image_type_to_mime_type(int image_type) } /* }}} */ -/* {{{ proto string image_type_to_mime_type(int imagetype) - Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ +/* {{{ Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ PHP_FUNCTION(image_type_to_mime_type) { zend_long p_image_type; @@ -1218,8 +1203,7 @@ PHP_FUNCTION(image_type_to_mime_type) } /* }}} */ -/* {{{ proto string|false image_type_to_extension(int imagetype [, bool include_dot]) - Get file extension for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ +/* {{{ Get file extension for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ PHP_FUNCTION(image_type_to_extension) { zend_long image_type; @@ -1513,16 +1497,14 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) { } /* }}} */ -/* {{{ proto array|false getimagesize(string imagefile [, array info]) - Get the size of an image as 4-element array */ +/* {{{ Get the size of an image as 4-element array */ PHP_FUNCTION(getimagesize) { php_getimagesize_from_any(INTERNAL_FUNCTION_PARAM_PASSTHRU, FROM_PATH); } /* }}} */ -/* {{{ proto array|false getimagesizefromstring(string data [, array info]) - Get the size of an image as 4-element array */ +/* {{{ Get the size of an image as 4-element array */ PHP_FUNCTION(getimagesizefromstring) { php_getimagesize_from_any(INTERNAL_FUNCTION_PARAM_PASSTHRU, FROM_DATA); diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index c024373e7d..34edaa0e23 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -28,8 +28,7 @@ static zend_object_handlers php_incomplete_object_handlers; -/* {{{ incomplete_class_message - */ +/* {{{ incomplete_class_message */ static void incomplete_class_message(zend_object *object, int error_type) { zend_string *class_name; @@ -92,8 +91,7 @@ static zend_function *incomplete_class_get_method(zend_object **object, zend_str } /* }}} */ -/* {{{ php_create_incomplete_class - */ +/* {{{ php_create_incomplete_class */ static zend_object *php_create_incomplete_object(zend_class_entry *class_type) { zend_object *object; @@ -129,8 +127,7 @@ PHPAPI zend_class_entry *php_create_incomplete_class(void) } /* }}} */ -/* {{{ php_lookup_class_name - */ +/* {{{ php_lookup_class_name */ PHPAPI zend_string *php_lookup_class_name(zend_object *object) { if (object->properties) { @@ -145,8 +142,7 @@ PHPAPI zend_string *php_lookup_class_name(zend_object *object) } /* }}} */ -/* {{{ php_store_class_name - */ +/* {{{ php_store_class_name */ PHPAPI void php_store_class_name(zval *object, const char *name, size_t len) { zval val; diff --git a/ext/standard/info.c b/ext/standard/info.c index f652efd236..99ba4a179f 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -162,8 +162,7 @@ PHPAPI ZEND_COLD void php_info_print_module(zend_module_entry *zend_module) /* { } /* }}} */ -/* {{{ php_print_gpcse_array - */ +/* {{{ php_print_gpcse_array */ static ZEND_COLD void php_print_gpcse_array(char *name, uint32_t name_length) { zval *data, *tmp; @@ -237,8 +236,7 @@ static ZEND_COLD void php_print_gpcse_array(char *name, uint32_t name_length) } /* }}} */ -/* {{{ php_info_print_style - */ +/* {{{ php_info_print_style */ PHPAPI ZEND_COLD void ZEND_COLD php_info_print_style(void) { php_info_printf("<style type=\"text/css\">\n"); @@ -247,8 +245,7 @@ PHPAPI ZEND_COLD void ZEND_COLD php_info_print_style(void) } /* }}} */ -/* {{{ php_info_html_esc - */ +/* {{{ php_info_html_esc */ PHPAPI ZEND_COLD zend_string *php_info_html_esc(const char *string) { return php_escape_html_entities((const unsigned char *) string, strlen(string), 0, ENT_QUOTES, NULL); @@ -635,8 +632,7 @@ void php_get_windows_cpu(char *buf, int bufsize) /* }}} */ #endif -/* {{{ php_get_uname - */ +/* {{{ php_get_uname */ PHPAPI zend_string *php_get_uname(char mode) { char *php_uname; @@ -728,8 +724,7 @@ PHPAPI zend_string *php_get_uname(char mode) } /* }}} */ -/* {{{ php_print_info_htmlhead - */ +/* {{{ php_print_info_htmlhead */ PHPAPI ZEND_COLD void php_print_info_htmlhead(void) { php_info_print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n"); @@ -751,8 +746,7 @@ static int module_name_cmp(Bucket *f, Bucket *s) } /* }}} */ -/* {{{ php_print_info - */ +/* {{{ php_print_info */ PHPAPI ZEND_COLD void php_print_info(int flag) { char **env, *tmp1, *tmp2; @@ -1114,8 +1108,7 @@ PHPAPI ZEND_COLD void php_info_print_table_colspan_header(int num_cols, const ch } /* }}} */ -/* {{{ php_info_print_table_header - */ +/* {{{ php_info_print_table_header */ PHPAPI ZEND_COLD void php_info_print_table_header(int num_cols, ...) { int i; @@ -1152,8 +1145,7 @@ PHPAPI ZEND_COLD void php_info_print_table_header(int num_cols, ...) } /* }}} */ -/* {{{ php_info_print_table_row_internal - */ +/* {{{ php_info_print_table_row_internal */ static ZEND_COLD void php_info_print_table_row_internal(int num_cols, const char *value_class, va_list row_elements) { @@ -1198,8 +1190,7 @@ static ZEND_COLD void php_info_print_table_row_internal(int num_cols, } /* }}} */ -/* {{{ php_info_print_table_row - */ +/* {{{ php_info_print_table_row */ PHPAPI ZEND_COLD void php_info_print_table_row(int num_cols, ...) { va_list row_elements; @@ -1210,8 +1201,7 @@ PHPAPI ZEND_COLD void php_info_print_table_row(int num_cols, ...) } /* }}} */ -/* {{{ php_info_print_table_row_ex - */ +/* {{{ php_info_print_table_row_ex */ PHPAPI ZEND_COLD void php_info_print_table_row_ex(int num_cols, const char *value_class, ...) { @@ -1223,8 +1213,7 @@ PHPAPI ZEND_COLD void php_info_print_table_row_ex(int num_cols, const char *valu } /* }}} */ -/* {{{ register_phpinfo_constants - */ +/* {{{ register_phpinfo_constants */ void register_phpinfo_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS); @@ -1246,8 +1235,7 @@ void register_phpinfo_constants(INIT_FUNC_ARGS) } /* }}} */ -/* {{{ proto bool phpinfo([int what]) - Output a page of useful information about PHP and the current request */ +/* {{{ Output a page of useful information about PHP and the current request */ PHP_FUNCTION(phpinfo) { zend_long flag = PHP_INFO_ALL; @@ -1267,8 +1255,7 @@ PHP_FUNCTION(phpinfo) /* }}} */ -/* {{{ proto string|false phpversion([string extension]) - Return the current PHP version */ +/* {{{ Return the current PHP version */ PHP_FUNCTION(phpversion) { char *ext_name = NULL; @@ -1292,8 +1279,7 @@ PHP_FUNCTION(phpversion) } /* }}} */ -/* {{{ proto bool phpcredits([int flag]) - Prints the list of people who've contributed to the PHP project */ +/* {{{ Prints the list of people who've contributed to the PHP project */ PHP_FUNCTION(phpcredits) { zend_long flag = PHP_CREDITS_ALL; @@ -1308,8 +1294,7 @@ PHP_FUNCTION(phpcredits) } /* }}} */ -/* {{{ proto string|false php_sapi_name(void) - Return the current SAPI module name */ +/* {{{ Return the current SAPI module name */ PHP_FUNCTION(php_sapi_name) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1323,8 +1308,7 @@ PHP_FUNCTION(php_sapi_name) /* }}} */ -/* {{{ proto string php_uname([ string $mode = "a"]) - Return information about the system PHP was built on */ +/* {{{ Return information about the system PHP was built on */ PHP_FUNCTION(php_uname) { char *mode = "a"; @@ -1340,8 +1324,7 @@ PHP_FUNCTION(php_uname) /* }}} */ -/* {{{ proto string|false php_ini_scanned_files(void) - Return comma-separated string of .ini files parsed from the additional ini dir */ +/* {{{ Return comma-separated string of .ini files parsed from the additional ini dir */ PHP_FUNCTION(php_ini_scanned_files) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1354,8 +1337,7 @@ PHP_FUNCTION(php_ini_scanned_files) } /* }}} */ -/* {{{ proto string|false php_ini_loaded_file(void) - Return the actual loaded ini filename */ +/* {{{ Return the actual loaded ini filename */ PHP_FUNCTION(php_ini_loaded_file) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index ea86795555..d7d7729db8 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -72,8 +72,7 @@ #define M_APP14 0xee #define M_APP15 0xef -/* {{{ php_iptc_put1 - */ +/* {{{ php_iptc_put1 */ static int php_iptc_put1(FILE *fp, int spool, unsigned char c, unsigned char **spoolbuf) { if (spool > 0) @@ -85,8 +84,7 @@ static int php_iptc_put1(FILE *fp, int spool, unsigned char c, unsigned char **s } /* }}} */ -/* {{{ php_iptc_get1 - */ +/* {{{ php_iptc_get1 */ static int php_iptc_get1(FILE *fp, int spool, unsigned char **spoolbuf) { int c; @@ -107,8 +105,7 @@ static int php_iptc_get1(FILE *fp, int spool, unsigned char **spoolbuf) } /* }}} */ -/* {{{ php_iptc_read_remaining - */ +/* {{{ php_iptc_read_remaining */ static int php_iptc_read_remaining(FILE *fp, int spool, unsigned char **spoolbuf) { while (php_iptc_get1(fp, spool, spoolbuf) != EOF) continue; @@ -117,8 +114,7 @@ static int php_iptc_read_remaining(FILE *fp, int spool, unsigned char **spoolbuf } /* }}} */ -/* {{{ php_iptc_skip_variable - */ +/* {{{ php_iptc_skip_variable */ static int php_iptc_skip_variable(FILE *fp, int spool, unsigned char **spoolbuf) { unsigned int length; @@ -139,8 +135,7 @@ static int php_iptc_skip_variable(FILE *fp, int spool, unsigned char **spoolbuf) } /* }}} */ -/* {{{ php_iptc_next_marker - */ +/* {{{ php_iptc_next_marker */ static int php_iptc_next_marker(FILE *fp, int spool, unsigned char **spoolbuf) { int c; @@ -172,8 +167,7 @@ static int php_iptc_next_marker(FILE *fp, int spool, unsigned char **spoolbuf) static char psheader[] = "\xFF\xED\0\0Photoshop 3.0\08BIM\x04\x04\0\0\0\0"; -/* {{{ proto string|false iptcembed(string iptcdata, string jpeg_file_name [, int spool]) - Embed binary IPTC data into a JPEG image. */ +/* {{{ Embed binary IPTC data into a JPEG image. */ PHP_FUNCTION(iptcembed) { char *iptcdata, *jpeg_file; @@ -303,8 +297,7 @@ PHP_FUNCTION(iptcembed) } /* }}} */ -/* {{{ proto array|false iptcparse(string iptcdata) - Parse binary IPTC-data into associative array */ +/* {{{ Parse binary IPTC-data into associative array */ PHP_FUNCTION(iptcparse) { size_t inx = 0, len; diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c index fc81bde4cc..dfb1ab1613 100644 --- a/ext/standard/lcg.c +++ b/ext/standard/lcg.c @@ -110,8 +110,7 @@ PHP_MINIT_FUNCTION(lcg) /* {{{ */ } /* }}} */ -/* {{{ proto float lcg_value() - Returns a value from the combined linear congruential generator */ +/* {{{ Returns a value from the combined linear congruential generator */ PHP_FUNCTION(lcg_value) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/standard/levenshtein.c b/ext/standard/levenshtein.c index 7135670e83..75f317fc61 100644 --- a/ext/standard/levenshtein.c +++ b/ext/standard/levenshtein.c @@ -74,8 +74,7 @@ static zend_long reference_levdist(const char *s1, size_t l1, const char *s2, si } /* }}} */ -/* {{{ custom_levdist - */ +/* {{{ custom_levdist */ static int custom_levdist(char *str1, char *str2, char *callback_name) { php_error_docref(NULL, E_WARNING, "The general Levenshtein support is not there yet"); @@ -85,8 +84,7 @@ static int custom_levdist(char *str1, char *str2, char *callback_name) } /* }}} */ -/* {{{ proto int levenshtein(string str1, string str2[, int cost_ins, int cost_rep, int cost_del]) - Calculate Levenshtein distance between two strings */ +/* {{{ Calculate Levenshtein distance between two strings */ PHP_FUNCTION(levenshtein) { int argc = ZEND_NUM_ARGS(); diff --git a/ext/standard/link.c b/ext/standard/link.c index c6ef97247a..002f9576eb 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -59,8 +59,7 @@ #define VOLUME_NAME_DOS 0x0 #endif -/* {{{ proto string|false readlink(string filename) - Return the target of a symbolic link */ +/* {{{ Return the target of a symbolic link */ PHP_FUNCTION(readlink) { char *link; @@ -93,8 +92,7 @@ PHP_FUNCTION(readlink) } /* }}} */ -/* {{{ proto int|false linkinfo(string filename) - Returns the st_dev field of the UNIX C stat structure describing the link */ +/* {{{ Returns the st_dev field of the UNIX C stat structure describing the link */ PHP_FUNCTION(linkinfo) { char *link; @@ -127,8 +125,7 @@ PHP_FUNCTION(linkinfo) } /* }}} */ -/* {{{ proto bool symlink(string target, string link) - Create a symbolic link */ +/* {{{ Create a symbolic link */ PHP_FUNCTION(symlink) { char *topath, *frompath; @@ -186,8 +183,7 @@ PHP_FUNCTION(symlink) } /* }}} */ -/* {{{ proto bool link(string target, string link) - Create a hard link */ +/* {{{ Create a hard link */ PHP_FUNCTION(link) { char *topath, *frompath; diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 7b8cb08236..149fc072b2 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -248,8 +248,7 @@ PHPAPI zend_string *php_mail_build_headers(HashTable *headers) } -/* {{{ proto bool mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - Send an email message */ +/* {{{ Send an email message */ PHP_FUNCTION(mail) { char *to=NULL, *message=NULL; @@ -423,8 +422,7 @@ static int php_mail_detect_multiple_crlf(const char *hdr) { } -/* {{{ php_mail - */ +/* {{{ php_mail */ PHPAPI int php_mail(const char *to, const char *subject, const char *message, const char *headers, const char *extra_cmd) { #ifdef PHP_WIN32 @@ -605,8 +603,7 @@ PHPAPI int php_mail(const char *to, const char *subject, const char *message, co } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(mail) { char *sendmail_path = INI_STR("sendmail_path"); diff --git a/ext/standard/math.c b/ext/standard/math.c index fe23a189c2..8dbe0f7653 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -204,8 +204,7 @@ PHPAPI double _php_math_round(double value, int places, int mode) { } /* }}} */ -/* {{{ proto int|float abs(int|float number) - Return the absolute value of the number */ +/* {{{ Return the absolute value of the number */ PHP_FUNCTION(abs) { zval *value; @@ -228,8 +227,7 @@ PHP_FUNCTION(abs) } /* }}} */ -/* {{{ proto float ceil(float number) - Returns the next highest integer value of the number */ +/* {{{ Returns the next highest integer value of the number */ PHP_FUNCTION(ceil) { zval *value; @@ -248,8 +246,7 @@ PHP_FUNCTION(ceil) } /* }}} */ -/* {{{ proto float floor(float number) - Returns the next lowest integer value from the number */ +/* {{{ Returns the next lowest integer value from the number */ PHP_FUNCTION(floor) { zval *value; @@ -268,8 +265,7 @@ PHP_FUNCTION(floor) } /* }}} */ -/* {{{ proto float round(float number [, int precision [, int mode]]) - Returns the number rounded to specified precision */ +/* {{{ Returns the number rounded to specified precision */ PHP_FUNCTION(round) { zval *value; @@ -316,8 +312,7 @@ PHP_FUNCTION(round) } /* }}} */ -/* {{{ proto float sin(float number) - Returns the sine of the number in radians */ +/* {{{ Returns the sine of the number in radians */ PHP_FUNCTION(sin) { double num; @@ -329,8 +324,7 @@ PHP_FUNCTION(sin) } /* }}} */ -/* {{{ proto float cos(float number) - Returns the cosine of the number in radians */ +/* {{{ Returns the cosine of the number in radians */ PHP_FUNCTION(cos) { double num; @@ -342,8 +336,7 @@ PHP_FUNCTION(cos) } /* }}} */ -/* {{{ proto float tan(float number) - Returns the tangent of the number in radians */ +/* {{{ Returns the tangent of the number in radians */ PHP_FUNCTION(tan) { double num; @@ -355,8 +348,7 @@ PHP_FUNCTION(tan) } /* }}} */ -/* {{{ proto float asin(float number) - Returns the arc sine of the number in radians */ +/* {{{ Returns the arc sine of the number in radians */ PHP_FUNCTION(asin) { double num; @@ -368,8 +360,7 @@ PHP_FUNCTION(asin) } /* }}} */ -/* {{{ proto float acos(float number) - Return the arc cosine of the number in radians */ +/* {{{ Return the arc cosine of the number in radians */ PHP_FUNCTION(acos) { double num; @@ -381,8 +372,7 @@ PHP_FUNCTION(acos) } /* }}} */ -/* {{{ proto float atan(float number) - Returns the arc tangent of the number in radians */ +/* {{{ Returns the arc tangent of the number in radians */ PHP_FUNCTION(atan) { double num; @@ -394,8 +384,7 @@ PHP_FUNCTION(atan) } /* }}} */ -/* {{{ proto float atan2(float y, float x) - Returns the arc tangent of y/x, with the resulting quadrant determined by the signs of y and x */ +/* {{{ Returns the arc tangent of y/x, with the resulting quadrant determined by the signs of y and x */ PHP_FUNCTION(atan2) { double num1, num2; @@ -408,8 +397,7 @@ PHP_FUNCTION(atan2) } /* }}} */ -/* {{{ proto float sinh(float number) - Returns the hyperbolic sine of the number, defined as (exp(number) - exp(-number))/2 */ +/* {{{ Returns the hyperbolic sine of the number, defined as (exp(number) - exp(-number))/2 */ PHP_FUNCTION(sinh) { double num; @@ -421,8 +409,7 @@ PHP_FUNCTION(sinh) } /* }}} */ -/* {{{ proto float cosh(float number) - Returns the hyperbolic cosine of the number, defined as (exp(number) + exp(-number))/2 */ +/* {{{ Returns the hyperbolic cosine of the number, defined as (exp(number) + exp(-number))/2 */ PHP_FUNCTION(cosh) { double num; @@ -434,8 +421,7 @@ PHP_FUNCTION(cosh) } /* }}} */ -/* {{{ proto float tanh(float number) - Returns the hyperbolic tangent of the number, defined as sinh(number)/cosh(number) */ +/* {{{ Returns the hyperbolic tangent of the number, defined as sinh(number)/cosh(number) */ PHP_FUNCTION(tanh) { double num; @@ -447,8 +433,7 @@ PHP_FUNCTION(tanh) } /* }}} */ -/* {{{ proto float asinh(float number) - Returns the inverse hyperbolic sine of the number, i.e. the value whose hyperbolic sine is number */ +/* {{{ Returns the inverse hyperbolic sine of the number, i.e. the value whose hyperbolic sine is number */ PHP_FUNCTION(asinh) { double num; @@ -460,8 +445,7 @@ PHP_FUNCTION(asinh) } /* }}} */ -/* {{{ proto float acosh(float number) - Returns the inverse hyperbolic cosine of the number, i.e. the value whose hyperbolic cosine is number */ +/* {{{ Returns the inverse hyperbolic cosine of the number, i.e. the value whose hyperbolic cosine is number */ PHP_FUNCTION(acosh) { double num; @@ -473,8 +457,7 @@ PHP_FUNCTION(acosh) } /* }}} */ -/* {{{ proto float atanh(float number) - Returns the inverse hyperbolic tangent of the number, i.e. the value whose hyperbolic tangent is number */ +/* {{{ Returns the inverse hyperbolic tangent of the number, i.e. the value whose hyperbolic tangent is number */ PHP_FUNCTION(atanh) { double num; @@ -486,8 +469,7 @@ PHP_FUNCTION(atanh) } /* }}} */ -/* {{{ proto float pi(void) - Returns an approximation of pi */ +/* {{{ Returns an approximation of pi */ PHP_FUNCTION(pi) { ZEND_PARSE_PARAMETERS_NONE(); @@ -496,8 +478,7 @@ PHP_FUNCTION(pi) } /* }}} */ -/* {{{ proto bool is_finite(float val) - Returns whether argument is finite */ +/* {{{ Returns whether argument is finite */ PHP_FUNCTION(is_finite) { double dval; @@ -509,8 +490,7 @@ PHP_FUNCTION(is_finite) } /* }}} */ -/* {{{ proto bool is_infinite(float val) - Returns whether argument is infinite */ +/* {{{ Returns whether argument is infinite */ PHP_FUNCTION(is_infinite) { double dval; @@ -522,8 +502,7 @@ PHP_FUNCTION(is_infinite) } /* }}} */ -/* {{{ proto bool is_nan(float val) - Returns whether argument is not a number */ +/* {{{ Returns whether argument is not a number */ PHP_FUNCTION(is_nan) { double dval; @@ -535,8 +514,7 @@ PHP_FUNCTION(is_nan) } /* }}} */ -/* {{{ proto number pow(number base, number exponent) - Returns base raised to the power of exponent. Returns integer result when possible */ +/* {{{ Returns base raised to the power of exponent. Returns integer result when possible */ PHP_FUNCTION(pow) { zval *zbase, *zexp; @@ -550,8 +528,7 @@ PHP_FUNCTION(pow) } /* }}} */ -/* {{{ proto float exp(float number) - Returns e raised to the power of the number */ +/* {{{ Returns e raised to the power of the number */ PHP_FUNCTION(exp) { double num; @@ -564,9 +541,7 @@ PHP_FUNCTION(exp) } /* }}} */ -/* {{{ proto float expm1(float number) - Returns exp(number) - 1, computed in a way that accurate even when the value of number is close to zero -*/ +/* {{{ Returns exp(number) - 1, computed in a way that accurate even when the value of number is close to zero */ PHP_FUNCTION(expm1) { double num; @@ -579,9 +554,7 @@ PHP_FUNCTION(expm1) } /* }}} */ -/* {{{ proto float log1p(float number) - Returns log(1 + number), computed in a way that accurate even when the value of number is close to zero -*/ +/* {{{ Returns log(1 + number), computed in a way that accurate even when the value of number is close to zero */ PHP_FUNCTION(log1p) { double num; @@ -594,8 +567,7 @@ PHP_FUNCTION(log1p) } /* }}} */ -/* {{{ proto float log(float number, [float base]) - Returns the natural logarithm of the number, or the base log if base is specified */ +/* {{{ Returns the natural logarithm of the number, or the base log if base is specified */ PHP_FUNCTION(log) { double num, base = 0; @@ -631,8 +603,7 @@ PHP_FUNCTION(log) } /* }}} */ -/* {{{ proto float log10(float number) - Returns the base-10 logarithm of the number */ +/* {{{ Returns the base-10 logarithm of the number */ PHP_FUNCTION(log10) { double num; @@ -645,8 +616,7 @@ PHP_FUNCTION(log10) } /* }}} */ -/* {{{ proto float sqrt(float number) - Returns the square root of the number */ +/* {{{ Returns the square root of the number */ PHP_FUNCTION(sqrt) { double num; @@ -659,8 +629,7 @@ PHP_FUNCTION(sqrt) } /* }}} */ -/* {{{ proto float hypot(float num1, float num2) - Returns sqrt(num1*num1 + num2*num2) */ +/* {{{ Returns sqrt(num1*num1 + num2*num2) */ PHP_FUNCTION(hypot) { double num1, num2; @@ -674,8 +643,7 @@ PHP_FUNCTION(hypot) } /* }}} */ -/* {{{ proto float deg2rad(float number) - Converts the number in degrees to the radian equivalent */ +/* {{{ Converts the number in degrees to the radian equivalent */ PHP_FUNCTION(deg2rad) { double deg; @@ -687,8 +655,7 @@ PHP_FUNCTION(deg2rad) } /* }}} */ -/* {{{ proto float rad2deg(float number) - Converts the radian number to the equivalent number in degrees */ +/* {{{ Converts the radian number to the equivalent number in degrees */ PHP_FUNCTION(rad2deg) { double rad; @@ -893,8 +860,7 @@ PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base) } /* }}} */ -/* {{{ proto int|float bindec(string binary_number) - Returns the decimal equivalent of the binary number */ +/* {{{ Returns the decimal equivalent of the binary number */ PHP_FUNCTION(bindec) { zend_string *arg; @@ -907,8 +873,7 @@ PHP_FUNCTION(bindec) } /* }}} */ -/* {{{ proto int|flat hexdec(string hexadecimal_number) - Returns the decimal equivalent of the hexadecimal number */ +/* {{{ Returns the decimal equivalent of the hexadecimal number */ PHP_FUNCTION(hexdec) { zend_string *arg; @@ -921,8 +886,7 @@ PHP_FUNCTION(hexdec) } /* }}} */ -/* {{{ proto int|float octdec(string octal_number) - Returns the decimal equivalent of an octal string */ +/* {{{ Returns the decimal equivalent of an octal string */ PHP_FUNCTION(octdec) { zend_string *arg; @@ -935,8 +899,7 @@ PHP_FUNCTION(octdec) } /* }}} */ -/* {{{ proto string decbin(int decimal_number) - Returns a string containing a binary representation of the number */ +/* {{{ Returns a string containing a binary representation of the number */ PHP_FUNCTION(decbin) { zval *arg; @@ -952,8 +915,7 @@ PHP_FUNCTION(decbin) } /* }}} */ -/* {{{ proto string decoct(int decimal_number) - Returns a string containing an octal representation of the given number */ +/* {{{ Returns a string containing an octal representation of the given number */ PHP_FUNCTION(decoct) { zval *arg; @@ -969,8 +931,7 @@ PHP_FUNCTION(decoct) } /* }}} */ -/* {{{ proto string dechex(int decimal_number) - Returns a string containing a hexadecimal representation of the given number */ +/* {{{ Returns a string containing a hexadecimal representation of the given number */ PHP_FUNCTION(dechex) { zval *arg; @@ -986,8 +947,7 @@ PHP_FUNCTION(dechex) } /* }}} */ -/* {{{ proto string|false base_convert(string number, int frombase, int tobase) - Converts a number in a string from any base <= 36 to any base <= 36 */ +/* {{{ Converts a number in a string from any base <= 36 to any base <= 36 */ PHP_FUNCTION(base_convert) { zval *number, temp; @@ -1019,8 +979,7 @@ PHP_FUNCTION(base_convert) } /* }}} */ -/* {{{ _php_math_number_format -*/ +/* {{{ _php_math_number_format */ PHPAPI zend_string *_php_math_number_format(double d, int dec, char dec_point, char thousand_sep) { return _php_math_number_format_ex(d, dec, &dec_point, 1, &thousand_sep, 1); @@ -1144,8 +1103,7 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, const char *de return res; } -/* {{{ proto string number_format(float number [, int num_decimal_places [, string dec_separator, string thousands_separator]]) - Formats a number with grouped thousands */ +/* {{{ Formats a number with grouped thousands */ PHP_FUNCTION(number_format) { double num; @@ -1189,8 +1147,7 @@ PHP_FUNCTION(number_format) } /* }}} */ -/* {{{ proto float fmod(float x, float y) - Returns the remainder of dividing x by y as a float */ +/* {{{ Returns the remainder of dividing x by y as a float */ PHP_FUNCTION(fmod) { double num1, num2; @@ -1204,8 +1161,7 @@ PHP_FUNCTION(fmod) } /* }}} */ -/* {{{ proto float fdiv(float dividend, float divisor) - Perform floating-point division of dividend / divisor +/* {{{ Perform floating-point division of dividend / divisor with IEEE-754 semantics for division by zero. */ #ifdef __clang__ __attribute__((no_sanitize("float-divide-by-zero"))) @@ -1223,8 +1179,7 @@ PHP_FUNCTION(fdiv) } /* }}} */ -/* {{{ proto int intdiv(int dividend, int divisor) - Returns the integer quotient of the division of dividend by divisor */ +/* {{{ Returns the integer quotient of the division of dividend by divisor */ PHP_FUNCTION(intdiv) { zend_long dividend, divisor; diff --git a/ext/standard/md5.c b/ext/standard/md5.c index 2e2b5281da..ec07ae2ed3 100644 --- a/ext/standard/md5.c +++ b/ext/standard/md5.c @@ -38,8 +38,7 @@ PHPAPI void make_digest_ex(char *md5str, const unsigned char *digest, int len) / } /* }}} */ -/* {{{ proto string md5(string str, [ bool raw_output]) - Calculate the md5 hash of a string */ +/* {{{ Calculate the md5 hash of a string */ PHP_FUNCTION(md5) { zend_string *arg; @@ -66,8 +65,7 @@ PHP_FUNCTION(md5) } /* }}} */ -/* {{{ proto string md5_file(string filename [, bool raw_output]) - Calculate the md5 hash of given filename */ +/* {{{ Calculate the md5 hash of given filename */ PHP_FUNCTION(md5_file) { char *arg; diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 970ec1391d..1665caddce 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -22,8 +22,7 @@ static int metaphone(unsigned char *word, size_t word_len, zend_long max_phonemes, zend_string **phoned_word, int traditional); -/* {{{ proto string|false metaphone(string text[, int phones]) - Break english phrases down into their phonemes */ +/* {{{ Break english phrases down into their phonemes */ PHP_FUNCTION(metaphone) { zend_string *str; @@ -160,8 +159,7 @@ static char Lookahead(char *word, int how_far) /* Note is a letter is a 'break' in the word */ #define Isbreak(c) (!isalpha(c)) -/* {{{ metaphone - */ +/* {{{ metaphone */ static int metaphone(unsigned char *word, size_t word_len, zend_long max_phonemes, zend_string **phoned_word, int traditional) { int w_idx = 0; /* point in the phonization we're at. */ diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c index fe18e9b92a..1817da00bf 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -79,16 +79,14 @@ static void _php_gettimeofday(INTERNAL_FUNCTION_PARAMETERS, int mode) } } -/* {{{ proto mixed microtime([bool get_as_float]) - Returns either a string or a float containing the current time in seconds and microseconds */ +/* {{{ Returns either a string or a float containing the current time in seconds and microseconds */ PHP_FUNCTION(microtime) { _php_gettimeofday(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto array gettimeofday([bool get_as_float]) - Returns the current time as array */ +/* {{{ Returns the current time as array */ PHP_FUNCTION(gettimeofday) { _php_gettimeofday(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -97,8 +95,7 @@ PHP_FUNCTION(gettimeofday) /* }}} */ #ifdef HAVE_GETRUSAGE -/* {{{ proto array|false getrusage([int who]) - Returns an array of usage statistics */ +/* {{{ Returns an array of usage statistics */ PHP_FUNCTION(getrusage) { struct rusage usg; diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index d164ac3037..3c33a42df3 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -91,8 +91,7 @@ #define twist(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(v))) & 0x9908b0dfU)) #define twist_php(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(u))) & 0x9908b0dfU)) -/* {{{ php_mt_initialize - */ +/* {{{ php_mt_initialize */ static inline void php_mt_initialize(uint32_t seed, uint32_t *state) { /* Initialize generator state with seed @@ -112,8 +111,7 @@ static inline void php_mt_initialize(uint32_t seed, uint32_t *state) } /* }}} */ -/* {{{ php_mt_reload - */ +/* {{{ php_mt_reload */ static inline void php_mt_reload(void) { /* Generate N new values in state @@ -142,8 +140,7 @@ static inline void php_mt_reload(void) } /* }}} */ -/* {{{ php_mt_srand - */ +/* {{{ php_mt_srand */ PHPAPI void php_mt_srand(uint32_t seed) { /* Seed the generator with a simple uint32 */ @@ -155,8 +152,7 @@ PHPAPI void php_mt_srand(uint32_t seed) } /* }}} */ -/* {{{ php_mt_rand - */ +/* {{{ php_mt_rand */ PHPAPI uint32_t php_mt_rand(void) { /* Pull a 32-bit integer from the generator state @@ -181,8 +177,7 @@ PHPAPI uint32_t php_mt_rand(void) } /* }}} */ -/* {{{ proto void mt_srand([int seed]) - Seeds Mersenne Twister random number generator */ +/* {{{ Seeds Mersenne Twister random number generator */ PHP_FUNCTION(mt_srand) { zend_long seed = 0; @@ -271,8 +266,7 @@ static uint64_t rand_range64(uint64_t umax) { } #endif -/* {{{ php_mt_rand_range - */ +/* {{{ php_mt_rand_range */ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max) { zend_ulong umax = max - min; @@ -306,8 +300,7 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max) } /* }}} */ -/* {{{ proto int mt_rand([int min, int max]) - Returns a random number from Mersenne Twister */ +/* {{{ Returns a random number from Mersenne Twister */ PHP_FUNCTION(mt_rand) { zend_long min; @@ -333,8 +326,7 @@ PHP_FUNCTION(mt_rand) } /* }}} */ -/* {{{ proto int mt_getrandmax(void) - Returns the maximum value a random number from Mersenne Twister can have */ +/* {{{ Returns the maximum value a random number from Mersenne Twister can have */ PHP_FUNCTION(mt_getrandmax) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/ext/standard/net.c b/ext/standard/net.c index 535ab13f00..9f22c75840 100644 --- a/ext/standard/net.c +++ b/ext/standard/net.c @@ -128,8 +128,7 @@ static void iface_append_unicast(zval *unicast, zend_long flags, } #endif -/* {{{ proto array|false net_get_interfaces() -Returns an array in the form: +/* {{{ Returns an array in the form: array( 'ifacename' => array( 'description' => 'Awesome interface', // Win32 only diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 94e8a304e7..013173dc73 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -78,8 +78,7 @@ static int big_endian_longlong_map[8]; static int little_endian_longlong_map[8]; #endif -/* {{{ php_pack - */ +/* {{{ php_pack */ static void php_pack(zval *val, size_t size, int *map, char *output) { size_t i; @@ -94,8 +93,7 @@ static void php_pack(zval *val, size_t size, int *map, char *output) } /* }}} */ -/* {{{ php_pack_reverse_int32 - */ +/* {{{ php_pack_reverse_int32 */ static inline uint32_t php_pack_reverse_int32(uint32_t arg) { uint32_t result; @@ -105,8 +103,7 @@ static inline uint32_t php_pack_reverse_int32(uint32_t arg) } /* }}} */ -/* {{{ php_pack - */ +/* {{{ php_pack */ static inline uint64_t php_pack_reverse_int64(uint64_t arg) { union Swap64 { @@ -121,8 +118,7 @@ static inline uint64_t php_pack_reverse_int64(uint64_t arg) } /* }}} */ -/* {{{ php_pack_copy_float - */ +/* {{{ php_pack_copy_float */ static void php_pack_copy_float(int is_little_endian, void * dst, float f) { union Copy32 { @@ -145,8 +141,7 @@ static void php_pack_copy_float(int is_little_endian, void * dst, float f) } /* }}} */ -/* {{{ php_pack_copy_double - */ +/* {{{ php_pack_copy_double */ static void php_pack_copy_double(int is_little_endian, void * dst, double d) { union Copy64 { @@ -169,8 +164,7 @@ static void php_pack_copy_double(int is_little_endian, void * dst, double d) } /* }}} */ -/* {{{ php_pack_parse_float - */ +/* {{{ php_pack_parse_float */ static float php_pack_parse_float(int is_little_endian, void * src) { union Copy32 { @@ -193,8 +187,7 @@ static float php_pack_parse_float(int is_little_endian, void * src) } /* }}} */ -/* {{{ php_pack_parse_double - */ +/* {{{ php_pack_parse_double */ static double php_pack_parse_double(int is_little_endian, void * src) { union Copy64 { @@ -221,8 +214,7 @@ static double php_pack_parse_double(int is_little_endian, void * src) * Implemented formats are Z, A, a, h, H, c, C, s, S, i, I, l, L, n, N, q, Q, J, P, f, d, x, X, @. * Added g, G for little endian float and big endian float, added e, E for little endian double and big endian double. */ -/* {{{ proto string pack(string format, mixed arg1 [, mixed arg2 [, mixed ...]]) - Takes one or more arguments and packs them into a binary string according to the format argument */ +/* {{{ Takes one or more arguments and packs them into a binary string according to the format argument */ PHP_FUNCTION(pack) { zval *argv = NULL; @@ -685,8 +677,7 @@ too_few_args: } /* }}} */ -/* {{{ php_unpack - */ +/* {{{ php_unpack */ static zend_long php_unpack(char *data, size_t size, int issigned, int *map) { zend_long result; @@ -716,8 +707,7 @@ static zend_long php_unpack(char *data, size_t size, int issigned, int *map) * Implemented formats are Z, A, a, h, H, c, C, s, S, i, I, l, L, n, N, q, Q, J, P, f, d, x, X, @. * Added g, G for little endian float and big endian float, added e, E for little endian double and big endian double. */ -/* {{{ proto array|false unpack(string format, string input) - Unpack binary string into named array elements according to format argument */ +/* {{{ Unpack binary string into named array elements according to format argument */ PHP_FUNCTION(unpack) { char *format, *input; @@ -1210,8 +1200,7 @@ PHP_FUNCTION(unpack) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pack) { int machine_endian_check = 1; diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c index bdd5560ea5..56e5462f3c 100644 --- a/ext/standard/pageinfo.c +++ b/ext/standard/pageinfo.c @@ -51,8 +51,7 @@ #include "ext/standard/basic_functions.h" -/* {{{ php_statpage - */ +/* {{{ php_statpage */ PHPAPI void php_statpage(void) { zend_stat_t *pstat; @@ -73,8 +72,7 @@ PHPAPI void php_statpage(void) } /* }}} */ -/* {{{ php_getuid - */ +/* {{{ php_getuid */ zend_long php_getuid(void) { php_statpage(); @@ -88,8 +86,7 @@ zend_long php_getgid(void) return (BG(page_gid)); } -/* {{{ proto int getmyuid(void) - Get PHP script owner's UID */ +/* {{{ Get PHP script owner's UID */ PHP_FUNCTION(getmyuid) { zend_long uid; @@ -105,8 +102,7 @@ PHP_FUNCTION(getmyuid) } /* }}} */ -/* {{{ proto int getmygid(void) - Get PHP script owner's GID */ +/* {{{ Get PHP script owner's GID */ PHP_FUNCTION(getmygid) { zend_long gid; @@ -122,8 +118,7 @@ PHP_FUNCTION(getmygid) } /* }}} */ -/* {{{ proto int getmypid(void) - Get current process ID */ +/* {{{ Get current process ID */ PHP_FUNCTION(getmypid) { zend_long pid; @@ -139,8 +134,7 @@ PHP_FUNCTION(getmypid) } /* }}} */ -/* {{{ proto int getmyinode(void) - Get the inode of the current script being parsed */ +/* {{{ Get the inode of the current script being parsed */ PHP_FUNCTION(getmyinode) { ZEND_PARSE_PARAMETERS_NONE(); @@ -160,8 +154,7 @@ PHPAPI time_t php_getlastmod(void) return BG(page_mtime); } -/* {{{ proto int getlastmod(void) - Get time of last page modification */ +/* {{{ Get time of last page modification */ PHP_FUNCTION(getlastmod) { zend_long lm; diff --git a/ext/standard/password.c b/ext/standard/password.c index 1616cf8774..ea28ee6145 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -560,8 +560,7 @@ const php_password_algo* php_password_algo_identify_ex(const zend_string* hash, return (!algo || (algo->valid && !algo->valid(hash))) ? default_algo : algo; } -/* {{{ proto array|null password_get_info(string $hash) -Retrieves information about a given hash */ +/* {{{ Retrieves information about a given hash */ PHP_FUNCTION(password_get_info) { const php_password_algo *algo; @@ -601,8 +600,7 @@ PHP_FUNCTION(password_get_info) } /** }}} */ -/* {{{ proto bool password_needs_rehash(string $hash, mixed $algo[, array $options]) -Determines if a given hash requires re-hashing based upon parameters */ +/* {{{ Determines if a given hash requires re-hashing based upon parameters */ PHP_FUNCTION(password_needs_rehash) { const php_password_algo *old_algo, *new_algo; @@ -633,8 +631,7 @@ PHP_FUNCTION(password_needs_rehash) } /* }}} */ -/* {{{ proto bool password_verify(string password, string hash) -Verify a hash created using crypt() or password_hash() */ +/* {{{ Verify a hash created using crypt() or password_hash() */ PHP_FUNCTION(password_verify) { zend_string *password, *hash; @@ -650,8 +647,7 @@ PHP_FUNCTION(password_verify) } /* }}} */ -/* {{{ proto string password_hash(string password, mixed algo[, array options = array()]) -Hash a password */ +/* {{{ Hash a password */ PHP_FUNCTION(password_hash) { zend_string *password, *digest = NULL; @@ -686,7 +682,7 @@ PHP_FUNCTION(password_hash) } /* }}} */ -/* {{{ proto array password_algos() */ +/* {{{ */ PHP_FUNCTION(password_algos) { zend_string *algo; diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 092c506dcf..ac00dd318c 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -296,8 +296,7 @@ PHP_MINIT_FUNCTION(proc_open) } /* }}} */ -/* {{{ proto bool proc_terminate(resource process [, int signal]) - Kill a process opened by `proc_open` */ +/* {{{ Kill a process opened by `proc_open` */ PHP_FUNCTION(proc_terminate) { zval *zproc; @@ -323,8 +322,7 @@ PHP_FUNCTION(proc_terminate) } /* }}} */ -/* {{{ proto int|false proc_close(resource process) - Close a process opened by `proc_open` */ +/* {{{ Close a process opened by `proc_open` */ PHP_FUNCTION(proc_close) { zval *zproc; @@ -346,8 +344,7 @@ PHP_FUNCTION(proc_close) } /* }}} */ -/* {{{ proto array|false proc_get_status(resource process) - Get information about a process opened by `proc_open` */ +/* {{{ Get information about a process opened by `proc_open` */ PHP_FUNCTION(proc_get_status) { zval *zproc; @@ -944,8 +941,7 @@ static void efree_argv(char **argv) } } -/* {{{ proto resource|false proc_open(string|array command, array descriptorspec, array &pipes [, string cwd [, array env [, array other_options]]]) - Execute a command, with specified files used for input/output */ +/* {{{ Execute a command, with specified files used for input/output */ PHP_FUNCTION(proc_open) { zval *command_zv, *descriptorspec, *pipes; /* Mandatory arguments */ diff --git a/ext/standard/quot_print.c b/ext/standard/quot_print.c index 19dc2e652a..6e8594d398 100644 --- a/ext/standard/quot_print.c +++ b/ext/standard/quot_print.c @@ -193,8 +193,7 @@ PHPAPI zend_string *php_quot_print_encode(const unsigned char *str, size_t lengt * Decoding Quoted-printable string. * */ -/* {{{ proto string quoted_printable_decode(string str) - Convert a quoted-printable string to an 8 bit string */ +/* {{{ Convert a quoted-printable string to an 8 bit string */ PHP_FUNCTION(quoted_printable_decode) { zend_string *arg1; @@ -257,7 +256,7 @@ PHP_FUNCTION(quoted_printable_decode) } /* }}} */ -/* {{{ proto string quoted_printable_encode(string str) */ +/* {{{ */ PHP_FUNCTION(quoted_printable_encode) { zend_string *str; diff --git a/ext/standard/rand.c b/ext/standard/rand.c index be4d55c6c0..fd063b7004 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -26,24 +26,21 @@ #include "php_rand.h" #include "php_mt_rand.h" -/* {{{ php_srand - */ +/* {{{ php_srand */ PHPAPI void php_srand(zend_long seed) { php_mt_srand(seed); } /* }}} */ -/* {{{ php_rand - */ +/* {{{ php_rand */ PHPAPI zend_long php_rand(void) { return php_mt_rand(); } /* }}} */ -/* {{{ proto int mt_rand([int min, int max]) - Returns a random number from Mersenne Twister */ +/* {{{ Returns a random number from Mersenne Twister */ PHP_FUNCTION(rand) { zend_long min; diff --git a/ext/standard/random.c b/ext/standard/random.c index a824d64908..4543b1ac49 100644 --- a/ext/standard/random.c +++ b/ext/standard/random.c @@ -193,8 +193,7 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, zend_bool should_throw) } /* }}} */ -/* {{{ proto string random_bytes(int length) -Return an arbitrary length of pseudo-random bytes as binary string */ +/* {{{ Return an arbitrary length of pseudo-random bytes as binary string */ PHP_FUNCTION(random_bytes) { zend_long size; @@ -266,8 +265,7 @@ PHPAPI int php_random_int(zend_long min, zend_long max, zend_long *result, zend_ } /* }}} */ -/* {{{ proto int random_int(int min, int max) -Return an arbitrary pseudo-random integer */ +/* {{{ Return an arbitrary pseudo-random integer */ PHP_FUNCTION(random_int) { zend_long min; diff --git a/ext/standard/sha1.c b/ext/standard/sha1.c index 562e6e9de6..58bd91385c 100644 --- a/ext/standard/sha1.c +++ b/ext/standard/sha1.c @@ -26,8 +26,7 @@ PHPAPI void make_sha1_digest(char *sha1str, const unsigned char *digest) make_digest_ex(sha1str, digest, 20); } -/* {{{ proto string sha1(string str [, bool raw_output]) - Calculate the sha1 hash of a string */ +/* {{{ Calculate the sha1 hash of a string */ PHP_FUNCTION(sha1) { zend_string *arg; @@ -56,8 +55,7 @@ PHP_FUNCTION(sha1) /* }}} */ -/* {{{ proto string sha1_file(string filename [, bool raw_output]) - Calculate the sha1 hash of given filename */ +/* {{{ Calculate the sha1 hash of given filename */ PHP_FUNCTION(sha1_file) { char *arg; diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c index 37cce07601..afd16142e3 100644 --- a/ext/standard/soundex.c +++ b/ext/standard/soundex.c @@ -21,8 +21,7 @@ #include "php_string.h" /* Simple soundex algorithm as described by Knuth in TAOCP, vol 3 */ -/* {{{ proto string soundex(string str) - Calculate the soundex key of a string */ +/* {{{ Calculate the soundex key of a string */ PHP_FUNCTION(soundex) { char *str; diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index cc52b429c8..c0d950a18c 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -47,8 +47,7 @@ static php_stream_context *decode_context_param(zval *contextresource); /* Streams based network functions */ #if HAVE_SOCKETPAIR -/* {{{ proto array|false stream_socket_pair(int domain, int type, int protocol) - Creates a pair of connected, indistinguishable socket streams */ +/* {{{ Creates a pair of connected, indistinguishable socket streams */ PHP_FUNCTION(stream_socket_pair) { zend_long domain, type, protocol; @@ -84,8 +83,7 @@ PHP_FUNCTION(stream_socket_pair) /* }}} */ #endif -/* {{{ proto resource|false stream_socket_client(string remoteaddress [, int &errcode [, string &errstring [, double timeout [, int flags [, resource context]]]]]) - Open a client connection to a remote address */ +/* {{{ Open a client connection to a remote address */ PHP_FUNCTION(stream_socket_client) { zend_string *host; @@ -173,8 +171,7 @@ PHP_FUNCTION(stream_socket_client) } /* }}} */ -/* {{{ proto resource|false stream_socket_server(string localaddress [, int &errcode [, string &errstring [, int flags [, resource context]]]]) - Create a server socket bound to localaddress */ +/* {{{ Create a server socket bound to localaddress */ PHP_FUNCTION(stream_socket_server) { char *host; @@ -238,8 +235,7 @@ PHP_FUNCTION(stream_socket_server) } /* }}} */ -/* {{{ proto resource|false stream_socket_accept(resource serverstream, [ double timeout [, string &peername ]]) - Accept a client connection from a server socket */ +/* {{{ Accept a client connection from a server socket */ PHP_FUNCTION(stream_socket_accept) { double timeout = (double)FG(default_socket_timeout); @@ -294,8 +290,7 @@ PHP_FUNCTION(stream_socket_accept) } /* }}} */ -/* {{{ proto string|false stream_socket_get_name(resource stream, bool want_peer) - Returns either the locally bound or remote name for a socket stream */ +/* {{{ Returns either the locally bound or remote name for a socket stream */ PHP_FUNCTION(stream_socket_get_name) { php_stream *stream; @@ -326,8 +321,7 @@ PHP_FUNCTION(stream_socket_get_name) } /* }}} */ -/* {{{ proto int|false stream_socket_sendto(resource stream, string data [, int flags [, string target_addr]]) - Send data to a socket stream. If target_addr is specified it must be in dotted quad (or [ipv6]) format */ +/* {{{ Send data to a socket stream. If target_addr is specified it must be in dotted quad (or [ipv6]) format */ PHP_FUNCTION(stream_socket_sendto) { php_stream *stream; @@ -359,8 +353,7 @@ PHP_FUNCTION(stream_socket_sendto) } /* }}} */ -/* {{{ proto string|false stream_socket_recvfrom(resource stream, int amount [, int flags [, string &remote_addr]]) - Receives data from a socket stream */ +/* {{{ Receives data from a socket stream */ PHP_FUNCTION(stream_socket_recvfrom) { php_stream *stream; @@ -410,8 +403,7 @@ PHP_FUNCTION(stream_socket_recvfrom) } /* }}} */ -/* {{{ proto string|false stream_get_contents(resource source [, int maxlen [, int offset]]) - Reads all remaining bytes (or up to maxlen bytes) from a stream and returns them as a string. */ +/* {{{ Reads all remaining bytes (or up to maxlen bytes) from a stream and returns them as a string. */ PHP_FUNCTION(stream_get_contents) { php_stream *stream; @@ -461,8 +453,7 @@ PHP_FUNCTION(stream_get_contents) } /* }}} */ -/* {{{ proto int|false stream_copy_to_stream(resource source, resource dest [, int maxlen [, int pos]]) - Reads up to maxlen bytes from source stream and writes them to dest stream. */ +/* {{{ Reads up to maxlen bytes from source stream and writes them to dest stream. */ PHP_FUNCTION(stream_copy_to_stream) { php_stream *src, *dest; @@ -496,8 +487,7 @@ PHP_FUNCTION(stream_copy_to_stream) } /* }}} */ -/* {{{ proto array stream_get_meta_data(resource fp) - Retrieves header/meta data from streams/file pointers */ +/* {{{ Retrieves header/meta data from streams/file pointers */ PHP_FUNCTION(stream_get_meta_data) { zval *zstream; @@ -553,8 +543,7 @@ PHP_FUNCTION(stream_get_meta_data) } /* }}} */ -/* {{{ proto array|false stream_get_transports() - Retrieves list of registered socket transports */ +/* {{{ Retrieves list of registered socket transports */ PHP_FUNCTION(stream_get_transports) { HashTable *stream_xport_hash; @@ -573,8 +562,7 @@ PHP_FUNCTION(stream_get_transports) } /* }}} */ -/* {{{ proto array|false stream_get_wrappers() - Retrieves list of registered stream wrappers */ +/* {{{ Retrieves list of registered stream wrappers */ PHP_FUNCTION(stream_get_wrappers) { HashTable *url_stream_wrappers_hash; @@ -735,8 +723,7 @@ static int stream_array_emulate_read_fd_set(zval *stream_array) } /* }}} */ -/* {{{ proto int|false stream_select(array &read_streams, array &write_streams, array &except_streams, int tv_sec[, int tv_usec]) - Runs the select() system call on the sets of streams with a timeout specified by tv_sec and tv_usec */ +/* {{{ Runs the select() system call on the sets of streams with a timeout specified by tv_sec and tv_usec */ PHP_FUNCTION(stream_select) { zval *r_array, *w_array, *e_array; @@ -958,8 +945,7 @@ static php_stream_context *decode_context_param(zval *contextresource) } /* }}} */ -/* {{{ proto array stream_context_get_options(resource context|resource stream) - Retrieve options for a stream/wrapper/context */ +/* {{{ Retrieve options for a stream/wrapper/context */ PHP_FUNCTION(stream_context_get_options) { zval *zcontext; @@ -979,8 +965,7 @@ PHP_FUNCTION(stream_context_get_options) } /* }}} */ -/* {{{ proto bool stream_context_set_option(resource context|resource stream, string wrappername, string optionname, mixed value) - Set an option for a wrapper */ +/* {{{ Set an option for a wrapper */ PHP_FUNCTION(stream_context_set_option) { zval *zcontext = NULL; @@ -1024,8 +1009,7 @@ PHP_FUNCTION(stream_context_set_option) } /* }}} */ -/* {{{ proto bool stream_context_set_params(resource context|resource stream, array options) - Set parameters for a file context */ +/* {{{ Set parameters for a file context */ PHP_FUNCTION(stream_context_set_params) { zval *params, *zcontext; @@ -1046,8 +1030,7 @@ PHP_FUNCTION(stream_context_set_params) } /* }}} */ -/* {{{ proto array stream_context_get_params(resource context|resource stream) - Get parameters of a file context */ +/* {{{ Get parameters of a file context */ PHP_FUNCTION(stream_context_get_params) { zval *zcontext; @@ -1073,8 +1056,7 @@ PHP_FUNCTION(stream_context_get_params) } /* }}} */ -/* {{{ proto resource stream_context_get_default([array options]) - Get a handle on the default file/stream context and optionally set parameters */ +/* {{{ Get a handle on the default file/stream context and optionally set parameters */ PHP_FUNCTION(stream_context_get_default) { zval *params = NULL; @@ -1100,8 +1082,7 @@ PHP_FUNCTION(stream_context_get_default) } /* }}} */ -/* {{{ proto resource stream_context_set_default(array options) - Set default file/stream context, returns the context as a resource */ +/* {{{ Set default file/stream context, returns the context as a resource */ PHP_FUNCTION(stream_context_set_default) { zval *options = NULL; @@ -1124,8 +1105,7 @@ PHP_FUNCTION(stream_context_set_default) } /* }}} */ -/* {{{ proto resource stream_context_create([array options[, array params]]) - Create a file context and optionally set parameters */ +/* {{{ Create a file context and optionally set parameters */ PHP_FUNCTION(stream_context_create) { zval *options = NULL, *params = NULL; @@ -1231,24 +1211,21 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto resource stream_filter_prepend(resource stream, string filtername[, int read_write[, string filterparams]]) - Prepend a filter to a stream */ +/* {{{ Prepend a filter to a stream */ PHP_FUNCTION(stream_filter_prepend) { apply_filter_to_stream(0, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto resource stream_filter_append(resource stream, string filtername[, int read_write[, string filterparams]]) - Append a filter to a stream */ +/* {{{ Append a filter to a stream */ PHP_FUNCTION(stream_filter_append) { apply_filter_to_stream(1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto bool stream_filter_remove(resource stream_filter) - Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource */ +/* {{{ Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource */ PHP_FUNCTION(stream_filter_remove) { zval *zfilter; @@ -1278,8 +1255,7 @@ PHP_FUNCTION(stream_filter_remove) } /* }}} */ -/* {{{ proto string stream_get_line(resource stream, int maxlen [, string ending]) - Read up to maxlen bytes from a stream or until the ending string is found */ +/* {{{ Read up to maxlen bytes from a stream or until the ending string is found */ PHP_FUNCTION(stream_get_line) { char *str = NULL; @@ -1315,8 +1291,7 @@ PHP_FUNCTION(stream_get_line) /* }}} */ -/* {{{ proto bool stream_set_blocking(resource socket, bool mode) - Set blocking/non-blocking mode on a socket or stream */ +/* {{{ Set blocking/non-blocking mode on a socket or stream */ PHP_FUNCTION(stream_set_blocking) { zval *zstream; @@ -1339,8 +1314,7 @@ PHP_FUNCTION(stream_set_blocking) /* }}} */ -/* {{{ proto bool stream_set_timeout(resource stream, int seconds [, int microseconds]) - Set timeout on stream read to seconds + microseonds */ +/* {{{ Set timeout on stream read to seconds + microseonds */ #if HAVE_SYS_TIME_H || defined(PHP_WIN32) PHP_FUNCTION(stream_set_timeout) { @@ -1388,8 +1362,7 @@ PHP_FUNCTION(stream_set_timeout) #endif /* HAVE_SYS_TIME_H || defined(PHP_WIN32) */ /* }}} */ -/* {{{ proto int stream_set_write_buffer(resource fp, int buffer) - Set file write buffer */ +/* {{{ Set file write buffer */ PHP_FUNCTION(stream_set_write_buffer) { zval *arg1; @@ -1418,8 +1391,7 @@ PHP_FUNCTION(stream_set_write_buffer) } /* }}} */ -/* {{{ proto int stream_set_chunk_size(resource fp, int chunk_size) - Set the stream chunk size */ +/* {{{ Set the stream chunk size */ PHP_FUNCTION(stream_set_chunk_size) { int ret; @@ -1453,8 +1425,7 @@ PHP_FUNCTION(stream_set_chunk_size) } /* }}} */ -/* {{{ proto int stream_set_read_buffer(resource fp, int buffer) - Set file read buffer */ +/* {{{ Set file read buffer */ PHP_FUNCTION(stream_set_read_buffer) { zval *arg1; @@ -1483,8 +1454,7 @@ PHP_FUNCTION(stream_set_read_buffer) } /* }}} */ -/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [, int cryptokind [, resource sessionstream]]) - Enable or disable a specific kind of crypto on the stream */ +/* {{{ Enable or disable a specific kind of crypto on the stream */ PHP_FUNCTION(stream_socket_enable_crypto) { zend_long cryptokind = 0; @@ -1538,8 +1508,7 @@ PHP_FUNCTION(stream_socket_enable_crypto) } /* }}} */ -/* {{{ proto string|false stream_resolve_include_path(string filename) -Determine what file will be opened by calls to fopen() with a relative path */ +/* {{{ Determine what file will be opened by calls to fopen() with a relative path */ PHP_FUNCTION(stream_resolve_include_path) { char *filename; @@ -1559,8 +1528,7 @@ PHP_FUNCTION(stream_resolve_include_path) } /* }}} */ -/* {{{ proto bool stream_is_local(resource stream|string url) U -*/ +/* {{{ */ PHP_FUNCTION(stream_is_local) { zval *zstream; @@ -1593,8 +1561,7 @@ PHP_FUNCTION(stream_is_local) } /* }}} */ -/* {{{ proto bool stream_supports_lock(resource stream) - Tells whether the stream supports locking through flock(). */ +/* {{{ Tells whether the stream supports locking through flock(). */ PHP_FUNCTION(stream_supports_lock) { php_stream *stream; @@ -1613,9 +1580,7 @@ PHP_FUNCTION(stream_supports_lock) RETURN_TRUE; } -/* {{{ proto bool stream_isatty(resource stream) -Check if a stream is a TTY. -*/ +/* {{{ Check if a stream is a TTY. */ PHP_FUNCTION(stream_isatty) { zval *zsrc; @@ -1651,8 +1616,7 @@ PHP_FUNCTION(stream_isatty) } #ifdef PHP_WIN32 -/* {{{ proto bool sapi_windows_vt100_support(resource stream[, bool enable]) - Get or set VT100 support for the specified stream associated to an +/* {{{ Get or set VT100 support for the specified stream associated to an output buffer of a Windows console. */ PHP_FUNCTION(sapi_windows_vt100_support) @@ -1713,8 +1677,7 @@ PHP_FUNCTION(sapi_windows_vt100_support) #endif #ifdef HAVE_SHUTDOWN -/* {{{ proto int stream_socket_shutdown(resource stream, int how) - causes all or part of a full-duplex connection on the socket associated +/* {{{ causes all or part of a full-duplex connection on the socket associated with stream to be shut down. If how is SHUT_RD, further receptions will be disallowed. If how is SHUT_WR, further transmissions will be disallowed. If how is SHUT_RDWR, further receptions and transmissions will be diff --git a/ext/standard/string.c b/ext/standard/string.c index 1178b08730..5650164bf6 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -69,8 +69,7 @@ #define STR_STRSPN 0 #define STR_STRCSPN 1 -/* {{{ register_string_constants - */ +/* {{{ register_string_constants */ void register_string_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("STR_PAD_LEFT", STR_PAD_LEFT, CONST_CS | CONST_PERSISTENT); @@ -106,8 +105,7 @@ ZEND_SET_ALIGNED(16, static char hexconvtab[]) = "0123456789abcdef"; static MUTEX_T locale_mutex = NULL; #endif -/* {{{ php_bin2hex - */ +/* {{{ php_bin2hex */ static zend_string *php_bin2hex(const unsigned char *old, const size_t oldlen) { zend_string *result; @@ -125,8 +123,7 @@ static zend_string *php_bin2hex(const unsigned char *old, const size_t oldlen) } /* }}} */ -/* {{{ php_hex2bin - */ +/* {{{ php_hex2bin */ static zend_string *php_hex2bin(const unsigned char *old, const size_t oldlen) { size_t target_length = oldlen >> 1; @@ -198,8 +195,7 @@ PHPAPI struct lconv *localeconv_r(struct lconv *out) /* }}} */ #ifdef ZTS -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(localeconv) { locale_mutex = tsrm_mutex_alloc(); @@ -207,8 +203,7 @@ PHP_MINIT_FUNCTION(localeconv) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(localeconv) { tsrm_mutex_free( locale_mutex ); @@ -218,8 +213,7 @@ PHP_MSHUTDOWN_FUNCTION(localeconv) /* }}} */ #endif -/* {{{ proto string bin2hex(string data) - Converts the binary representation of data to hex */ +/* {{{ Converts the binary representation of data to hex */ PHP_FUNCTION(bin2hex) { zend_string *result; @@ -235,8 +229,7 @@ PHP_FUNCTION(bin2hex) } /* }}} */ -/* {{{ proto string|false hex2bin(string data) - Converts the hex representation of data to binary */ +/* {{{ Converts the hex representation of data to binary */ PHP_FUNCTION(hex2bin) { zend_string *result, *data; @@ -319,16 +312,14 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) / } /* }}} */ -/* {{{ proto int|false strspn(string str, string mask [, int start [, int len]]) - Finds length of initial segment consisting entirely of characters found in mask. If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) */ +/* {{{ Finds length of initial segment consisting entirely of characters found in mask. If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) */ PHP_FUNCTION(strspn) { php_spn_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, STR_STRSPN); } /* }}} */ -/* {{{ proto int|false strcspn(string str, string mask [, int start [, int len]]) - Finds length of initial segment consisting entirely of characters not found in mask. If start or/and length is provide works like strcspn(substr($s,$start,$len),$bad_chars) */ +/* {{{ Finds length of initial segment consisting entirely of characters not found in mask. If start or/and length is provide works like strcspn(substr($s,$start,$len),$bad_chars) */ PHP_FUNCTION(strcspn) { php_spn_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, STR_STRCSPN); @@ -505,8 +496,7 @@ PHP_MINIT_FUNCTION(nl_langinfo) } /* }}} */ -/* {{{ proto string|false nl_langinfo(int item) - Query language and locale information */ +/* {{{ Query language and locale information */ PHP_FUNCTION(nl_langinfo) { zend_long item; @@ -692,8 +682,7 @@ PHP_FUNCTION(nl_langinfo) #endif /* }}} */ -/* {{{ proto int strcoll(string str1, string str2) - Compares two strings using the current locale */ +/* {{{ Compares two strings using the current locale */ PHP_FUNCTION(strcoll) { zend_string *s1, *s2; @@ -878,32 +867,28 @@ static zend_always_inline void php_do_trim(INTERNAL_FUNCTION_PARAMETERS, int mod } /* }}} */ -/* {{{ proto string trim(string str [, string character_mask]) - Strips whitespace from the beginning and end of a string */ +/* {{{ Strips whitespace from the beginning and end of a string */ PHP_FUNCTION(trim) { php_do_trim(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); } /* }}} */ -/* {{{ proto string rtrim(string str [, string character_mask]) - Removes trailing whitespace */ +/* {{{ Removes trailing whitespace */ PHP_FUNCTION(rtrim) { php_do_trim(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ -/* {{{ proto string ltrim(string str [, string character_mask]) - Strips whitespace from the beginning of a string */ +/* {{{ Strips whitespace from the beginning of a string */ PHP_FUNCTION(ltrim) { php_do_trim(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string wordwrap(string str [, int width [, string break [, bool cut]]]) - Wraps buffer to selected number of characters using string break char */ +/* {{{ Wraps buffer to selected number of characters using string break char */ PHP_FUNCTION(wordwrap) { zend_string *text; @@ -1046,8 +1031,7 @@ PHP_FUNCTION(wordwrap) } /* }}} */ -/* {{{ php_explode - */ +/* {{{ php_explode */ PHPAPI void php_explode(const zend_string *delim, zend_string *str, zval *return_value, zend_long limit) { const char *p1 = ZSTR_VAL(str); @@ -1074,8 +1058,7 @@ PHPAPI void php_explode(const zend_string *delim, zend_string *str, zval *return } /* }}} */ -/* {{{ php_explode_negative_limit - */ +/* {{{ php_explode_negative_limit */ PHPAPI void php_explode_negative_limit(const zend_string *delim, zend_string *str, zval *return_value, zend_long limit) { #define EXPLODE_ALLOC_STEP 64 @@ -1116,8 +1099,7 @@ PHPAPI void php_explode_negative_limit(const zend_string *delim, zend_string *st } /* }}} */ -/* {{{ proto array explode(string separator, string str [, int limit]) - Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */ +/* {{{ Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */ PHP_FUNCTION(explode) { zend_string *str, *delim; @@ -1157,12 +1139,10 @@ PHP_FUNCTION(explode) } /* }}} */ -/* {{{ proto string join([string glue,] array pieces) - An alias for implode */ +/* {{{ An alias for implode */ /* }}} */ -/* {{{ php_implode - */ +/* {{{ php_implode */ PHPAPI void php_implode(const zend_string *glue, HashTable *pieces, zval *return_value) { zval *tmp; @@ -1249,8 +1229,7 @@ PHPAPI void php_implode(const zend_string *glue, HashTable *pieces, zval *return } /* }}} */ -/* {{{ proto string implode([string glue,] array pieces) - Joins array elements placing glue string between items and return one string */ +/* {{{ Joins array elements placing glue string between items and return one string */ PHP_FUNCTION(implode) { zend_string *arg1_str = NULL; @@ -1284,8 +1263,7 @@ PHP_FUNCTION(implode) #define STRTOK_TABLE(p) BG(strtok_table)[(unsigned char) *p] -/* {{{ proto string|false strtok([string str,] string token) - Tokenize a string */ +/* {{{ Tokenize a string */ PHP_FUNCTION(strtok) { zend_string *str, *tok = NULL; @@ -1361,8 +1339,7 @@ restore: } /* }}} */ -/* {{{ php_strtoupper - */ +/* {{{ php_strtoupper */ PHPAPI char *php_strtoupper(char *s, size_t len) { unsigned char *c; @@ -1379,8 +1356,7 @@ PHPAPI char *php_strtoupper(char *s, size_t len) } /* }}} */ -/* {{{ php_string_toupper - */ +/* {{{ php_string_toupper */ PHPAPI zend_string *php_string_toupper(zend_string *s) { unsigned char *c; @@ -1412,8 +1388,7 @@ PHPAPI zend_string *php_string_toupper(zend_string *s) } /* }}} */ -/* {{{ proto string strtoupper(string str) - Makes a string uppercase */ +/* {{{ Makes a string uppercase */ PHP_FUNCTION(strtoupper) { zend_string *arg; @@ -1426,8 +1401,7 @@ PHP_FUNCTION(strtoupper) } /* }}} */ -/* {{{ php_strtolower - */ +/* {{{ php_strtolower */ PHPAPI char *php_strtolower(char *s, size_t len) { unsigned char *c; @@ -1444,8 +1418,7 @@ PHPAPI char *php_strtolower(char *s, size_t len) } /* }}} */ -/* {{{ php_string_tolower - */ +/* {{{ php_string_tolower */ PHPAPI zend_string *php_string_tolower(zend_string *s) { unsigned char *c; @@ -1481,8 +1454,7 @@ PHPAPI zend_string *php_string_tolower(zend_string *s) } /* }}} */ -/* {{{ proto string strtolower(string str) - Makes a string lowercase */ +/* {{{ Makes a string lowercase */ PHP_FUNCTION(strtolower) { zend_string *str; @@ -1495,8 +1467,7 @@ PHP_FUNCTION(strtolower) } /* }}} */ -/* {{{ php_basename - */ +/* {{{ php_basename */ PHPAPI zend_string *php_basename(const char *s, size_t len, const char *suffix, size_t suffix_len) { /* State 0 is directly after a directory separator (or at the start of the string). @@ -1570,8 +1541,7 @@ quit_loop: } /* }}} */ -/* {{{ proto string basename(string path [, string suffix]) - Returns the filename component of the path */ +/* {{{ Returns the filename component of the path */ PHP_FUNCTION(basename) { char *string, *suffix = NULL; @@ -1595,8 +1565,7 @@ PHPAPI size_t php_dirname(char *path, size_t len) } /* }}} */ -/* {{{ proto string dirname(string path[, int levels]) - Returns the directory name component of the path */ +/* {{{ Returns the directory name component of the path */ PHP_FUNCTION(dirname) { char *str; @@ -1638,8 +1607,7 @@ PHP_FUNCTION(dirname) } /* }}} */ -/* {{{ proto array|string pathinfo(string path[, int options]) - Returns information about a certain string */ +/* {{{ Returns information about a certain string */ PHP_FUNCTION(pathinfo) { zval tmp; @@ -1732,8 +1700,7 @@ PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len) } /* }}} */ -/* {{{ php_strspn - */ +/* {{{ php_strspn */ PHPAPI size_t php_strspn(const char *s1, const char *s2, const char *s1_end, const char *s2_end) { register const char *p = s1, *spanp; @@ -1750,8 +1717,7 @@ cont: } /* }}} */ -/* {{{ php_strcspn - */ +/* {{{ php_strcspn */ PHPAPI size_t php_strcspn(const char *s1, const char *s2, const char *s1_end, const char *s2_end) { register const char *p, *spanp; @@ -1770,8 +1736,7 @@ PHPAPI size_t php_strcspn(const char *s1, const char *s2, const char *s1_end, co } /* }}} */ -/* {{{ proto string|false stristr(string haystack, string needle[, bool part]) - Finds first occurrence of a string within another, case insensitive */ +/* {{{ Finds first occurrence of a string within another, case insensitive */ PHP_FUNCTION(stristr) { zend_string *haystack, *needle; @@ -1808,8 +1773,7 @@ PHP_FUNCTION(stristr) } /* }}} */ -/* {{{ proto string|false strstr(string haystack, string needle[, bool part]) - Finds first occurrence of a string within another */ +/* {{{ Finds first occurrence of a string within another */ PHP_FUNCTION(strstr) { zend_string *haystack, *needle; @@ -1838,8 +1802,7 @@ PHP_FUNCTION(strstr) } /* }}} */ -/* {{{ proto bool str_contains(string haystack, string needle) - Checks if a string contains another */ +/* {{{ Checks if a string contains another */ PHP_FUNCTION(str_contains) { zend_string *haystack, *needle; @@ -1853,8 +1816,7 @@ PHP_FUNCTION(str_contains) } /* }}} */ -/* {{{ proto bool str_starts_with(string haystack, string needle) - Checks if haystack starts with needle */ +/* {{{ Checks if haystack starts with needle */ PHP_FUNCTION(str_starts_with) { zend_string *haystack, *needle; @@ -1872,8 +1834,7 @@ PHP_FUNCTION(str_starts_with) } /* }}} */ -/* {{{ proto bool str_ends_with(string haystack, string needle) - Checks if haystack ends with needle */ +/* {{{ Checks if haystack ends with needle */ PHP_FUNCTION(str_ends_with) { zend_string *haystack, *needle; @@ -1893,12 +1854,10 @@ PHP_FUNCTION(str_ends_with) } /* }}} */ -/* {{{ proto string strchr(string haystack, string needle) - An alias for strstr */ +/* {{{ An alias for strstr */ /* }}} */ -/* {{{ proto int|false strpos(string haystack, string needle [, int offset]) - Finds position of first occurrence of a string within another */ +/* {{{ Finds position of first occurrence of a string within another */ PHP_FUNCTION(strpos) { zend_string *haystack, *needle; @@ -1932,8 +1891,7 @@ PHP_FUNCTION(strpos) } /* }}} */ -/* {{{ proto int|false stripos(string haystack, string needle [, int offset]) - Finds position of first occurrence of a string within another, case insensitive */ +/* {{{ Finds position of first occurrence of a string within another, case insensitive */ PHP_FUNCTION(stripos) { const char *found = NULL; @@ -1976,8 +1934,7 @@ PHP_FUNCTION(stripos) } /* }}} */ -/* {{{ proto int|false strrpos(string haystack, string needle [, int offset]) - Finds position of last occurrence of a string within another string */ +/* {{{ Finds position of last occurrence of a string within another string */ PHP_FUNCTION(strrpos) { zend_string *needle; @@ -2021,8 +1978,7 @@ PHP_FUNCTION(strrpos) } /* }}} */ -/* {{{ proto int|false strripos(string haystack, string needle [, int offset]) - Finds position of last occurrence of a string within another string */ +/* {{{ Finds position of last occurrence of a string within another string */ PHP_FUNCTION(strripos) { zend_string *needle; @@ -2105,8 +2061,7 @@ PHP_FUNCTION(strripos) } /* }}} */ -/* {{{ proto string|false strrchr(string haystack, string needle) - Finds the last occurrence of a character in a string within another */ +/* {{{ Finds the last occurrence of a character in a string within another */ PHP_FUNCTION(strrchr) { zend_string *haystack, *needle; @@ -2128,8 +2083,7 @@ PHP_FUNCTION(strrchr) } /* }}} */ -/* {{{ php_chunk_split - */ +/* {{{ php_chunk_split */ static zend_string *php_chunk_split(const char *src, size_t srclen, const char *end, size_t endlen, size_t chunklen) { char *q; @@ -2170,8 +2124,7 @@ static zend_string *php_chunk_split(const char *src, size_t srclen, const char * } /* }}} */ -/* {{{ proto string chunk_split(string str [, int chunklen [, string ending]]) - Returns split line */ +/* {{{ Returns split line */ PHP_FUNCTION(chunk_split) { zend_string *str; @@ -2211,8 +2164,7 @@ PHP_FUNCTION(chunk_split) } /* }}} */ -/* {{{ proto string|false substr(string str, int start [, int length]) - Returns part of a string */ +/* {{{ Returns part of a string */ PHP_FUNCTION(substr) { zend_string *str; @@ -2283,8 +2235,7 @@ truncate_len: } /* }}} */ -/* {{{ proto string|array|false substr_replace(mixed str, mixed repl, mixed start [, mixed length]) - Replaces part of a string with another string */ +/* {{{ Replaces part of a string with another string */ PHP_FUNCTION(substr_replace) { zend_string *str, *repl_str; @@ -2538,8 +2489,7 @@ PHP_FUNCTION(substr_replace) } /* }}} */ -/* {{{ proto string quotemeta(string str) - Quotes meta characters */ +/* {{{ Quotes meta characters */ PHP_FUNCTION(quotemeta) { zend_string *old; @@ -2587,8 +2537,7 @@ PHP_FUNCTION(quotemeta) } /* }}} */ -/* {{{ proto int ord(string character) - Returns ASCII value of character +/* {{{ Returns ASCII value of character Warning: This function is special-cased by zend_compile.c and so is bypassed for constant string argument */ PHP_FUNCTION(ord) { @@ -2602,8 +2551,7 @@ PHP_FUNCTION(ord) } /* }}} */ -/* {{{ proto string chr(int ascii) - Converts ASCII code to a character +/* {{{ Converts ASCII code to a character Warning: This function is special-cased by zend_compile.c and so is bypassed for constant integer argument */ PHP_FUNCTION(chr) { @@ -2633,8 +2581,7 @@ static zend_string* php_ucfirst(zend_string *str) } /* }}} */ -/* {{{ proto string ucfirst(string str) - Makes a string's first character uppercase */ +/* {{{ Makes a string's first character uppercase */ PHP_FUNCTION(ucfirst) { zend_string *str; @@ -2666,8 +2613,7 @@ static zend_string* php_lcfirst(zend_string *str) } /* }}} */ -/* {{{ proto string lcfirst(string str) - Make a string's first character lowercase */ +/* {{{ Make a string's first character lowercase */ PHP_FUNCTION(lcfirst) { zend_string *str; @@ -2684,8 +2630,7 @@ PHP_FUNCTION(lcfirst) } /* }}} */ -/* {{{ proto string ucwords(string str [, string delims]) - Uppercase the first character of every word in a string */ +/* {{{ Uppercase the first character of every word in a string */ PHP_FUNCTION(ucwords) { zend_string *str; @@ -2719,8 +2664,7 @@ PHP_FUNCTION(ucwords) } /* }}} */ -/* {{{ php_strtr - */ +/* {{{ php_strtr */ PHPAPI char *php_strtr(char *str, size_t len, const char *str_from, const char *str_to, size_t trlen) { size_t i; @@ -2754,8 +2698,7 @@ PHPAPI char *php_strtr(char *str, size_t len, const char *str_from, const char * } /* }}} */ -/* {{{ php_strtr_ex - */ +/* {{{ php_strtr_ex */ static zend_string *php_strtr_ex(zend_string *str, const char *str_from, const char *str_to, size_t trlen) { zend_string *new_str = NULL; @@ -2948,8 +2891,7 @@ static void php_strtr_array(zval *return_value, zend_string *input, HashTable *p } /* }}} */ -/* {{{ php_char_to_str_ex - */ +/* {{{ php_char_to_str_ex */ static zend_string* php_char_to_str_ex(zend_string *str, char from, char *to, size_t to_len, int case_sensitivity, zend_long *replace_count) { zend_string *result; @@ -3020,8 +2962,7 @@ static zend_string* php_char_to_str_ex(zend_string *str, char from, char *to, si } /* }}} */ -/* {{{ php_str_to_str_ex - */ +/* {{{ php_str_to_str_ex */ static zend_string *php_str_to_str_ex(zend_string *haystack, const char *needle, size_t needle_len, const char *str, size_t str_len, zend_long *replace_count) { @@ -3094,8 +3035,7 @@ nothing_todo: } /* }}} */ -/* {{{ php_str_to_str_i_ex - */ +/* {{{ php_str_to_str_i_ex */ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_haystack, zend_string *needle, const char *str, size_t str_len, zend_long *replace_count) { @@ -3189,8 +3129,7 @@ nothing_todo: } /* }}} */ -/* {{{ php_str_to_str - */ +/* {{{ php_str_to_str */ PHPAPI zend_string *php_str_to_str(const char *haystack, size_t length, const char *needle, size_t needle_len, const char *str, size_t str_len) { zend_string *new_str; @@ -3262,8 +3201,7 @@ PHPAPI zend_string *php_str_to_str(const char *haystack, size_t length, const ch } /* }}} */ -/* {{{ proto string|false strtr(string str, string from[, string to]) - Translates characters in str using given translation tables */ +/* {{{ Translates characters in str using given translation tables */ PHP_FUNCTION(strtr) { zend_string *str, *from_str = NULL; @@ -3338,8 +3276,7 @@ PHP_FUNCTION(strtr) } /* }}} */ -/* {{{ proto string strrev(string str) - Reverse a string */ +/* {{{ Reverse a string */ #if ZEND_INTRIN_SSSE3_NATIVE #include <tmmintrin.h> #elif defined(__aarch64__) @@ -3400,8 +3337,7 @@ PHP_FUNCTION(strrev) } /* }}} */ -/* {{{ php_similar_str - */ +/* {{{ php_similar_str */ static void php_similar_str(const char *txt1, size_t len1, const char *txt2, size_t len2, size_t *pos1, size_t *pos2, size_t *max, size_t *count) { const char *p, *q; @@ -3425,8 +3361,7 @@ static void php_similar_str(const char *txt1, size_t len1, const char *txt2, siz } /* }}} */ -/* {{{ php_similar_char - */ +/* {{{ php_similar_char */ static size_t php_similar_char(const char *txt1, size_t len1, const char *txt2, size_t len2) { size_t sum; @@ -3448,8 +3383,7 @@ static size_t php_similar_char(const char *txt1, size_t len1, const char *txt2, } /* }}} */ -/* {{{ proto int similar_text(string str1, string str2 [, float percent]) - Calculates the similarity between two strings */ +/* {{{ Calculates the similarity between two strings */ PHP_FUNCTION(similar_text) { zend_string *t1, *t2; @@ -3482,8 +3416,7 @@ PHP_FUNCTION(similar_text) } /* }}} */ -/* {{{ proto string addcslashes(string str, string charlist) - Escapes all chars mentioned in charlist with backslash. It creates octal representations if asked to backslash characters with 8th bit set or with ASCII<32 (except '\n', '\r', '\t' etc...) */ +/* {{{ Escapes all chars mentioned in charlist with backslash. It creates octal representations if asked to backslash characters with 8th bit set or with ASCII<32 (except '\n', '\r', '\t' etc...) */ PHP_FUNCTION(addcslashes) { zend_string *str, *what; @@ -3505,8 +3438,7 @@ PHP_FUNCTION(addcslashes) } /* }}} */ -/* {{{ proto string addslashes(string str) - Escapes single quote, double quotes and backslash characters in a string with backslashes */ +/* {{{ Escapes single quote, double quotes and backslash characters in a string with backslashes */ PHP_FUNCTION(addslashes) { zend_string *str; @@ -3523,8 +3455,7 @@ PHP_FUNCTION(addslashes) } /* }}} */ -/* {{{ proto string stripcslashes(string str) - Strips backslashes from a string. Uses C-style conventions */ +/* {{{ Strips backslashes from a string. Uses C-style conventions */ PHP_FUNCTION(stripcslashes) { zend_string *str; @@ -3538,8 +3469,7 @@ PHP_FUNCTION(stripcslashes) } /* }}} */ -/* {{{ proto string stripslashes(string str) - Strips backslashes from a string */ +/* {{{ Strips backslashes from a string */ PHP_FUNCTION(stripslashes) { zend_string *str; @@ -3553,8 +3483,7 @@ PHP_FUNCTION(stripslashes) } /* }}} */ -/* {{{ php_stripcslashes - */ +/* {{{ php_stripcslashes */ PHPAPI void php_stripcslashes(zend_string *str) { const char *source, *end; @@ -3617,8 +3546,7 @@ PHPAPI void php_stripcslashes(zend_string *str) } /* }}} */ -/* {{{ php_addcslashes_str - */ +/* {{{ php_addcslashes_str */ PHPAPI zend_string *php_addcslashes_str(const char *str, size_t len, const char *what, size_t wlength) { char flags[256]; @@ -3660,8 +3588,7 @@ PHPAPI zend_string *php_addcslashes_str(const char *str, size_t len, const char } /* }}} */ -/* {{{ php_addcslashes - */ +/* {{{ php_addcslashes */ PHPAPI zend_string *php_addcslashes(zend_string *str, const char *what, size_t wlength) { return php_addcslashes_str(ZSTR_VAL(str), ZSTR_LEN(str), what, wlength); @@ -3720,8 +3647,7 @@ PHPAPI void php_stripslashes(zend_string *str) { php_stripslashes_ptr(str); } -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(string_intrin) { if (zend_cpu_supports(ZEND_CPU_FEATURE_SSE42)) { @@ -4160,8 +4086,7 @@ PHPAPI void php_stripslashes(zend_string *str) #define _isblank(c) (((((unsigned char) c) == ' ' || ((unsigned char) c) == '\t')) ? 1 : 0) #define _isnewline(c) (((((unsigned char) c) == '\n' || ((unsigned char) c) == '\r')) ? 1 : 0) -/* {{{ php_str_replace_in_subject - */ +/* {{{ php_str_replace_in_subject */ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zend_string *subject_str, zval *result, int case_sensitivity) { zval *search_entry, @@ -4317,8 +4242,7 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zend_st } /* }}} */ -/* {{{ php_str_replace_common - */ +/* {{{ php_str_replace_common */ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensitivity) { zend_string *subject_str; @@ -4381,24 +4305,21 @@ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensit } /* }}} */ -/* {{{ proto mixed str_replace(mixed search, mixed replace, mixed subject [, int &replace_count]) - Replaces all occurrences of search in haystack with replace */ +/* {{{ Replaces all occurrences of search in haystack with replace */ PHP_FUNCTION(str_replace) { php_str_replace_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto mixed str_ireplace(mixed search, mixed replace, mixed subject [, int &replace_count]) - Replaces all occurrences of search in haystack with replace / case-insensitive */ +/* {{{ Replaces all occurrences of search in haystack with replace / case-insensitive */ PHP_FUNCTION(str_ireplace) { php_str_replace_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto string hebrev(string str [, int max_chars_per_line]) - Converts logical Hebrew text to visual text */ +/* {{{ Converts logical Hebrew text to visual text */ PHP_FUNCTION(hebrev) { char *str, *heb_str, *target; @@ -4563,8 +4484,7 @@ PHP_FUNCTION(hebrev) } /* }}} */ -/* {{{ proto string nl2br(string str [, bool is_xhtml]) - Converts newlines to HTML line breaks */ +/* {{{ Converts newlines to HTML line breaks */ PHP_FUNCTION(nl2br) { /* in brief this inserts <br /> or <br> before matched regexp \n\r?|\r\n? */ @@ -4646,8 +4566,7 @@ PHP_FUNCTION(nl2br) } /* }}} */ -/* {{{ proto string strip_tags(string str [, string allowable_tags]) - Strips HTML and PHP tags from a string */ +/* {{{ Strips HTML and PHP tags from a string */ PHP_FUNCTION(strip_tags) { zend_string *buf; @@ -4695,8 +4614,7 @@ PHP_FUNCTION(strip_tags) } /* }}} */ -/* {{{ proto string|false setlocale(int category, string locale [, string ...]) - Set locale information */ +/* {{{ Set locale information */ PHP_FUNCTION(setlocale) { zval *args = NULL; @@ -4813,8 +4731,7 @@ PHP_FUNCTION(setlocale) } /* }}} */ -/* {{{ proto void parse_str(string encoded_string, array &result) - Parses GET/POST/COOKIE data and sets global variables */ +/* {{{ Parses GET/POST/COOKIE data and sets global variables */ PHP_FUNCTION(parse_str) { char *arg; @@ -5253,8 +5170,7 @@ finish: } /* }}} */ -/* {{{ proto array str_getcsv(string input[, string delimiter[, string enclosure[, string escape]]]) -Parse a CSV string into an array */ +/* {{{ Parse a CSV string into an array */ PHP_FUNCTION(str_getcsv) { zend_string *str; @@ -5281,8 +5197,7 @@ PHP_FUNCTION(str_getcsv) } /* }}} */ -/* {{{ proto string str_repeat(string input, int mult) - Returns the input string repeat mult times */ +/* {{{ Returns the input string repeat mult times */ PHP_FUNCTION(str_repeat) { zend_string *input_str; /* Input string */ @@ -5334,8 +5249,7 @@ PHP_FUNCTION(str_repeat) } /* }}} */ -/* {{{ proto array|string count_chars(string input [, int mode]) - Returns info about what characters are used in input */ +/* {{{ Returns info about what characters are used in input */ PHP_FUNCTION(count_chars) { zend_string *input; @@ -5405,8 +5319,7 @@ PHP_FUNCTION(count_chars) } /* }}} */ -/* {{{ php_strnatcmp - */ +/* {{{ php_strnatcmp */ static void php_strnatcmp(INTERNAL_FUNCTION_PARAMETERS, int fold_case) { zend_string *s1, *s2; @@ -5448,16 +5361,14 @@ PHPAPI int string_natural_compare_function(zval *result, zval *op1, zval *op2) / } /* }}} */ -/* {{{ proto int strnatcmp(string s1, string s2) - Returns the result of string comparison using 'natural' algorithm */ +/* {{{ Returns the result of string comparison using 'natural' algorithm */ PHP_FUNCTION(strnatcmp) { php_strnatcmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto array localeconv(void) - Returns numeric formatting information based on the current locale */ +/* {{{ Returns numeric formatting information based on the current locale */ PHP_FUNCTION(localeconv) { zval grouping, mon_grouping; @@ -5511,16 +5422,14 @@ PHP_FUNCTION(localeconv) } /* }}} */ -/* {{{ proto int strnatcasecmp(string s1, string s2) - Returns the result of case-insensitive string comparison using 'natural' algorithm */ +/* {{{ Returns the result of case-insensitive string comparison using 'natural' algorithm */ PHP_FUNCTION(strnatcasecmp) { php_strnatcmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int|false substr_count(string haystack, string needle [, int offset [, int length]]) - Returns the number of times a substring occurs in the string */ +/* {{{ Returns the number of times a substring occurs in the string */ PHP_FUNCTION(substr_count) { char *haystack, *needle; @@ -5586,8 +5495,7 @@ PHP_FUNCTION(substr_count) } /* }}} */ -/* {{{ proto string str_pad(string input, int pad_length [, string pad_string [, int pad_type]]) - Returns input string padded on the left or right to specified length with pad_string */ +/* {{{ Returns input string padded on the left or right to specified length with pad_string */ PHP_FUNCTION(str_pad) { /* Input arguments */ @@ -5666,8 +5574,7 @@ PHP_FUNCTION(str_pad) } /* }}} */ -/* {{{ proto array|int|null sscanf(string str, string format [, string ...]) - Implements an ANSI C compatible sscanf */ +/* {{{ Implements an ANSI C compatible sscanf */ PHP_FUNCTION(sscanf) { zval *args = NULL; @@ -5785,8 +5692,7 @@ static zend_string *php_str_rot13(zend_string *str) } /* }}} */ -/* {{{ proto string str_rot13(string str) - Perform the rot13 transform on a string */ +/* {{{ Perform the rot13 transform on a string */ PHP_FUNCTION(str_rot13) { zend_string *arg; @@ -5824,8 +5730,7 @@ static void php_string_shuffle(char *str, zend_long len) /* {{{ */ } /* }}} */ -/* {{{ proto string str_shuffle(string str) - Shuffles string. One permutation of all possible is created */ +/* {{{ Shuffles string. One permutation of all possible is created */ PHP_FUNCTION(str_shuffle) { zend_string *arg; @@ -5841,8 +5746,7 @@ PHP_FUNCTION(str_shuffle) } /* }}} */ -/* {{{ proto array|int str_word_count(string str, [int format [, string charlist]]) - Counts the number of words inside a string. If format of 1 is specified, +/* {{{ Counts the number of words inside a string. If format of 1 is specified, then the function will return an array containing all the words found inside the string. If format of 2 is specified, then the function will return an associated array where the position of the word is the key @@ -5930,8 +5834,7 @@ PHP_FUNCTION(str_word_count) /* }}} */ -/* {{{ proto array str_split(string str [, int split_length]) - Convert a string to an array. If split_length is specified, break the string down into chunks each split_length characters long. */ +/* {{{ Convert a string to an array. If split_length is specified, break the string down into chunks each split_length characters long. */ PHP_FUNCTION(str_split) { zend_string *str; @@ -5972,8 +5875,7 @@ PHP_FUNCTION(str_split) } /* }}} */ -/* {{{ proto string|false strpbrk(string haystack, string char_list) - Search a string for any of a set of characters */ +/* {{{ Search a string for any of a set of characters */ PHP_FUNCTION(strpbrk) { zend_string *haystack, *char_list; @@ -6001,8 +5903,7 @@ PHP_FUNCTION(strpbrk) } /* }}} */ -/* {{{ proto int|false substr_compare(string main_str, string str, int offset [, int length [, bool case_sensitivity]]) - Binary safe optionally case insensitive comparison of 2 strings from an offset, up to length characters */ +/* {{{ Binary safe optionally case insensitive comparison of 2 strings from an offset, up to length characters */ PHP_FUNCTION(substr_compare) { zend_string *s1, *s2; @@ -6110,8 +6011,7 @@ static zend_string *php_utf8_decode(const char *s, size_t len) } /* }}} */ -/* {{{ proto string utf8_encode(string data) - Encodes an ISO-8859-1 string to UTF-8 */ +/* {{{ Encodes an ISO-8859-1 string to UTF-8 */ PHP_FUNCTION(utf8_encode) { char *arg; @@ -6125,8 +6025,7 @@ PHP_FUNCTION(utf8_encode) } /* }}} */ -/* {{{ proto string utf8_decode(string data) - Converts a UTF-8 encoded string to ISO-8859-1 */ +/* {{{ Converts a UTF-8 encoded string to ISO-8859-1 */ PHP_FUNCTION(utf8_decode) { char *arg; diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index 72ed5e142d..3cdba2adf2 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -29,8 +29,7 @@ #include "php.h" #include "php_string.h" -/* {{{ compare_right - */ +/* {{{ compare_right */ static int compare_right(char const **a, char const *aend, char const **b, char const *bend) { @@ -61,8 +60,7 @@ compare_right(char const **a, char const *aend, char const **b, char const *bend } /* }}} */ -/* {{{ compare_left - */ +/* {{{ compare_left */ static int compare_left(char const **a, char const *aend, char const **b, char const *bend) { @@ -86,8 +84,7 @@ compare_left(char const **a, char const *aend, char const **b, char const *bend) } /* }}} */ -/* {{{ strnatcmp_ex - */ +/* {{{ strnatcmp_ex */ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len, int fold_case) { unsigned char ca, cb; diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c index b07f6d6a51..5926abf34e 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -32,8 +32,7 @@ #include "basic_functions.h" #include "php_ext_syslog.h" -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(syslog) { /* error levels */ @@ -127,8 +126,7 @@ void php_openlog(const char *ident, int option, int facility) PG(have_called_openlog) = 1; } -/* {{{ proto bool openlog(string ident, int option, int facility) - Open connection to system logger */ +/* {{{ Open connection to system logger */ /* ** OpenLog("nettopp", $LOG_PID, $LOG_LOCAL1); ** Syslog($LOG_EMERG, "help me!") @@ -158,8 +156,7 @@ PHP_FUNCTION(openlog) } /* }}} */ -/* {{{ proto bool closelog(void) - Close connection to system logger */ +/* {{{ Close connection to system logger */ PHP_FUNCTION(closelog) { ZEND_PARSE_PARAMETERS_NONE(); @@ -173,8 +170,7 @@ PHP_FUNCTION(closelog) } /* }}} */ -/* {{{ proto bool syslog(int priority, string message) - Generate a system log message */ +/* {{{ Generate a system log message */ PHP_FUNCTION(syslog) { zend_long priority; diff --git a/ext/standard/type.c b/ext/standard/type.c index 7424aea426..5a8b2a0b9d 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -17,8 +17,7 @@ #include "php.h" #include "php_incomplete_class.h" -/* {{{ proto string gettype(mixed var) - Returns the type of the variable */ +/* {{{ Returns the type of the variable */ PHP_FUNCTION(gettype) { zval *arg; @@ -37,8 +36,7 @@ PHP_FUNCTION(gettype) } /* }}} */ -/* {{{ proto string get_debug_type(mixed var) - Returns the type of the variable resolving class names */ +/* {{{ Returns the type of the variable resolving class names */ PHP_FUNCTION(get_debug_type) { zval *arg; @@ -83,8 +81,7 @@ PHP_FUNCTION(get_debug_type) /* }}} */ -/* {{{ proto bool settype(mixed &var, string type) - Set the type of the variable */ +/* {{{ Set the type of the variable */ PHP_FUNCTION(settype) { zval *var; @@ -142,8 +139,7 @@ PHP_FUNCTION(settype) } /* }}} */ -/* {{{ proto int intval(mixed var [, int base]) - Get the integer value of a variable using the optional base for the conversion */ +/* {{{ Get the integer value of a variable using the optional base for the conversion */ PHP_FUNCTION(intval) { zval *num; @@ -202,8 +198,7 @@ PHP_FUNCTION(intval) } /* }}} */ -/* {{{ proto float floatval(mixed var) - Get the float value of a variable */ +/* {{{ Get the float value of a variable */ PHP_FUNCTION(floatval) { zval *num; @@ -216,8 +211,7 @@ PHP_FUNCTION(floatval) } /* }}} */ -/* {{{ proto bool boolval(mixed value) - Get the boolean value of a variable */ +/* {{{ Get the boolean value of a variable */ PHP_FUNCTION(boolval) { zval *value; @@ -230,8 +224,7 @@ PHP_FUNCTION(boolval) } /* }}} */ -/* {{{ proto string strval(mixed value) - Get the string value of a variable */ +/* {{{ Get the string value of a variable */ PHP_FUNCTION(strval) { zval *value; @@ -266,8 +259,7 @@ static inline void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type) } -/* {{{ proto bool is_null(mixed var) - Returns true if variable is null +/* {{{ Returns true if variable is null Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_null) { @@ -275,8 +267,7 @@ PHP_FUNCTION(is_null) } /* }}} */ -/* {{{ proto bool is_resource(mixed var) - Returns true if variable is a resource +/* {{{ Returns true if variable is a resource Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_resource) { @@ -284,8 +275,7 @@ PHP_FUNCTION(is_resource) } /* }}} */ -/* {{{ proto bool is_bool(mixed var) - Returns true if variable is a boolean +/* {{{ Returns true if variable is a boolean Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_bool) { @@ -299,8 +289,7 @@ PHP_FUNCTION(is_bool) } /* }}} */ -/* {{{ proto bool is_int(mixed var) - Returns true if variable is an integer +/* {{{ Returns true if variable is an integer Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_int) { @@ -308,8 +297,7 @@ PHP_FUNCTION(is_int) } /* }}} */ -/* {{{ proto bool is_float(mixed var) - Returns true if variable is float point +/* {{{ Returns true if variable is float point Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_float) { @@ -317,8 +305,7 @@ PHP_FUNCTION(is_float) } /* }}} */ -/* {{{ proto bool is_string(mixed var) - Returns true if variable is a string +/* {{{ Returns true if variable is a string Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_string) { @@ -326,8 +313,7 @@ PHP_FUNCTION(is_string) } /* }}} */ -/* {{{ proto bool is_array(mixed var) - Returns true if variable is an array +/* {{{ Returns true if variable is an array Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_array) { @@ -335,8 +321,7 @@ PHP_FUNCTION(is_array) } /* }}} */ -/* {{{ proto bool is_object(mixed var) - Returns true if variable is an object +/* {{{ Returns true if variable is an object Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(is_object) { @@ -344,8 +329,7 @@ PHP_FUNCTION(is_object) } /* }}} */ -/* {{{ proto bool is_numeric(mixed value) - Returns true if value is a number or a numeric string */ +/* {{{ Returns true if value is a number or a numeric string */ PHP_FUNCTION(is_numeric) { zval *arg; @@ -375,8 +359,7 @@ PHP_FUNCTION(is_numeric) } /* }}} */ -/* {{{ proto bool is_scalar(mixed value) - Returns true if value is a scalar */ +/* {{{ Returns true if value is a scalar */ PHP_FUNCTION(is_scalar) { zval *arg; @@ -401,8 +384,7 @@ PHP_FUNCTION(is_scalar) } /* }}} */ -/* {{{ proto bool is_callable(mixed var [, bool syntax_only [, string &callable_name]]) - Returns true if var is callable. */ +/* {{{ Returns true if var is callable. */ PHP_FUNCTION(is_callable) { zval *var, *callable_name = NULL; @@ -437,8 +419,7 @@ PHP_FUNCTION(is_callable) } /* }}} */ -/* {{{ proto bool is_iterable(mixed var) - Returns true if var is iterable (array or instance of Traversable). */ +/* {{{ Returns true if var is iterable (array or instance of Traversable). */ PHP_FUNCTION(is_iterable) { zval *var; @@ -451,8 +432,7 @@ PHP_FUNCTION(is_iterable) } /* }}} */ -/* {{{ proto bool is_countable(mixed var) - Returns true if var is countable (array or instance of Countable). */ +/* {{{ Returns true if var is countable (array or instance of Countable). */ PHP_FUNCTION(is_countable) { zval *var; diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c index 94684427bb..3671cc3213 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -36,8 +36,7 @@ #ifdef HAVE_GETTIMEOFDAY ZEND_TLS struct timeval prev_tv = { 0, 0 }; -/* {{{ proto string uniqid([string prefix [, bool more_entropy]]) - Generates a unique ID */ +/* {{{ Generates a unique ID */ PHP_FUNCTION(uniqid) { char *prefix = ""; diff --git a/ext/standard/url.c b/ext/standard/url.c index f4ebadf936..b149ca0580 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -28,8 +28,7 @@ #include "url.h" #include "file.h" -/* {{{ free_url - */ +/* {{{ free_url */ PHPAPI void php_url_free(php_url *theurl) { if (theurl->scheme) @@ -50,8 +49,7 @@ PHPAPI void php_url_free(php_url *theurl) } /* }}} */ -/* {{{ php_replace_controlchars_ex - */ +/* {{{ php_replace_controlchars_ex */ PHPAPI char *php_replace_controlchars_ex(char *str, size_t len) { unsigned char *s = (unsigned char *)str; @@ -83,8 +81,7 @@ PHPAPI php_url *php_url_parse(char const *str) return php_url_parse_ex(str, strlen(str)); } -/* {{{ php_url_parse - */ +/* {{{ php_url_parse */ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length) { char port_buf[6]; @@ -316,8 +313,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length) } /* }}} */ -/* {{{ proto mixed parse_url(string url, [int url_component]) - Parse a URL and return its components */ +/* {{{ Parse a URL and return its components */ PHP_FUNCTION(parse_url) { char *str; @@ -412,8 +408,7 @@ done: } /* }}} */ -/* {{{ php_htoi - */ +/* {{{ php_htoi */ static int php_htoi(char *s) { int value; @@ -545,16 +540,14 @@ static zend_always_inline zend_string *php_url_encode_impl(const char *s, size_t } /* }}} */ -/* {{{ php_url_encode - */ +/* {{{ php_url_encode */ PHPAPI zend_string *php_url_encode(char const *s, size_t len) { return php_url_encode_impl(s, len, 0); } /* }}} */ -/* {{{ proto string urlencode(string str) - URL-encodes string */ +/* {{{ URL-encodes string */ PHP_FUNCTION(urlencode) { zend_string *in_str; @@ -567,8 +560,7 @@ PHP_FUNCTION(urlencode) } /* }}} */ -/* {{{ proto string urldecode(string str) - Decodes URL-encoded string */ +/* {{{ Decodes URL-encoded string */ PHP_FUNCTION(urldecode) { zend_string *in_str, *out_str; @@ -584,8 +576,7 @@ PHP_FUNCTION(urldecode) } /* }}} */ -/* {{{ php_url_decode - */ +/* {{{ php_url_decode */ PHPAPI size_t php_url_decode(char *str, size_t len) { char *dest = str; @@ -611,16 +602,14 @@ PHPAPI size_t php_url_decode(char *str, size_t len) } /* }}} */ -/* {{{ php_raw_url_encode - */ +/* {{{ php_raw_url_encode */ PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len) { return php_url_encode_impl(s, len, 1); } /* }}} */ -/* {{{ proto string rawurlencode(string str) - URL-encodes string */ +/* {{{ URL-encodes string */ PHP_FUNCTION(rawurlencode) { zend_string *in_str; @@ -633,8 +622,7 @@ PHP_FUNCTION(rawurlencode) } /* }}} */ -/* {{{ proto string rawurldecode(string str) - Decodes URL-encodes string */ +/* {{{ Decodes URL-encodes string */ PHP_FUNCTION(rawurldecode) { zend_string *in_str, *out_str; @@ -650,8 +638,7 @@ PHP_FUNCTION(rawurldecode) } /* }}} */ -/* {{{ php_raw_url_decode - */ +/* {{{ php_raw_url_decode */ PHPAPI size_t php_raw_url_decode(char *str, size_t len) { char *dest = str; @@ -674,8 +661,7 @@ PHPAPI size_t php_raw_url_decode(char *str, size_t len) } /* }}} */ -/* {{{ proto array|false get_headers(string url[, int format[, resource context]]) - fetches all the headers sent by the server in response to a HTTP request */ +/* {{{ fetches all the headers sent by the server in response to a HTTP request */ PHP_FUNCTION(get_headers) { char *url; diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 7b3197b981..e6c87169af 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -371,8 +371,7 @@ static void filter_item_dtor(zval *zv) efree(fdat); } -/* {{{ proto object|null stream_bucket_make_writeable(resource brigade) - Return a bucket object from the brigade for operating on */ +/* {{{ Return a bucket object from the brigade for operating on */ PHP_FUNCTION(stream_bucket_make_writeable) { zval *zbrigade, zbucket; @@ -454,24 +453,21 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto void stream_bucket_prepend(resource brigade, object bucket) - Prepend bucket to brigade */ +/* {{{ Prepend bucket to brigade */ PHP_FUNCTION(stream_bucket_prepend) { php_stream_bucket_attach(0, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto void stream_bucket_append(resource brigade, object bucket) - Append bucket to brigade */ +/* {{{ Append bucket to brigade */ PHP_FUNCTION(stream_bucket_append) { php_stream_bucket_attach(1, INTERNAL_FUNCTION_PARAM_PASSTHRU); } /* }}} */ -/* {{{ proto resource stream_bucket_new(resource stream, string buffer) - Create a new bucket for use on the current stream */ +/* {{{ Create a new bucket for use on the current stream */ PHP_FUNCTION(stream_bucket_new) { zval *zstream, zbucket; @@ -507,8 +503,7 @@ PHP_FUNCTION(stream_bucket_new) } /* }}} */ -/* {{{ proto array stream_get_filters(void) - Returns a list of registered filters */ +/* {{{ Returns a list of registered filters */ PHP_FUNCTION(stream_get_filters) { zend_string *filter_name; @@ -531,8 +526,7 @@ PHP_FUNCTION(stream_get_filters) } /* }}} */ -/* {{{ proto bool stream_filter_register(string filtername, string classname) - Registers a custom filter handler class */ +/* {{{ Registers a custom filter handler class */ PHP_FUNCTION(stream_filter_register) { zend_string *filtername, *classname; diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index b00ddb520d..c62eaf5fd3 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -196,8 +196,7 @@ err: } /* }}} */ -/* {{{ proto string|false convert_uuencode(string data) - uuencode a string */ +/* {{{ uuencode a string */ PHP_FUNCTION(convert_uuencode) { zend_string *src; @@ -211,8 +210,7 @@ PHP_FUNCTION(convert_uuencode) } /* }}} */ -/* {{{ proto string|false convert_uudecode(string data) - decode a uuencoded string */ +/* {{{ decode a uuencoded string */ PHP_FUNCTION(convert_uudecode) { zend_string *src; diff --git a/ext/standard/var.c b/ext/standard/var.c index d96f373543..7a868434fd 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -16,8 +16,7 @@ +----------------------------------------------------------------------+ */ -/* {{{ includes -*/ +/* {{{ includes */ #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -203,8 +202,7 @@ again: } /* }}} */ -/* {{{ proto void var_dump(mixed var) - Dumps a string representation of variable to output */ +/* {{{ Dumps a string representation of variable to output */ PHP_FUNCTION(var_dump) { zval *args; @@ -379,8 +377,7 @@ again: } /* }}} */ -/* {{{ proto void debug_zval_dump(mixed var) - Dumps a string representation of an internal zend value to output. */ +/* {{{ Dumps a string representation of an internal zend value to output. */ PHP_FUNCTION(debug_zval_dump) { zval *args; @@ -605,8 +602,7 @@ PHPAPI void php_var_export(zval *struc, int level) /* {{{ */ } /* }}} */ -/* {{{ proto mixed var_export(mixed var [, bool return]) - Outputs or returns a string representation of a variable */ +/* {{{ Outputs or returns a string representation of a variable */ PHP_FUNCTION(var_export) { zval *var; @@ -1142,8 +1138,7 @@ PHPAPI void php_var_serialize_destroy(php_serialize_data_t d) { } } -/* {{{ proto string serialize(mixed variable) - Returns a string representation of variable (which can later be unserialized) */ +/* {{{ Returns a string representation of variable (which can later be unserialized) */ PHP_FUNCTION(serialize) { zval *struc; @@ -1171,8 +1166,7 @@ PHP_FUNCTION(serialize) } /* }}} */ -/* {{{ proto mixed unserialize(string variable_representation[, array options]) - Takes a string representation of variable and recreates it */ +/* {{{ Takes a string representation of variable and recreates it */ PHP_FUNCTION(unserialize) { char *buf = NULL; @@ -1292,8 +1286,7 @@ cleanup: } /* }}} */ -/* {{{ proto int memory_get_usage([bool real_usage]) - Returns the allocated by PHP memory */ +/* {{{ Returns the allocated by PHP memory */ PHP_FUNCTION(memory_get_usage) { zend_bool real_usage = 0; @@ -1306,8 +1299,7 @@ PHP_FUNCTION(memory_get_usage) { } /* }}} */ -/* {{{ proto int memory_get_peak_usage([bool real_usage]) - Returns the peak allocated by PHP memory */ +/* {{{ Returns the peak allocated by PHP memory */ PHP_FUNCTION(memory_get_peak_usage) { zend_bool real_usage = 0; diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c index 036575de05..d46fd26ccd 100644 --- a/ext/standard/versioning.c +++ b/ext/standard/versioning.c @@ -199,8 +199,7 @@ php_version_compare(const char *orig_ver1, const char *orig_ver2) } /* }}} */ -/* {{{ proto int|bool|null version_compare(string ver1, string ver2 [, string oper]) - Compares two "PHP-standardized" version number strings */ +/* {{{ Compares two "PHP-standardized" version number strings */ PHP_FUNCTION(version_compare) { diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index d95eb5decc..ff4acd1d6f 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -52,8 +52,7 @@ struct php_msgbuf { #define PHP_MSG_NOERROR 2 #define PHP_MSG_EXCEPT 4 -/* {{{ sysvmsg_module_entry - */ +/* {{{ sysvmsg_module_entry */ zend_module_entry sysvmsg_module_entry = { STANDARD_MODULE_HEADER, "sysvmsg", @@ -106,8 +105,7 @@ static void sysvmsg_queue_free_obj(zend_object *object) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(sysvmsg) { zend_class_entry ce; @@ -133,8 +131,7 @@ PHP_MINIT_FUNCTION(sysvmsg) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sysvmsg) { php_info_print_table_start(); @@ -143,8 +140,7 @@ PHP_MINFO_FUNCTION(sysvmsg) } /* }}} */ -/* {{{ proto bool msg_set_queue(SysvMessageQueue queue, array data) - Set information for a message queue */ +/* {{{ Set information for a message queue */ PHP_FUNCTION(msg_set_queue) { zval *queue, *data; @@ -182,8 +178,7 @@ PHP_FUNCTION(msg_set_queue) } /* }}} */ -/* {{{ proto array msg_stat_queue(SysvMessageQueue queue) - Returns information about a message queue */ +/* {{{ Returns information about a message queue */ PHP_FUNCTION(msg_stat_queue) { zval *queue; @@ -215,8 +210,7 @@ PHP_FUNCTION(msg_stat_queue) } /* }}} */ -/* {{{ proto bool msg_queue_exists(int key) - Check whether a message queue exists */ +/* {{{ Check whether a message queue exists */ PHP_FUNCTION(msg_queue_exists) { zend_long key; @@ -233,8 +227,7 @@ PHP_FUNCTION(msg_queue_exists) } /* }}} */ -/* {{{ proto SysvMessageQueue msg_get_queue(int key [, int perms]) - Attach to a message queue */ +/* {{{ Attach to a message queue */ PHP_FUNCTION(msg_get_queue) { zend_long key; @@ -262,8 +255,7 @@ PHP_FUNCTION(msg_get_queue) } /* }}} */ -/* {{{ proto bool msg_remove_queue(SysvMessageQueue queue) - Destroy the queue */ +/* {{{ Destroy the queue */ PHP_FUNCTION(msg_remove_queue) { zval *queue; @@ -283,8 +275,7 @@ PHP_FUNCTION(msg_remove_queue) } /* }}} */ -/* {{{ proto mixed msg_receive(SysvMessageQueue queue, int desiredmsgtype, int &msgtype, int maxsize, mixed &message [, bool unserialize=true [, int flags=0 [, int &errorcode]]]) - Send a message of type msgtype (must be > 0) to a message queue */ +/* {{{ Send a message of type msgtype (must be > 0) to a message queue */ PHP_FUNCTION(msg_receive) { zval *out_message, *queue, *out_msgtype, *zerrcode = NULL; @@ -367,8 +358,7 @@ PHP_FUNCTION(msg_receive) } /* }}} */ -/* {{{ proto bool msg_send(SysvMessageQueue queue, int msgtype, mixed message [, bool serialize=true [, bool blocking=true [, int errorcode]]]) - Send a message of type msgtype (must be > 0) to a message queue */ +/* {{{ Send a message of type msgtype (must be > 0) to a message queue */ PHP_FUNCTION(msg_send) { zval *message, *queue, *zerror=NULL; diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index c6c607cda0..c277009f11 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -47,8 +47,7 @@ union semun { #endif -/* {{{ sysvsem_module_entry - */ +/* {{{ sysvsem_module_entry */ zend_module_entry sysvsem_module_entry = { STANDARD_MODULE_HEADER, "sysvsem", @@ -149,8 +148,7 @@ static void sysvsem_free_obj(zend_object *object) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(sysvsem) { zend_class_entry ce; @@ -171,8 +169,7 @@ PHP_MINIT_FUNCTION(sysvsem) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sysvsem) { php_info_print_table_start(); @@ -187,8 +184,7 @@ PHP_MINFO_FUNCTION(sysvsem) #undef SETVAL_WANTS_PTR #endif -/* {{{ proto SysvSemaphore sem_get(int key [, int max_acquire [, int perm [, int auto_release]]) - Return an id for the semaphore with the given key, and allow max_acquire (default 1) processes to acquire it simultaneously */ +/* {{{ Return an id for the semaphore with the given key, and allow max_acquire (default 1) processes to acquire it simultaneously */ PHP_FUNCTION(sem_get) { zend_long key, max_acquire = 1, perm = 0666, auto_release = 1; @@ -297,8 +293,7 @@ PHP_FUNCTION(sem_get) } /* }}} */ -/* {{{ php_sysvsem_semop - */ +/* {{{ php_sysvsem_semop */ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire) { zval *arg_id; @@ -341,24 +336,21 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire) } /* }}} */ -/* {{{ proto bool sem_acquire(SysvSemaphore id) - Acquires the semaphore with the given id, blocking if necessary */ +/* {{{ Acquires the semaphore with the given id, blocking if necessary */ PHP_FUNCTION(sem_acquire) { php_sysvsem_semop(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool sem_release(SysvSemaphore id) - Releases the semaphore with the given id */ +/* {{{ Releases the semaphore with the given id */ PHP_FUNCTION(sem_release) { php_sysvsem_semop(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto bool sem_remove(SysvSemaphore id) - Removes semaphore from Unix systems */ +/* {{{ Removes semaphore from Unix systems */ /* * contributed by Gavin Sherry gavin@linuxworld.com.au diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 79fe3b20b0..e3a6d9501b 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -69,8 +69,7 @@ static void sysvshm_free_obj(zend_object *object) zend_object_std_dtor(&sysvshm->std); } -/* {{{ sysvshm_module_entry - */ +/* {{{ sysvshm_module_entry */ zend_module_entry sysvshm_module_entry = { STANDARD_MODULE_HEADER, "sysvshm", @@ -97,8 +96,7 @@ static int php_put_shm_data(sysvshm_chunk_head *ptr, zend_long key, const char * static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key); static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos); -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(sysvshm) { zend_class_entry ce; @@ -122,8 +120,7 @@ PHP_MINIT_FUNCTION(sysvshm) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(sysvshm) { php_info_print_table_start(); @@ -132,8 +129,7 @@ PHP_MINFO_FUNCTION(sysvshm) } /* }}} */ -/* {{{ proto int shm_attach(int key [, int memsize [, int perm]]) - Creates or open a shared memory segment */ +/* {{{ Creates or open a shared memory segment */ PHP_FUNCTION(shm_attach) { sysvshm_shm *shm_list_ptr; @@ -192,8 +188,7 @@ PHP_FUNCTION(shm_attach) } /* }}} */ -/* {{{ proto bool shm_detach(SysvSharedMemory shm_identifier) - Disconnects from shared memory segment */ +/* {{{ Disconnects from shared memory segment */ PHP_FUNCTION(shm_detach) { zval *shm_id; @@ -216,8 +211,7 @@ PHP_FUNCTION(shm_detach) } /* }}} */ -/* {{{ proto bool shm_remove(SysvSharedMemory shm_identifier) - Removes shared memory from Unix systems */ +/* {{{ Removes shared memory from Unix systems */ PHP_FUNCTION(shm_remove) { zval *shm_id; @@ -242,8 +236,7 @@ PHP_FUNCTION(shm_remove) } /* }}} */ -/* {{{ proto bool shm_put_var(SysvSharedMemory shm_identifier, int variable_key, mixed variable) - Inserts or updates a variable in shared memory */ +/* {{{ Inserts or updates a variable in shared memory */ PHP_FUNCTION(shm_put_var) { zval *shm_id, *arg_var; @@ -282,8 +275,7 @@ PHP_FUNCTION(shm_put_var) } /* }}} */ -/* {{{ proto mixed shm_get_var(SysvSharedMemory id, int variable_key) - Returns a variable from shared memory */ +/* {{{ Returns a variable from shared memory */ PHP_FUNCTION(shm_get_var) { zval *shm_id; @@ -324,8 +316,7 @@ PHP_FUNCTION(shm_get_var) } /* }}} */ -/* {{{ proto bool shm_has_var(SysvSharedMemory id, int variable_key) - Checks whether a specific entry exists */ +/* {{{ Checks whether a specific entry exists */ PHP_FUNCTION(shm_has_var) { zval *shm_id; @@ -346,8 +337,7 @@ PHP_FUNCTION(shm_has_var) } /* }}} */ -/* {{{ proto bool shm_remove_var(SysvSharedMemory id, int variable_key) - Removes variable from shared memory */ +/* {{{ Removes variable from shared memory */ PHP_FUNCTION(shm_remove_var) { zval *shm_id; @@ -404,8 +394,7 @@ static int php_put_shm_data(sysvshm_chunk_head *ptr, zend_long key, const char * } /* }}} */ -/* {{{ php_check_shm_data - */ +/* {{{ php_check_shm_data */ static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key) { zend_long pos; @@ -433,8 +422,7 @@ static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key) } /* }}} */ -/* {{{ php_remove_shm_data - */ +/* {{{ php_remove_shm_data */ static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos) { sysvshm_chunk *chunk_ptr, *next_chunk_ptr; diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 7084883ecf..97cb697e99 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -45,8 +45,7 @@ #define TIDY_CALL #endif -/* {{{ ext/tidy macros -*/ +/* {{{ ext/tidy macros */ #define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0) #define TIDY_SET_CONTEXT \ @@ -164,8 +163,7 @@ if (php_check_open_basedir(filename)) { \ } /* }}} */ -/* {{{ ext/tidy structs -*/ +/* {{{ ext/tidy structs */ typedef struct _PHPTidyDoc PHPTidyDoc; typedef struct _PHPTidyObj PHPTidyObj; @@ -202,8 +200,7 @@ static inline PHPTidyObj *php_tidy_fetch_object(zend_object *obj) { #define Z_TIDY_P(zv) php_tidy_fetch_object(Z_OBJ_P((zv))) /* }}} */ -/* {{{ ext/tidy prototypes -*/ +/* {{{ ext/tidy prototypes */ static zend_string *php_tidy_file_to_mem(char *, zend_bool); static void tidy_object_free_storage(zend_object *); static zend_object *tidy_object_new_node(zend_class_entry *); @@ -984,8 +981,7 @@ static int php_tidy_output_handler(void **nothing, php_output_context *output_co return status; } -/* {{{ proto bool tidy_parse_string(string input [, mixed config_options [, string encoding]]) - Parse a document stored in a string */ +/* {{{ Parse a document stored in a string */ PHP_FUNCTION(tidy_parse_string) { char *enc = NULL; @@ -1015,8 +1011,7 @@ PHP_FUNCTION(tidy_parse_string) } /* }}} */ -/* {{{ proto string tidy_get_error_buffer() - Return warnings and errors which occurred parsing the specified document*/ +/* {{{ Return warnings and errors which occurred parsing the specified document*/ PHP_FUNCTION(tidy_get_error_buffer) { TIDY_FETCH_OBJECT; @@ -1029,8 +1024,7 @@ PHP_FUNCTION(tidy_get_error_buffer) } /* }}} */ -/* {{{ proto string tidy_get_output(tidy tidy) - Return a string representing the parsed tidy markup */ +/* {{{ Return a string representing the parsed tidy markup */ PHP_FUNCTION(tidy_get_output) { TidyBuffer output; @@ -1044,8 +1038,7 @@ PHP_FUNCTION(tidy_get_output) } /* }}} */ -/* {{{ proto bool tidy_parse_file(string file [, mixed config_options [, string encoding [, bool use_include_path]]]) - Parse markup in file or URI */ +/* {{{ Parse markup in file or URI */ PHP_FUNCTION(tidy_parse_file) { char *enc = NULL; @@ -1085,8 +1078,7 @@ PHP_FUNCTION(tidy_parse_file) } /* }}} */ -/* {{{ proto bool tidy_clean_repair(tidy tidy) - Execute configured cleanup and repair operations on parsed markup */ +/* {{{ Execute configured cleanup and repair operations on parsed markup */ PHP_FUNCTION(tidy_clean_repair) { TIDY_FETCH_OBJECT; @@ -1100,24 +1092,21 @@ PHP_FUNCTION(tidy_clean_repair) } /* }}} */ -/* {{{ proto bool tidy_repair_string(string data [, mixed config_file [, string encoding]]) - Repair a string using an optionally provided configuration file */ +/* {{{ Repair a string using an optionally provided configuration file */ PHP_FUNCTION(tidy_repair_string) { php_tidy_quick_repair(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE); } /* }}} */ -/* {{{ proto bool tidy_repair_file(string filename [, mixed config_file [, string encoding [, bool use_include_path]]]) - Repair a file using an optionally provided configuration file */ +/* {{{ Repair a file using an optionally provided configuration file */ PHP_FUNCTION(tidy_repair_file) { php_tidy_quick_repair(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE); } /* }}} */ -/* {{{ proto bool tidy_diagnose() - Run configured diagnostics on parsed and repaired markup. */ +/* {{{ Run configured diagnostics on parsed and repaired markup. */ PHP_FUNCTION(tidy_diagnose) { TIDY_FETCH_OBJECT; @@ -1131,8 +1120,7 @@ PHP_FUNCTION(tidy_diagnose) } /* }}} */ -/* {{{ proto string tidy_get_release() - Get release date (version) for Tidy library */ +/* {{{ Get release date (version) for Tidy library */ PHP_FUNCTION(tidy_get_release) { if (zend_parse_parameters_none() == FAILURE) { @@ -1149,8 +1137,7 @@ PHP_FUNCTION(tidy_get_release) #ifdef HAVE_TIDYOPTGETDOC -/* {{{ proto string tidy_get_opt_doc(tidy resource, string optname) - Returns the documentation for the given option name */ +/* {{{ Returns the documentation for the given option name */ PHP_FUNCTION(tidy_get_opt_doc) { PHPTidyObj *obj; @@ -1182,8 +1169,7 @@ PHP_FUNCTION(tidy_get_opt_doc) #endif -/* {{{ proto array tidy_get_config(tidy tidy) - Get current Tidy configuration */ +/* {{{ Get current Tidy configuration */ PHP_FUNCTION(tidy_get_config) { TidyIterator itOpt; @@ -1221,8 +1207,7 @@ PHP_FUNCTION(tidy_get_config) } /* }}} */ -/* {{{ proto int tidy_get_status(tidy tidy) - Get status of specified document. */ +/* {{{ Get status of specified document. */ PHP_FUNCTION(tidy_get_status) { TIDY_FETCH_OBJECT; @@ -1231,8 +1216,7 @@ PHP_FUNCTION(tidy_get_status) } /* }}} */ -/* {{{ proto int tidy_get_html_ver(tidy tidy) - Get the Detected HTML version for the specified document. */ +/* {{{ Get the Detected HTML version for the specified document. */ PHP_FUNCTION(tidy_get_html_ver) { TIDY_FETCH_OBJECT; @@ -1241,8 +1225,7 @@ PHP_FUNCTION(tidy_get_html_ver) } /* }}} */ -/* {{{ proto bool tidy_is_xhtml(tidy tidy) - Indicates if the document is a XHTML document. */ +/* {{{ Indicates if the document is a XHTML document. */ PHP_FUNCTION(tidy_is_xhtml) { TIDY_FETCH_OBJECT; @@ -1251,8 +1234,7 @@ PHP_FUNCTION(tidy_is_xhtml) } /* }}} */ -/* {{{ proto bool tidy_is_xml(tidy tidy) - Indicates if the document is a generic (non HTML/XHTML) XML document. */ +/* {{{ Indicates if the document is a generic (non HTML/XHTML) XML document. */ PHP_FUNCTION(tidy_is_xml) { TIDY_FETCH_OBJECT; @@ -1261,8 +1243,7 @@ PHP_FUNCTION(tidy_is_xml) } /* }}} */ -/* {{{ proto int tidy_error_count(tidy tidy) - Returns the Number of Tidy errors encountered for specified document. */ +/* {{{ Returns the Number of Tidy errors encountered for specified document. */ PHP_FUNCTION(tidy_error_count) { TIDY_FETCH_OBJECT; @@ -1271,8 +1252,7 @@ PHP_FUNCTION(tidy_error_count) } /* }}} */ -/* {{{ proto int tidy_warning_count(tidy tidy) - Returns the Number of Tidy warnings encountered for specified document. */ +/* {{{ Returns the Number of Tidy warnings encountered for specified document. */ PHP_FUNCTION(tidy_warning_count) { TIDY_FETCH_OBJECT; @@ -1281,8 +1261,7 @@ PHP_FUNCTION(tidy_warning_count) } /* }}} */ -/* {{{ proto int tidy_access_count(tidy tidy) - Returns the Number of Tidy accessibility warnings encountered for specified document. */ +/* {{{ Returns the Number of Tidy accessibility warnings encountered for specified document. */ PHP_FUNCTION(tidy_access_count) { TIDY_FETCH_OBJECT; @@ -1291,8 +1270,7 @@ PHP_FUNCTION(tidy_access_count) } /* }}} */ -/* {{{ proto int tidy_config_count(tidy tidy) - Returns the Number of Tidy configuration errors encountered for specified document. */ +/* {{{ Returns the Number of Tidy configuration errors encountered for specified document. */ PHP_FUNCTION(tidy_config_count) { TIDY_FETCH_OBJECT; @@ -1301,8 +1279,7 @@ PHP_FUNCTION(tidy_config_count) } /* }}} */ -/* {{{ proto mixed tidy_getopt(string option) - Returns the value of the specified configuration option for the tidy document. */ +/* {{{ Returns the value of the specified configuration option for the tidy document. */ PHP_FUNCTION(tidy_getopt) { PHPTidyObj *obj; @@ -1460,40 +1437,35 @@ PHP_METHOD(tidy, parseString) } -/* {{{ proto TidyNode tidy_get_root() - Returns a TidyNode Object representing the root of the tidy parse tree */ +/* {{{ Returns a TidyNode Object representing the root of the tidy parse tree */ PHP_FUNCTION(tidy_get_root) { php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_root_node); } /* }}} */ -/* {{{ proto TidyNode tidy_get_html() - Returns a TidyNode Object starting from the <HTML> tag of the tidy parse tree */ +/* {{{ Returns a TidyNode Object starting from the <HTML> tag of the tidy parse tree */ PHP_FUNCTION(tidy_get_html) { php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_html_node); } /* }}} */ -/* {{{ proto TidyNode tidy_get_head() - Returns a TidyNode Object starting from the <HEAD> tag of the tidy parse tree */ +/* {{{ Returns a TidyNode Object starting from the <HEAD> tag of the tidy parse tree */ PHP_FUNCTION(tidy_get_head) { php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_head_node); } /* }}} */ -/* {{{ proto TidyNode tidy_get_body(tidy tidy) - Returns a TidyNode Object starting from the <BODY> tag of the tidy parse tree */ +/* {{{ Returns a TidyNode Object starting from the <BODY> tag of the tidy parse tree */ PHP_FUNCTION(tidy_get_body) { php_tidy_create_node(INTERNAL_FUNCTION_PARAM_PASSTHRU, is_body_node); } /* }}} */ -/* {{{ proto bool tidyNode::hasChildren() - Returns true if this node has children */ +/* {{{ Returns true if this node has children */ PHP_METHOD(tidyNode, hasChildren) { TIDY_FETCH_ONLY_OBJECT; @@ -1506,8 +1478,7 @@ PHP_METHOD(tidyNode, hasChildren) } /* }}} */ -/* {{{ proto bool tidyNode::hasSiblings() - Returns true if this node has siblings */ +/* {{{ Returns true if this node has siblings */ PHP_METHOD(tidyNode, hasSiblings) { TIDY_FETCH_ONLY_OBJECT; @@ -1520,8 +1491,7 @@ PHP_METHOD(tidyNode, hasSiblings) } /* }}} */ -/* {{{ proto bool tidyNode::isComment() - Returns true if this node represents a comment */ +/* {{{ Returns true if this node represents a comment */ PHP_METHOD(tidyNode, isComment) { TIDY_FETCH_ONLY_OBJECT; @@ -1534,8 +1504,7 @@ PHP_METHOD(tidyNode, isComment) } /* }}} */ -/* {{{ proto bool tidyNode::isHtml() - Returns true if this node is part of a HTML document */ +/* {{{ Returns true if this node is part of a HTML document */ PHP_METHOD(tidyNode, isHtml) { TIDY_FETCH_ONLY_OBJECT; @@ -1548,8 +1517,7 @@ PHP_METHOD(tidyNode, isHtml) } /* }}} */ -/* {{{ proto bool tidyNode::isText() - Returns true if this node represents text (no markup) */ +/* {{{ Returns true if this node represents text (no markup) */ PHP_METHOD(tidyNode, isText) { TIDY_FETCH_ONLY_OBJECT; @@ -1562,8 +1530,7 @@ PHP_METHOD(tidyNode, isText) } /* }}} */ -/* {{{ proto bool tidyNode::isJste() - Returns true if this node is JSTE */ +/* {{{ Returns true if this node is JSTE */ PHP_METHOD(tidyNode, isJste) { TIDY_FETCH_ONLY_OBJECT; @@ -1576,8 +1543,7 @@ PHP_METHOD(tidyNode, isJste) } /* }}} */ -/* {{{ proto bool tidyNode::isAsp() - Returns true if this node is ASP */ +/* {{{ Returns true if this node is ASP */ PHP_METHOD(tidyNode, isAsp) { TIDY_FETCH_ONLY_OBJECT; @@ -1590,8 +1556,7 @@ PHP_METHOD(tidyNode, isAsp) } /* }}} */ -/* {{{ proto bool tidyNode::isPhp() - Returns true if this node is PHP */ +/* {{{ Returns true if this node is PHP */ PHP_METHOD(tidyNode, isPhp) { TIDY_FETCH_ONLY_OBJECT; @@ -1604,8 +1569,7 @@ PHP_METHOD(tidyNode, isPhp) } /* }}} */ -/* {{{ proto tidyNode tidyNode::getParent() - Returns the parent node if available or NULL */ +/* {{{ Returns the parent node if available or NULL */ PHP_METHOD(tidyNode, getParent) { TidyNode parent_node; @@ -1628,8 +1592,7 @@ PHP_METHOD(tidyNode, getParent) /* }}} */ -/* {{{ proto tidyNode::__construct() - __constructor for tidyNode. */ +/* {{{ __constructor for tidyNode. */ PHP_METHOD(tidyNode, __construct) { zend_throw_error(NULL, "You should not create a tidyNode manually"); diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 866977397d..2656ce8f73 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -44,8 +44,7 @@ void tokenizer_token_get_all_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("TOKEN_PARSE", TOKEN_PARSE, CONST_CS|CONST_PERSISTENT); } -/* {{{ tokenizer_module_entry - */ +/* {{{ tokenizer_module_entry */ zend_module_entry tokenizer_module_entry = { STANDARD_MODULE_HEADER, "tokenizer", @@ -249,8 +248,7 @@ PHP_METHOD(PhpToken, __toString) RETURN_STR_COPY(text); } -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(tokenizer) { zend_class_entry ce; @@ -289,8 +287,7 @@ PHP_MINIT_FUNCTION(tokenizer) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(tokenizer) { php_info_print_table_start(); @@ -545,8 +542,7 @@ static zend_bool tokenize_common( /* }}} */ -/* {{{ proto array token_get_all(string source [, int flags]) - */ +/* {{{ */ PHP_FUNCTION(token_get_all) { zend_string *source; @@ -564,8 +560,7 @@ PHP_FUNCTION(token_get_all) } /* }}} */ -/* {{{ proto string token_name(int type) - */ +/* {{{ */ PHP_FUNCTION(token_name) { zend_long type; diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 9c2b5db2a8..f3c877b87e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1055,24 +1055,21 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp } /* }}} */ -/* {{{ proto resource xml_parser_create([string encoding]) - Create an XML parser */ +/* {{{ Create an XML parser */ PHP_FUNCTION(xml_parser_create) { php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource xml_parser_create_ns([string encoding [, string sep]]) - Create an XML parser */ +/* {{{ Create an XML parser */ PHP_FUNCTION(xml_parser_create_ns) { php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int xml_set_object(resource parser, object &obj) - Set up object which should be used for callbacks */ +/* {{{ Set up object which should be used for callbacks */ PHP_FUNCTION(xml_set_object) { xml_parser *parser; @@ -1091,8 +1088,7 @@ PHP_FUNCTION(xml_set_object) } /* }}} */ -/* {{{ proto int xml_set_element_handler(resource parser, string shdl, string ehdl) - Set up start and end element handlers */ +/* {{{ Set up start and end element handlers */ PHP_FUNCTION(xml_set_element_handler) { xml_parser *parser; @@ -1110,8 +1106,7 @@ PHP_FUNCTION(xml_set_element_handler) } /* }}} */ -/* {{{ proto int xml_set_character_data_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_character_data_handler) { xml_parser *parser; @@ -1128,8 +1123,7 @@ PHP_FUNCTION(xml_set_character_data_handler) } /* }}} */ -/* {{{ proto int xml_set_processing_instruction_handler(resource parser, string hdl) - Set up processing instruction (PI) handler */ +/* {{{ Set up processing instruction (PI) handler */ PHP_FUNCTION(xml_set_processing_instruction_handler) { xml_parser *parser; @@ -1146,8 +1140,7 @@ PHP_FUNCTION(xml_set_processing_instruction_handler) } /* }}} */ -/* {{{ proto int xml_set_default_handler(resource parser, string hdl) - Set up default handler */ +/* {{{ Set up default handler */ PHP_FUNCTION(xml_set_default_handler) { xml_parser *parser; @@ -1164,8 +1157,7 @@ PHP_FUNCTION(xml_set_default_handler) } /* }}} */ -/* {{{ proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) - Set up unparsed entity declaration handler */ +/* {{{ Set up unparsed entity declaration handler */ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) { xml_parser *parser; @@ -1182,8 +1174,7 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_notation_decl_handler(resource parser, string hdl) - Set up notation declaration handler */ +/* {{{ Set up notation declaration handler */ PHP_FUNCTION(xml_set_notation_decl_handler) { xml_parser *parser; @@ -1200,8 +1191,7 @@ PHP_FUNCTION(xml_set_notation_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_external_entity_ref_handler(resource parser, string hdl) - Set up external entity reference handler */ +/* {{{ Set up external entity reference handler */ PHP_FUNCTION(xml_set_external_entity_ref_handler) { xml_parser *parser; @@ -1218,8 +1208,7 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler) } /* }}} */ -/* {{{ proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_start_namespace_decl_handler) { xml_parser *parser; @@ -1236,8 +1225,7 @@ PHP_FUNCTION(xml_set_start_namespace_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) - Set up character data handler */ +/* {{{ Set up character data handler */ PHP_FUNCTION(xml_set_end_namespace_decl_handler) { xml_parser *parser; @@ -1254,8 +1242,7 @@ PHP_FUNCTION(xml_set_end_namespace_decl_handler) } /* }}} */ -/* {{{ proto int xml_parse(resource parser, string data [, bool isFinal]) - Start parsing an XML document */ +/* {{{ Start parsing an XML document */ PHP_FUNCTION(xml_parse) { xml_parser *parser; @@ -1278,8 +1265,7 @@ PHP_FUNCTION(xml_parse) /* }}} */ -/* {{{ proto int xml_parse_into_struct(resource parser, string data, array &values [, array &index ]) - Parsing a XML document */ +/* {{{ Parsing a XML document */ PHP_FUNCTION(xml_parse_into_struct) { xml_parser *parser; @@ -1326,8 +1312,7 @@ PHP_FUNCTION(xml_parse_into_struct) } /* }}} */ -/* {{{ proto int xml_get_error_code(resource parser) - Get XML parser error code */ +/* {{{ Get XML parser error code */ PHP_FUNCTION(xml_get_error_code) { xml_parser *parser; @@ -1342,8 +1327,7 @@ PHP_FUNCTION(xml_get_error_code) } /* }}} */ -/* {{{ proto string xml_error_string(int code) - Get XML parser error string */ +/* {{{ Get XML parser error string */ PHP_FUNCTION(xml_error_string) { zend_long code; @@ -1360,8 +1344,7 @@ PHP_FUNCTION(xml_error_string) } /* }}} */ -/* {{{ proto int xml_get_current_line_number(resource parser) - Get current line number for an XML parser */ +/* {{{ Get current line number for an XML parser */ PHP_FUNCTION(xml_get_current_line_number) { xml_parser *parser; @@ -1376,8 +1359,7 @@ PHP_FUNCTION(xml_get_current_line_number) } /* }}} */ -/* {{{ proto int xml_get_current_column_number(resource parser) - Get current column number for an XML parser */ +/* {{{ Get current column number for an XML parser */ PHP_FUNCTION(xml_get_current_column_number) { xml_parser *parser; @@ -1392,8 +1374,7 @@ PHP_FUNCTION(xml_get_current_column_number) } /* }}} */ -/* {{{ proto int xml_get_current_byte_index(resource parser) - Get current byte index for an XML parser */ +/* {{{ Get current byte index for an XML parser */ PHP_FUNCTION(xml_get_current_byte_index) { xml_parser *parser; @@ -1408,8 +1389,7 @@ PHP_FUNCTION(xml_get_current_byte_index) } /* }}} */ -/* {{{ proto int xml_parser_free(resource parser) - Free an XML parser */ +/* {{{ Free an XML parser */ PHP_FUNCTION(xml_parser_free) { zval *pind; @@ -1429,8 +1409,7 @@ PHP_FUNCTION(xml_parser_free) } /* }}} */ -/* {{{ proto int xml_parser_set_option(resource parser, int option, mixed value) - Set options in an XML parser */ +/* {{{ Set options in an XML parser */ PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; @@ -1479,8 +1458,7 @@ PHP_FUNCTION(xml_parser_set_option) } /* }}} */ -/* {{{ proto int xml_parser_get_option(resource parser, int option) - Get options from an XML parser */ +/* {{{ Get options from an XML parser */ PHP_FUNCTION(xml_parser_get_option) { xml_parser *parser; diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 9fb10465c3..efed79a239 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -303,8 +303,7 @@ static const zend_module_dep xmlreader_deps[] = { ZEND_MOD_END }; -/* {{{ xmlreader_module_entry - */ +/* {{{ xmlreader_module_entry */ zend_module_entry xmlreader_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, xmlreader_deps, @@ -521,8 +520,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t } /* }}} */ -/* {{{ proto bool XMLReader::close() -Closes xmlreader - current frees resources until xmlTextReaderClose is fixed in libxml */ +/* {{{ Closes xmlreader - current frees resources until xmlTextReaderClose is fixed in libxml */ PHP_METHOD(XMLReader, close) { zval *id; @@ -543,16 +541,14 @@ PHP_METHOD(XMLReader, close) } /* }}} */ -/* {{{ proto string XMLReader::getAttribute(string name) -Get value of an attribute from current element */ +/* {{{ Get value of an attribute from current element */ PHP_METHOD(XMLReader, getAttribute) { php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderGetAttribute); } /* }}} */ -/* {{{ proto string XMLReader::getAttributeNo(int index) -Get value of an attribute at index from current element */ +/* {{{ Get value of an attribute at index from current element */ PHP_METHOD(XMLReader, getAttributeNo) { zval *id; @@ -577,8 +573,7 @@ PHP_METHOD(XMLReader, getAttributeNo) } /* }}} */ -/* {{{ proto string XMLReader::getAttributeNs(string name, string namespaceURI) -Get value of a attribute via name and namespace from current element */ +/* {{{ Get value of a attribute via name and namespace from current element */ PHP_METHOD(XMLReader, getAttributeNs) { zval *id; @@ -608,8 +603,7 @@ PHP_METHOD(XMLReader, getAttributeNs) } /* }}} */ -/* {{{ proto bool XMLReader::getParserProperty(int property) -Indicates whether given property (one of the parser option constants) is set or not on parser */ +/* {{{ Indicates whether given property (one of the parser option constants) is set or not on parser */ PHP_METHOD(XMLReader, getParserProperty) { zval *id; @@ -636,8 +630,7 @@ PHP_METHOD(XMLReader, getParserProperty) } /* }}} */ -/* {{{ proto bool XMLReader::isValid() -Returns boolean indicating if parsed document is valid or not. +/* {{{ Returns boolean indicating if parsed document is valid or not. Must set XMLREADER_LOADDTD or XMLREADER_VALIDATE parser option prior to the first call to read or this method will always return FALSE */ PHP_METHOD(XMLReader, isValid) @@ -646,16 +639,14 @@ PHP_METHOD(XMLReader, isValid) } /* }}} */ -/* {{{ proto string XMLReader::lookupNamespace(string prefix) -Return namespaceURI for associated prefix on current node */ +/* {{{ Return namespaceURI for associated prefix on current node */ PHP_METHOD(XMLReader, lookupNamespace) { php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderLookupNamespace); } /* }}} */ -/* {{{ proto bool XMLReader::moveToAttribute(string name) -Positions reader at specified attribute - Returns TRUE on success and FALSE on failure */ +/* {{{ Positions reader at specified attribute - Returns TRUE on success and FALSE on failure */ PHP_METHOD(XMLReader, moveToAttribute) { zval *id; @@ -687,8 +678,7 @@ PHP_METHOD(XMLReader, moveToAttribute) } /* }}} */ -/* {{{ proto bool XMLReader::moveToAttributeNo(int index) -Positions reader at attribute at specified index. +/* {{{ Positions reader at attribute at specified index. Returns TRUE on success and FALSE on failure */ PHP_METHOD(XMLReader, moveToAttributeNo) { @@ -715,8 +705,7 @@ PHP_METHOD(XMLReader, moveToAttributeNo) } /* }}} */ -/* {{{ proto bool XMLReader::moveToAttributeNs(string name, string namespaceURI) -Positions reader at attribute spcified by name and namespaceURI. +/* {{{ Positions reader at attribute spcified by name and namespaceURI. Returns TRUE on success and FALSE on failure */ PHP_METHOD(XMLReader, moveToAttributeNs) { @@ -749,32 +738,28 @@ PHP_METHOD(XMLReader, moveToAttributeNs) } /* }}} */ -/* {{{ proto bool XMLReader::moveToElement() -Moves the position of the current instance to the node that contains the current Attribute node. */ +/* {{{ Moves the position of the current instance to the node that contains the current Attribute node. */ PHP_METHOD(XMLReader, moveToElement) { php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToElement); } /* }}} */ -/* {{{ proto bool XMLReader::moveToFirstAttribute() -Moves the position of the current instance to the first attribute associated with the current node. */ +/* {{{ Moves the position of the current instance to the first attribute associated with the current node. */ PHP_METHOD(XMLReader, moveToFirstAttribute) { php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToFirstAttribute); } /* }}} */ -/* {{{ proto bool XMLReader::moveToNextAttribute() -Moves the position of the current instance to the next attribute associated with the current node. */ +/* {{{ Moves the position of the current instance to the next attribute associated with the current node. */ PHP_METHOD(XMLReader, moveToNextAttribute) { php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderMoveToNextAttribute); } /* }}} */ -/* {{{ proto bool XMLReader::read() -Moves the position of the current instance to the next node in the stream. */ +/* {{{ Moves the position of the current instance to the next node in the stream. */ PHP_METHOD(XMLReader, read) { zval *id; @@ -801,8 +786,7 @@ PHP_METHOD(XMLReader, read) } /* }}} */ -/* {{{ proto bool XMLReader::next([string localname]) -Moves the position of the current instance to the next node in the stream. */ +/* {{{ Moves the position of the current instance to the next node in the stream. */ PHP_METHOD(XMLReader, next) { zval *id; @@ -837,8 +821,7 @@ PHP_METHOD(XMLReader, next) } /* }}} */ -/* {{{ proto bool XMLReader::open(string URI [, string encoding [, int options]]) -Sets the URI that the XMLReader will parse. */ +/* {{{ Sets the URI that the XMLReader will parse. */ PHP_METHOD(XMLReader, open) { zval *id; @@ -901,32 +884,28 @@ PHP_METHOD(XMLReader, resetState) } */ -/* {{{ proto string XMLReader::readInnerXml() -Reads the contents of the current node, including child nodes and markup. */ +/* {{{ Reads the contents of the current node, including child nodes and markup. */ PHP_METHOD(XMLReader, readInnerXml) { php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadInnerXml); } /* }}} */ -/* {{{ proto bool XMLReader::readOuterXml() -Reads the contents of the current node, including child nodes and markup. */ +/* {{{ Reads the contents of the current node, including child nodes and markup. */ PHP_METHOD(XMLReader, readOuterXml) { php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadOuterXml); } /* }}} */ -/* {{{ proto bool XMLReader::readString() -Reads the contents of an element or a text node as a string. */ +/* {{{ Reads the contents of an element or a text node as a string. */ PHP_METHOD(XMLReader, readString) { php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextReaderReadString); } /* }}} */ -/* {{{ proto bool XMLReader::setSchema(string filename) -Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). */ +/* {{{ Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). */ PHP_METHOD(XMLReader, setSchema) { #ifdef LIBXML_SCHEMAS_ENABLED @@ -967,8 +946,7 @@ PHP_METHOD(XMLReader, setSchema) } /* }}} */ -/* {{{ proto bool XMLReader::setParserProperty(int property, bool value) -Sets parser property (one of the parser option constants). +/* {{{ Sets parser property (one of the parser option constants). Properties must be set after open() or XML() and before the first read() is called */ PHP_METHOD(XMLReader, setParserProperty) { @@ -997,16 +975,14 @@ PHP_METHOD(XMLReader, setParserProperty) } /* }}} */ -/* {{{ proto bool XMLReader::setRelaxNGSchema(string filename) -Sets the string that the XMLReader will parse. */ +/* {{{ Sets the string that the XMLReader will parse. */ PHP_METHOD(XMLReader, setRelaxNGSchema) { php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE); } /* }}} */ -/* {{{ proto bool XMLReader::setRelaxNGSchemaSource(string source) -Sets the string that the XMLReader will parse. */ +/* {{{ Sets the string that the XMLReader will parse. */ PHP_METHOD(XMLReader, setRelaxNGSchemaSource) { php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING); @@ -1019,8 +995,7 @@ XMLPUBFUN int XMLCALL xmlSchemaPtr schema); */ -/* {{{ proto bool XMLReader::XML(string source [, string encoding [, int options]]) -Sets the string that the XMLReader will parse. */ +/* {{{ Sets the string that the XMLReader will parse. */ PHP_METHOD(XMLReader, XML) { zval *id; @@ -1103,8 +1078,7 @@ PHP_METHOD(XMLReader, XML) } /* }}} */ -/* {{{ proto bool XMLReader::expand() -Moves the position of the current instance to the next node in the stream. */ +/* {{{ Moves the position of the current instance to the next node in the stream. */ PHP_METHOD(XMLReader, expand) { #ifdef HAVE_DOM @@ -1153,8 +1127,7 @@ PHP_METHOD(XMLReader, expand) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(xmlreader) { @@ -1233,8 +1206,7 @@ PHP_MINIT_FUNCTION(xmlreader) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xmlreader) { zend_hash_destroy(&xmlreader_prop_handlers); @@ -1242,8 +1214,7 @@ PHP_MSHUTDOWN_FUNCTION(xmlreader) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(xmlreader) { php_info_print_table_start(); diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 0d0b92c7a4..bb93252c6e 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -173,8 +173,7 @@ static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, i } /* }}} */ -/* {{{ xmlwriter_module_entry - */ +/* {{{ xmlwriter_module_entry */ zend_module_entry xmlwriter_module_entry = { STANDARD_MODULE_HEADER, "xmlwriter", @@ -248,8 +247,7 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t RETURN_FALSE; } -/* {{{ proto bool xmlwriter_set_indent(XMLWriter xmlwriter, bool indent) -Toggle indentation on/off - returns FALSE on error */ +/* {{{ Toggle indentation on/off - returns FALSE on error */ PHP_FUNCTION(xmlwriter_set_indent) { xmlTextWriterPtr ptr; @@ -273,32 +271,28 @@ PHP_FUNCTION(xmlwriter_set_indent) } /* }}} */ -/* {{{ proto bool xmlwriter_set_indent_string(XMLWriter xmlwriter, string indentString) -Set string used for indenting - returns FALSE on error */ +/* {{{ Set string used for indenting - returns FALSE on error */ PHP_FUNCTION(xmlwriter_set_indent_string) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterSetIndentString, NULL); } /* }}} */ -/* {{{ proto bool xmlwriter_start_attribute(XMLWriter xmlwriter, string name) -Create start attribute - returns FALSE on error */ +/* {{{ Create start attribute - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_attribute) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartAttribute, "Invalid Attribute Name"); } /* }}} */ -/* {{{ proto bool xmlwriter_end_attribute(XMLWriter xmlwriter) -End attribute - returns FALSE on error */ +/* {{{ End attribute - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_attribute) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndAttribute); } /* }}} */ -/* {{{ proto bool xmlwriter_start_attribute_ns(XMLWriter xmlwriter, string prefix, string name, string uri) -Create start namespaced attribute - returns FALSE on error */ +/* {{{ Create start namespaced attribute - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_attribute_ns) { xmlTextWriterPtr ptr; @@ -326,8 +320,7 @@ PHP_FUNCTION(xmlwriter_start_attribute_ns) } /* }}} */ -/* {{{ proto bool xmlwriter_write_attribute(XMLWriter xmlwriter, string name, string content) -Write full attribute - returns FALSE on error */ +/* {{{ Write full attribute - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_attribute) { xmlTextWriterPtr ptr; @@ -355,8 +348,7 @@ PHP_FUNCTION(xmlwriter_write_attribute) } /* }}} */ -/* {{{ proto bool xmlwriter_write_attribute_ns(XMLWriter xmlwriter, string prefix, string name, string uri, string content) -Write full namespaced attribute - returns FALSE on error */ +/* {{{ Write full namespaced attribute - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_attribute_ns) { xmlTextWriterPtr ptr; @@ -384,16 +376,14 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns) } /* }}} */ -/* {{{ proto bool xmlwriter_start_element(XMLWriter xmlwriter, string name) -Create start element tag - returns FALSE on error */ +/* {{{ Create start element tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_element) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartElement, "Invalid Element Name"); } /* }}} */ -/* {{{ proto bool xmlwriter_start_element_ns(XMLWriter xmlwriter, string prefix, string name, string uri) -Create start namespaced element tag - returns FALSE on error */ +/* {{{ Create start namespaced element tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_element_ns) { xmlTextWriterPtr ptr; @@ -422,24 +412,21 @@ PHP_FUNCTION(xmlwriter_start_element_ns) } /* }}} */ -/* {{{ proto bool xmlwriter_end_element(XMLWriter xmlwriter) -End current element - returns FALSE on error */ +/* {{{ End current element - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_element) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndElement); } /* }}} */ -/* {{{ proto bool xmlwriter_full_end_element(XMLWriter xmlwriter) -End current element - returns FALSE on error */ +/* {{{ End current element - returns FALSE on error */ PHP_FUNCTION(xmlwriter_full_end_element) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterFullEndElement); } /* }}} */ -/* {{{ proto bool xmlwriter_write_element(XMLWriter xmlwriter, string name[, string content]) -Write full element tag - returns FALSE on error */ +/* {{{ Write full element tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_element) { xmlTextWriterPtr ptr; @@ -478,8 +465,7 @@ PHP_FUNCTION(xmlwriter_write_element) } /* }}} */ -/* {{{ proto bool xmlwriter_write_element_ns(XMLWriter xmlwriter, string prefix, string name, string uri[, string content]) -Write full namesapced element tag - returns FALSE on error */ +/* {{{ Write full namesapced element tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_element_ns) { xmlTextWriterPtr ptr; @@ -518,24 +504,21 @@ PHP_FUNCTION(xmlwriter_write_element_ns) } /* }}} */ -/* {{{ proto bool xmlwriter_start_pi(XMLWriter xmlwriter, string target) -Create start PI tag - returns FALSE on error */ +/* {{{ Create start PI tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_pi) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartPI, "Invalid PI Target"); } /* }}} */ -/* {{{ proto bool xmlwriter_end_pi(XMLWriter xmlwriter) -End current PI - returns FALSE on error */ +/* {{{ End current PI - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_pi) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndPI); } /* }}} */ -/* {{{ proto bool xmlwriter_write_pi(XMLWriter xmlwriter, string target, string content) -Write full PI tag - returns FALSE on error */ +/* {{{ Write full PI tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_pi) { xmlTextWriterPtr ptr; @@ -563,8 +546,7 @@ PHP_FUNCTION(xmlwriter_write_pi) } /* }}} */ -/* {{{ proto bool xmlwriter_start_cdata(XMLWriter xmlwriter) -Create start CDATA tag - returns FALSE on error */ +/* {{{ Create start CDATA tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_cdata) { xmlTextWriterPtr ptr; @@ -587,40 +569,35 @@ PHP_FUNCTION(xmlwriter_start_cdata) } /* }}} */ -/* {{{ proto bool xmlwriter_end_cdata(XMLWriter xmlwriter) -End current CDATA - returns FALSE on error */ +/* {{{ End current CDATA - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_cdata) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndCDATA); } /* }}} */ -/* {{{ proto bool xmlwriter_write_cdata(XMLWriter xmlwriter, string content) -Write full CDATA tag - returns FALSE on error */ +/* {{{ Write full CDATA tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_cdata) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteCDATA, NULL); } /* }}} */ -/* {{{ proto bool xmlwriter_write_raw(XMLWriter xmlwriter, string content) -Write text - returns FALSE on error */ +/* {{{ Write text - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_raw) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteRaw, NULL); } /* }}} */ -/* {{{ proto bool xmlwriter_text(XMLWriter xmlwriter, string content) -Write text - returns FALSE on error */ +/* {{{ Write text - returns FALSE on error */ PHP_FUNCTION(xmlwriter_text) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteString, NULL); } /* }}} */ -/* {{{ proto bool xmlwriter_start_comment(XMLWriter xmlwriter) -Create start comment - returns FALSE on error */ +/* {{{ Create start comment - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_comment) { xmlTextWriterPtr ptr; @@ -643,24 +620,21 @@ PHP_FUNCTION(xmlwriter_start_comment) } /* }}} */ -/* {{{ proto bool xmlwriter_end_comment(XMLWriter xmlwriter) -Create end comment - returns FALSE on error */ +/* {{{ Create end comment - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_comment) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndComment); } /* }}} */ -/* {{{ proto bool xmlwriter_write_comment(XMLWriter xmlwriter, string content) -Write full comment tag - returns FALSE on error */ +/* {{{ Write full comment tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_comment) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteComment, NULL); } /* }}} */ -/* {{{ proto bool xmlwriter_start_document(XMLWriter xmlwriter, string version, string encoding, string standalone) -Create document tag - returns FALSE on error */ +/* {{{ Create document tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_document) { xmlTextWriterPtr ptr; @@ -685,16 +659,14 @@ PHP_FUNCTION(xmlwriter_start_document) } /* }}} */ -/* {{{ proto bool xmlwriter_end_document(XMLWriter xmlwriter) -End current document - returns FALSE on error */ +/* {{{ End current document - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_document) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDocument); } /* }}} */ -/* {{{ proto bool xmlwriter_start_dtd(XMLWriter xmlwriter, string name, string pubid, string sysid) -Create start DTD tag - returns FALSE on error */ +/* {{{ Create start DTD tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_dtd) { xmlTextWriterPtr ptr; @@ -719,16 +691,14 @@ PHP_FUNCTION(xmlwriter_start_dtd) } /* }}} */ -/* {{{ proto bool xmlwriter_end_dtd(XMLWriter xmlwriter) -End current DTD - returns FALSE on error */ +/* {{{ End current DTD - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_dtd) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTD); } /* }}} */ -/* {{{ proto bool xmlwriter_write_dtd(XMLWriter xmlwriter, string name, string pubid, string sysid, string subset) -Write full DTD tag - returns FALSE on error */ +/* {{{ Write full DTD tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_dtd) { xmlTextWriterPtr ptr; @@ -753,24 +723,21 @@ PHP_FUNCTION(xmlwriter_write_dtd) } /* }}} */ -/* {{{ proto bool xmlwriter_start_dtd_element(XMLWriter xmlwriter, string name) -Create start DTD element - returns FALSE on error */ +/* {{{ Create start DTD element - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_dtd_element) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDElement, "Invalid Element Name"); } /* }}} */ -/* {{{ proto bool xmlwriter_end_dtd_element(XMLWriter xmlwriter) -End current DTD element - returns FALSE on error */ +/* {{{ End current DTD element - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_dtd_element) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDElement); } /* }}} */ -/* {{{ proto bool xmlwriter_write_dtd_element(XMLWriter xmlwriter, string name, string content) -Write full DTD element tag - returns FALSE on error */ +/* {{{ Write full DTD element tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_dtd_element) { xmlTextWriterPtr ptr; @@ -798,24 +765,21 @@ PHP_FUNCTION(xmlwriter_write_dtd_element) } /* }}} */ -/* {{{ proto bool xmlwriter_start_dtd_attlist(XMLWriter xmlwriter, string name) -Create start DTD AttList - returns FALSE on error */ +/* {{{ Create start DTD AttList - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_dtd_attlist) { php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDAttlist, "Invalid Element Name"); } /* }}} */ -/* {{{ proto bool xmlwriter_end_dtd_attlist(XMLWriter xmlwriter) -End current DTD AttList - returns FALSE on error */ +/* {{{ End current DTD AttList - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_dtd_attlist) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDAttlist); } /* }}} */ -/* {{{ proto bool xmlwriter_write_dtd_attlist(XMLWriter xmlwriter, string name, string content) -Write full DTD AttList tag - returns FALSE on error */ +/* {{{ Write full DTD AttList tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_dtd_attlist) { xmlTextWriterPtr ptr; @@ -843,8 +807,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_attlist) } /* }}} */ -/* {{{ proto bool xmlwriter_start_dtd_entity(XMLWriter xmlwriter, string name, bool isparam) -Create start DTD Entity - returns FALSE on error */ +/* {{{ Create start DTD Entity - returns FALSE on error */ PHP_FUNCTION(xmlwriter_start_dtd_entity) { xmlTextWriterPtr ptr; @@ -872,16 +835,14 @@ PHP_FUNCTION(xmlwriter_start_dtd_entity) } /* }}} */ -/* {{{ proto bool xmlwriter_end_dtd_entity(XMLWriter xmlwriter) -End current DTD Entity - returns FALSE on error */ +/* {{{ End current DTD Entity - returns FALSE on error */ PHP_FUNCTION(xmlwriter_end_dtd_entity) { php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDEntity); } /* }}} */ -/* {{{ proto bool xmlwriter_write_dtd_entity(XMLWriter xmlwriter, string name, string content [, bool pe [, string pubid [, string sysid [, string ndataid]]]]) -Write full DTD Entity tag - returns FALSE on error */ +/* {{{ Write full DTD Entity tag - returns FALSE on error */ PHP_FUNCTION(xmlwriter_write_dtd_entity) { xmlTextWriterPtr ptr; @@ -914,8 +875,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_entity) } /* }}} */ -/* {{{ proto XMLWriter xmlwriter_open_uri(string source) -Create new xmlwriter using source uri for output */ +/* {{{ Create new xmlwriter using source uri for output */ PHP_FUNCTION(xmlwriter_open_uri) { char *valid_file = NULL; @@ -971,8 +931,7 @@ PHP_FUNCTION(xmlwriter_open_uri) } /* }}} */ -/* {{{ proto XMLWriter xmlwriter_open_memory() -Create new xmlwriter using memory for string output */ +/* {{{ Create new xmlwriter using memory for string output */ PHP_FUNCTION(xmlwriter_open_memory) { xmlTextWriterPtr ptr; @@ -1056,24 +1015,21 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string) } /* }}} */ -/* {{{ proto string xmlwriter_output_memory(XMLWriter xmlwriter [,bool flush]) -Output current buffer as string */ +/* {{{ Output current buffer as string */ PHP_FUNCTION(xmlwriter_output_memory) { php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto mixed xmlwriter_flush(XMLWriter xmlwriter [,bool empty]) -Output current buffer */ +/* {{{ Output current buffer */ PHP_FUNCTION(xmlwriter_flush) { php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(xmlwriter) { zend_class_entry ce; @@ -1091,16 +1047,14 @@ static PHP_MINIT_FUNCTION(xmlwriter) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(xmlwriter) { return SUCCESS; } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(xmlwriter) { php_info_print_table_start(); diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 0384334a7a..c8d20e0e94 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -41,8 +41,7 @@ static const zend_module_dep xsl_deps[] = { ZEND_MOD_END }; -/* {{{ xsl_module_entry - */ +/* {{{ xsl_module_entry */ zend_module_entry xsl_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, xsl_deps, @@ -118,8 +117,7 @@ zend_object *xsl_objects_new(zend_class_entry *class_type) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(xsl) { @@ -229,8 +227,7 @@ void php_xsl_create_object(xsltStylesheetPtr obj, zval *wrapper_in, zval *return } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xsl) { xsltUnregisterExtModuleFunction ((const xmlChar *) "functionString", @@ -244,8 +241,7 @@ PHP_MSHUTDOWN_FUNCTION(xsl) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(xsl) { php_info_print_table_start(); diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index 968ed2f3d7..882adc1ee6 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -312,8 +312,7 @@ void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* {{ } /* }}} */ -/* {{{ proto void XSLTProcessor::importStylesheet(domdocument doc) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since: */ PHP_METHOD(XSLTProcessor, importStylesheet) @@ -539,8 +538,7 @@ static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, xsltStyl } /* }}} */ -/* {{{ proto domdocument XSLTProcessor::transformToDoc(domnode doc) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# +/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since: */ PHP_METHOD(XSLTProcessor, transformToDoc) @@ -596,8 +594,7 @@ PHP_METHOD(XSLTProcessor, transformToDoc) } /* }}} end XSLTProcessor::transformToDoc */ -/* {{{ proto int XSLTProcessor::transformToUri(domdocument doc, string uri) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, transformToUri) { zval *id, *docp = NULL; @@ -628,8 +625,7 @@ PHP_METHOD(XSLTProcessor, transformToUri) } /* }}} end XSLTProcessor::transformToUri */ -/* {{{ proto string XSLTProcessor::transformToXml(domdocument doc) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, transformToXml) { zval *id, *docp = NULL; @@ -666,8 +662,7 @@ PHP_METHOD(XSLTProcessor, transformToXml) } /* }}} end XSLTProcessor::transformToXml */ -/* {{{ proto bool XSLTProcessor::setParameter(string namespace, mixed name [, string value]) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, setParameter) { @@ -711,8 +706,7 @@ PHP_METHOD(XSLTProcessor, setParameter) } /* }}} end XSLTProcessor::setParameter */ -/* {{{ proto string XSLTProcessor::getParameter(string namespace, string name) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, getParameter) { zval *id = ZEND_THIS; @@ -734,8 +728,7 @@ PHP_METHOD(XSLTProcessor, getParameter) } /* }}} end XSLTProcessor::getParameter */ -/* {{{ proto bool XSLTProcessor::removeParameter(string namespace, string name) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, removeParameter) { zval *id = ZEND_THIS; @@ -756,8 +749,7 @@ PHP_METHOD(XSLTProcessor, removeParameter) } /* }}} end XSLTProcessor::removeParameter */ -/* {{{ proto void XSLTProcessor::registerPHPFunctions([mixed $restrict]) -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, registerPHPFunctions) { zval *id = ZEND_THIS; @@ -795,7 +787,7 @@ PHP_METHOD(XSLTProcessor, registerPHPFunctions) } /* }}} end XSLTProcessor::registerPHPFunctions(); */ -/* {{{ proto bool XSLTProcessor::setProfiling(string filename) */ +/* {{{ */ PHP_METHOD(XSLTProcessor, setProfiling) { zval *id = ZEND_THIS; @@ -821,7 +813,7 @@ PHP_METHOD(XSLTProcessor, setProfiling) } /* }}} end XSLTProcessor::setProfiling */ -/* {{{ proto int XSLTProcessor::setSecurityPrefs(int securityPrefs) */ +/* {{{ */ PHP_METHOD(XSLTProcessor, setSecurityPrefs) { zval *id = ZEND_THIS; @@ -840,7 +832,7 @@ PHP_METHOD(XSLTProcessor, setSecurityPrefs) } /* }}} end XSLTProcessor::setSecurityPrefs */ -/* {{{ proto int XSLTProcessor::getSecurityPrefs() */ +/* {{{ */ PHP_METHOD(XSLTProcessor, getSecurityPrefs) { zval *id = ZEND_THIS; @@ -856,8 +848,7 @@ PHP_METHOD(XSLTProcessor, getSecurityPrefs) } /* }}} end XSLTProcessor::getSecurityPrefs */ -/* {{{ proto bool XSLTProcessor::hasExsltSupport() -*/ +/* {{{ */ PHP_METHOD(XSLTProcessor, hasExsltSupport) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 92408866d6..baff391f9e 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -99,8 +99,7 @@ ZEND_FUNCTION(zend_terminate_string) ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0'; } -/* {{{ proto void zend_leak_bytes([int num_bytes]) - Cause an intentional memory leak, for testing/debugging purposes */ +/* {{{ Cause an intentional memory leak, for testing/debugging purposes */ ZEND_FUNCTION(zend_leak_bytes) { zend_long leakbytes = 3; @@ -113,8 +112,7 @@ ZEND_FUNCTION(zend_leak_bytes) } /* }}} */ -/* {{{ proto void zend_leak_variable(mixed variable) - Leak a refcounted variable */ +/* {{{ Leak a refcounted variable */ ZEND_FUNCTION(zend_leak_variable) { zval *zv; diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 83b600e265..c6a905aa0d 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1101,8 +1101,7 @@ static PHP_MSHUTDOWN_FUNCTION(zip); static PHP_MINFO_FUNCTION(zip); /* }}} */ -/* {{{ zip_module_entry - */ +/* {{{ zip_module_entry */ zend_module_entry zip_module_entry = { STANDARD_MODULE_HEADER, "zip", @@ -1122,8 +1121,7 @@ ZEND_GET_MODULE(zip) #endif /* set macro */ -/* {{{ proto resource zip_open(string filename) -Create new zip using source uri for output */ +/* {{{ Create new zip using source uri for output */ PHP_FUNCTION(zip_open) { char resolved_path[MAXPATHLEN + 1]; @@ -1163,8 +1161,7 @@ PHP_FUNCTION(zip_open) } /* }}} */ -/* {{{ proto void zip_close(resource zip) - Close a Zip archive */ +/* {{{ Close a Zip archive */ PHP_FUNCTION(zip_close) { zval * zip; @@ -1183,8 +1180,7 @@ PHP_FUNCTION(zip_close) } /* }}} */ -/* {{{ proto resource zip_read(resource zip) - Returns the next file in the archive */ +/* {{{ Returns the next file in the archive */ PHP_FUNCTION(zip_read) { zval *zip_dp; @@ -1229,8 +1225,7 @@ PHP_FUNCTION(zip_read) } /* }}} */ -/* {{{ proto bool zip_entry_open(resource zip_dp, resource zip_entry [, string mode]) - Open a Zip File, pointed by the resource entry */ +/* {{{ Open a Zip File, pointed by the resource entry */ /* Dummy function to follow the old API */ PHP_FUNCTION(zip_entry_open) { @@ -1261,8 +1256,7 @@ PHP_FUNCTION(zip_entry_open) } /* }}} */ -/* {{{ proto bool zip_entry_close(resource zip_ent) - Close a zip entry */ +/* {{{ Close a zip entry */ PHP_FUNCTION(zip_entry_close) { zval * zip_entry; @@ -1280,8 +1274,7 @@ PHP_FUNCTION(zip_entry_close) } /* }}} */ -/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len]) - Read from an open directory entry */ +/* {{{ Read from an open directory entry */ PHP_FUNCTION(zip_entry_read) { zval * zip_entry; @@ -1374,40 +1367,35 @@ static void php_zip_entry_get_info(INTERNAL_FUNCTION_PARAMETERS, int opt) /* {{{ } /* }}} */ -/* {{{ proto string zip_entry_name(resource zip_entry) - Return the name given a ZZip entry */ +/* {{{ Return the name given a ZZip entry */ PHP_FUNCTION(zip_entry_name) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto int zip_entry_compressedsize(resource zip_entry) - Return the compressed size of a ZZip entry */ +/* {{{ Return the compressed size of a ZZip entry */ PHP_FUNCTION(zip_entry_compressedsize) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto int zip_entry_filesize(resource zip_entry) - Return the actual filesize of a ZZip entry */ +/* {{{ Return the actual filesize of a ZZip entry */ PHP_FUNCTION(zip_entry_filesize) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ -/* {{{ proto string zip_entry_compressionmethod(resource zip_entry) - Return a string containing the compression method used on a particular entry */ +/* {{{ Return a string containing the compression method used on a particular entry */ PHP_FUNCTION(zip_entry_compressionmethod) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); } /* }}} */ -/* {{{ proto mixed ZipArchive::open(string source [, int flags]) -Create new zip using source uri for output, return TRUE on success or the error code */ +/* {{{ Create new zip using source uri for output, return TRUE on success or the error code */ PHP_METHOD(ZipArchive, open) { struct zip *intern; @@ -1482,8 +1470,7 @@ PHP_METHOD(ZipArchive, open) } /* }}} */ -/* {{{ proto resource ZipArchive::setPassword(string password) -Set the password for the active archive */ +/* {{{ Set the password for the active archive */ PHP_METHOD(ZipArchive, setPassword) { struct zip *intern; @@ -1510,8 +1497,7 @@ PHP_METHOD(ZipArchive, setPassword) } /* }}} */ -/* {{{ proto bool ZipArchive::close() -close the zip archive */ +/* {{{ close the zip archive */ PHP_METHOD(ZipArchive, close) { struct zip *intern; @@ -1562,8 +1548,7 @@ PHP_METHOD(ZipArchive, close) } /* }}} */ -/* {{{ proto bool ZipArchive::count() -close the zip archive */ +/* {{{ close the zip archive */ PHP_METHOD(ZipArchive, count) { struct zip *intern; @@ -1581,8 +1566,7 @@ PHP_METHOD(ZipArchive, count) } /* }}} */ -/* {{{ proto string ZipArchive::getStatusString() - * Returns the status error message, system and/or zip messages */ +/* {{{ Returns the status error message, system and/or zip messages */ PHP_METHOD(ZipArchive, getStatusString) { zval *self = ZEND_THIS; @@ -1625,8 +1609,7 @@ PHP_METHOD(ZipArchive, getStatusString) } /* }}} */ -/* {{{ proto bool ZipArchive::addEmptyDir(string dirname [, bool flags = 0]) -Returns the index of the entry named filename in the archive */ +/* {{{ Returns the index of the entry named filename in the archive */ PHP_METHOD(ZipArchive, addEmptyDir) { struct zip *intern; @@ -1782,24 +1765,21 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* } /* }}} */ -/* {{{ proto bool ZipArchive::addGlob(string pattern[,int flags [, array options]]) -Add files matching the glob pattern. See php's glob for the pattern syntax. */ +/* {{{ Add files matching the glob pattern. See php's glob for the pattern syntax. */ PHP_METHOD(ZipArchive, addGlob) { php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto bool ZipArchive::addPattern(string pattern[, string path [, array options]]) -Add files matching the pcre pattern. See php's pcre for the pattern syntax. */ +/* {{{ Add files matching the pcre pattern. See php's pcre for the pattern syntax. */ PHP_METHOD(ZipArchive, addPattern) { php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } /* }}} */ -/* {{{ proto bool ZipArchive::addFile(string filepath[, string entryname[, int start [, int length [, int flags = FL_OVERWRITE]]]]) -Add a file in a Zip archive using its path and the name to use. */ +/* {{{ Add a file in a Zip archive using its path and the name to use. */ PHP_METHOD(ZipArchive, addFile) { zval *self = ZEND_THIS; @@ -1833,8 +1813,7 @@ PHP_METHOD(ZipArchive, addFile) } /* }}} */ -/* {{{ proto bool ZipArchive::replaceFile(string filepath, int index[, int start [, int length [, int flags = 0]]]) -Add a file in a Zip archive using its path and the name to use. */ +/* {{{ Add a file in a Zip archive using its path and the name to use. */ PHP_METHOD(ZipArchive, replaceFile) { zval *self = ZEND_THIS; @@ -1867,8 +1846,7 @@ PHP_METHOD(ZipArchive, replaceFile) } /* }}} */ -/* {{{ proto bool ZipArchive::addFromString(string name, string content [, int flags = FL_OVERWRITE]) -Add a file using content and the entry name */ +/* {{{ Add a file using content and the entry name */ PHP_METHOD(ZipArchive, addFromString) { struct zip *intern; @@ -1917,8 +1895,7 @@ PHP_METHOD(ZipArchive, addFromString) } /* }}} */ -/* {{{ proto array ZipArchive::statName(string filename[, int flags]) -Returns the information about a the zip entry filename */ +/* {{{ Returns the information about a the zip entry filename */ PHP_METHOD(ZipArchive, statName) { struct zip *intern; @@ -1939,8 +1916,7 @@ PHP_METHOD(ZipArchive, statName) } /* }}} */ -/* {{{ proto resource ZipArchive::statIndex(int index[, int flags]) -Returns the zip entry information using its index */ +/* {{{ Returns the zip entry information using its index */ PHP_METHOD(ZipArchive, statIndex) { struct zip *intern; @@ -1963,8 +1939,7 @@ PHP_METHOD(ZipArchive, statIndex) } /* }}} */ -/* {{{ proto int ZipArchive::locateName(string filename[, int flags]) -Returns the index of the entry named filename in the archive */ +/* {{{ Returns the index of the entry named filename in the archive */ PHP_METHOD(ZipArchive, locateName) { struct zip *intern; @@ -1993,8 +1968,7 @@ PHP_METHOD(ZipArchive, locateName) } /* }}} */ -/* {{{ proto string ZipArchive::getNameIndex(int index [, int flags]) -Returns the name of the file at position index */ +/* {{{ Returns the name of the file at position index */ PHP_METHOD(ZipArchive, getNameIndex) { struct zip *intern; @@ -2019,8 +1993,7 @@ PHP_METHOD(ZipArchive, getNameIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::setArchiveComment(string comment) -Set or remove (NULL/'') the comment of the archive */ +/* {{{ Set or remove (NULL/'') the comment of the archive */ PHP_METHOD(ZipArchive, setArchiveComment) { struct zip *intern; @@ -2047,8 +2020,7 @@ PHP_METHOD(ZipArchive, setArchiveComment) } /* }}} */ -/* {{{ proto string ZipArchive::getArchiveComment([int flags]) -Returns the comment of an entry using its index */ +/* {{{ Returns the comment of an entry using its index */ PHP_METHOD(ZipArchive, getArchiveComment) { struct zip *intern; @@ -2071,8 +2043,7 @@ PHP_METHOD(ZipArchive, getArchiveComment) } /* }}} */ -/* {{{ proto bool ZipArchive::setCommentName(string name, string comment) -Set or remove (NULL/'') the comment of an entry using its Name */ +/* {{{ Set or remove (NULL/'') the comment of an entry using its Name */ PHP_METHOD(ZipArchive, setCommentName) { struct zip *intern; @@ -2105,8 +2076,7 @@ PHP_METHOD(ZipArchive, setCommentName) } /* }}} */ -/* {{{ proto bool ZipArchive::setCommentIndex(int index, string comment) -Set or remove (NULL/'') the comment of an entry using its index */ +/* {{{ Set or remove (NULL/'') the comment of an entry using its index */ PHP_METHOD(ZipArchive, setCommentIndex) { struct zip *intern; @@ -2136,8 +2106,7 @@ PHP_METHOD(ZipArchive, setCommentIndex) /* those constants/functions are only available in libzip since 0.11.2 */ #ifdef ZIP_OPSYS_DEFAULT -/* {{{ proto bool ZipArchive::setExternalAttributesName(string name, int opsys, int attr [, int flags]) -Set external attributes for file in zip, using its name */ +/* {{{ Set external attributes for file in zip, using its name */ PHP_METHOD(ZipArchive, setExternalAttributesName) { struct zip *intern; @@ -2170,8 +2139,7 @@ PHP_METHOD(ZipArchive, setExternalAttributesName) } /* }}} */ -/* {{{ proto bool ZipArchive::setExternalAttributesIndex(int index, int opsys, int attr [, int flags]) -Set external attributes for file in zip, using its index */ +/* {{{ Set external attributes for file in zip, using its index */ PHP_METHOD(ZipArchive, setExternalAttributesIndex) { struct zip *intern; @@ -2195,8 +2163,7 @@ PHP_METHOD(ZipArchive, setExternalAttributesIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::getExternalAttributesName(string name, int &opsys, int &attr [, int flags]) -Get external attributes for file in zip, using its name */ +/* {{{ Get external attributes for file in zip, using its name */ PHP_METHOD(ZipArchive, getExternalAttributesName) { struct zip *intern; @@ -2233,8 +2200,7 @@ PHP_METHOD(ZipArchive, getExternalAttributesName) } /* }}} */ -/* {{{ proto bool ZipArchive::getExternalAttributesIndex(int index, int &opsys, int &attr [, int flags]) -Get external attributes for file in zip, using its index */ +/* {{{ Get external attributes for file in zip, using its index */ PHP_METHOD(ZipArchive, getExternalAttributesIndex) { struct zip *intern; @@ -2264,8 +2230,7 @@ PHP_METHOD(ZipArchive, getExternalAttributesIndex) #endif /* ifdef ZIP_OPSYS_DEFAULT */ #ifdef HAVE_ENCRYPTION -/* {{{ proto bool ZipArchive::setEncryptionName(string name, int method, [string password]) -Set encryption method for file in zip, using its name */ +/* {{{ Set encryption method for file in zip, using its name */ PHP_METHOD(ZipArchive, setEncryptionName) { struct zip *intern; @@ -2298,8 +2263,7 @@ PHP_METHOD(ZipArchive, setEncryptionName) } /* }}} */ -/* {{{ proto bool ZipArchive::setEncryptionIndex(int index, int method, [string password]) -Set encryption method for file in zip, using its index */ +/* {{{ Set encryption method for file in zip, using its index */ PHP_METHOD(ZipArchive, setEncryptionIndex) { struct zip *intern; @@ -2323,8 +2287,7 @@ PHP_METHOD(ZipArchive, setEncryptionIndex) /* }}} */ #endif -/* {{{ proto string ZipArchive::getCommentName(string name[, int flags]) -Returns the comment of an entry using its name */ +/* {{{ Returns the comment of an entry using its name */ PHP_METHOD(ZipArchive, getCommentName) { struct zip *intern; @@ -2358,8 +2321,7 @@ PHP_METHOD(ZipArchive, getCommentName) } /* }}} */ -/* {{{ proto string ZipArchive::getCommentIndex(int index[, int flags]) -Returns the comment of an entry using its index */ +/* {{{ Returns the comment of an entry using its index */ PHP_METHOD(ZipArchive, getCommentIndex) { struct zip *intern; @@ -2382,8 +2344,7 @@ PHP_METHOD(ZipArchive, getCommentIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::setCompressionName(string name, int comp_method[, int comp_flags]) -Set the compression of a file in zip, using its name */ +/* {{{ Set the compression of a file in zip, using its name */ PHP_METHOD(ZipArchive, setCompressionName) { struct zip *intern; @@ -2417,8 +2378,7 @@ PHP_METHOD(ZipArchive, setCompressionName) } /* }}} */ -/* {{{ proto bool ZipArchive::setCompressionIndex(int index, int comp_method[, int comp_flags]) -Set the compression of a file in zip, using its index */ +/* {{{ Set the compression of a file in zip, using its index */ PHP_METHOD(ZipArchive, setCompressionIndex) { struct zip *intern; @@ -2442,8 +2402,7 @@ PHP_METHOD(ZipArchive, setCompressionIndex) /* }}} */ #ifdef HAVE_SET_MTIME -/* {{{ proto bool ZipArchive::setMtimeName(string name, int timestamp[, int flags]) -Set the modification time of a file in zip, using its name */ +/* {{{ Set the modification time of a file in zip, using its name */ PHP_METHOD(ZipArchive, setMtimeName) { struct zip *intern; @@ -2477,8 +2436,7 @@ PHP_METHOD(ZipArchive, setMtimeName) } /* }}} */ -/* {{{ proto bool ZipArchive::setMtimeIndex(int index, int timestamp[, int flags]) -Set the modification time of a file in zip, using its index */ +/* {{{ Set the modification time of a file in zip, using its index */ PHP_METHOD(ZipArchive, setMtimeIndex) { struct zip *intern; @@ -2502,8 +2460,7 @@ PHP_METHOD(ZipArchive, setMtimeIndex) /* }}} */ #endif -/* {{{ proto bool ZipArchive::deleteIndex(int index) -Delete a file using its index */ +/* {{{ Delete a file using its index */ PHP_METHOD(ZipArchive, deleteIndex) { struct zip *intern; @@ -2528,8 +2485,7 @@ PHP_METHOD(ZipArchive, deleteIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::deleteName(string name) -Delete a file using its index */ +/* {{{ Delete a file using its index */ PHP_METHOD(ZipArchive, deleteName) { struct zip *intern; @@ -2556,8 +2512,7 @@ PHP_METHOD(ZipArchive, deleteName) } /* }}} */ -/* {{{ proto bool ZipArchive::renameIndex(int index, string new_name) -Rename an entry selected by its index to new_name */ +/* {{{ Rename an entry selected by its index to new_name */ PHP_METHOD(ZipArchive, renameIndex) { struct zip *intern; @@ -2589,8 +2544,7 @@ PHP_METHOD(ZipArchive, renameIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::renameName(string name, string new_name) -Rename an entry selected by its name to new_name */ +/* {{{ Rename an entry selected by its name to new_name */ PHP_METHOD(ZipArchive, renameName) { struct zip *intern; @@ -2620,8 +2574,7 @@ PHP_METHOD(ZipArchive, renameName) } /* }}} */ -/* {{{ proto bool ZipArchive::unchangeIndex(int index) -Changes to the file at position index are reverted */ +/* {{{ Changes to the file at position index are reverted */ PHP_METHOD(ZipArchive, unchangeIndex) { struct zip *intern; @@ -2646,8 +2599,7 @@ PHP_METHOD(ZipArchive, unchangeIndex) } /* }}} */ -/* {{{ proto bool ZipArchive::unchangeName(string name) -Changes to the file named 'name' are reverted */ +/* {{{ Changes to the file named 'name' are reverted */ PHP_METHOD(ZipArchive, unchangeName) { struct zip *intern; @@ -2676,8 +2628,7 @@ PHP_METHOD(ZipArchive, unchangeName) } /* }}} */ -/* {{{ proto bool ZipArchive::unchangeAll() -All changes to files and global information in archive are reverted */ +/* {{{ All changes to files and global information in archive are reverted */ PHP_METHOD(ZipArchive, unchangeAll) { struct zip *intern; @@ -2697,8 +2648,7 @@ PHP_METHOD(ZipArchive, unchangeAll) } /* }}} */ -/* {{{ proto bool ZipArchive::unchangeArchive() -Revert all global changes to the archive archive. For now, this only reverts archive comment changes. */ +/* {{{ Revert all global changes to the archive archive. For now, this only reverts archive comment changes. */ PHP_METHOD(ZipArchive, unchangeArchive) { struct zip *intern; @@ -2718,8 +2668,7 @@ PHP_METHOD(ZipArchive, unchangeArchive) } /* }}} */ -/* {{{ proto bool ZipArchive::extractTo(string pathto[, mixed files]) -Extract one or more file from a zip archive */ +/* {{{ Extract one or more file from a zip archive */ /* TODO: * - allow index or array of indices * - replace path @@ -2872,24 +2821,21 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ } /* }}} */ -/* {{{ proto string ZipArchive::getFromName(string entryname[, int len [, int flags]]) -get the contents of an entry using its name */ +/* {{{ get the contents of an entry using its name */ PHP_METHOD(ZipArchive, getFromName) { php_zip_get_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ -/* {{{ proto string ZipArchive::getFromIndex(int index[, int len [, int flags]]) -get the contents of an entry using its index */ +/* {{{ get the contents of an entry using its index */ PHP_METHOD(ZipArchive, getFromIndex) { php_zip_get_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource ZipArchive::getStream(string entryname) -get a stream for an entry using its name */ +/* {{{ get a stream for an entry using its name */ PHP_METHOD(ZipArchive, getStream) { struct zip *intern; @@ -2934,8 +2880,7 @@ static void _php_zip_progress_callback(zip_t *arch, double state, void *ptr) } } -/* {{{ proto bool ZipArchive::registerProgressCallback(double rate, callable callback) -register a progression callback: void callback(double state); */ +/* {{{ register a progression callback: void callback(double state); */ PHP_METHOD(ZipArchive, registerProgressCallback) { struct zip *intern; @@ -2993,8 +2938,7 @@ static int _php_zip_cancel_callback(zip_t *arch, void *ptr) return retval; } -/* {{{ proto bool ZipArchive::registerCancelCallback(callable callback) -register a progression callback: int callback(double state); */ +/* {{{ register a progression callback: int callback(double state); */ PHP_METHOD(ZipArchive, registerCancelCallback) { struct zip *intern; @@ -3037,8 +2981,7 @@ PHP_METHOD(ZipArchive, registerCancelCallback) #endif #ifdef HAVE_METHOD_SUPPORTED -/* {{{ proto bool ZipArchive::isCompressionMethodSupported(int method, bool enc) -check if a compression method is available in used libzip */ +/* {{{ check if a compression method is available in used libzip */ PHP_METHOD(ZipArchive, isCompressionMethodSupported) { zend_long method; @@ -3051,8 +2994,7 @@ PHP_METHOD(ZipArchive, isCompressionMethodSupported) } /* }}} */ -/* {{{ proto bool ZipArchive::isEncryptionMethodSupported(int method, bool enc) -check if a encryption method is available in used libzip */ +/* {{{ check if a encryption method is available in used libzip */ PHP_METHOD(ZipArchive, isEncryptionMethodSupported) { zend_long method; @@ -3244,8 +3186,7 @@ static PHP_MINIT_FUNCTION(zip) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(zip) { zend_hash_destroy(&zip_prop_handlers); @@ -3254,8 +3195,7 @@ static PHP_MSHUTDOWN_FUNCTION(zip) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(zip) { php_info_print_table_start(); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 2ced8031f3..eee9786e88 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -521,8 +521,7 @@ static void php_zlib_cleanup_ob_gzhandler_mess(void) } /* }}} */ -/* {{{ proto string ob_gzhandler(string data, int flags) - Legacy hack */ +/* {{{ Legacy hack */ PHP_FUNCTION(ob_gzhandler) { char *in_str; @@ -588,8 +587,7 @@ PHP_FUNCTION(ob_gzhandler) } /* }}} */ -/* {{{ proto string zlib_get_coding_type(void) - Returns the coding type used for output compression */ +/* {{{ Returns the coding type used for output compression */ PHP_FUNCTION(zlib_get_coding_type) { if (zend_parse_parameters_none() == FAILURE) { @@ -606,8 +604,7 @@ PHP_FUNCTION(zlib_get_coding_type) } /* }}} */ -/* {{{ proto array gzfile(string filename [, int use_include_path]) - Read and uncompress entire .gz-file into an array */ +/* {{{ Read and uncompress entire .gz-file into an array */ PHP_FUNCTION(gzfile) { char *filename; @@ -647,8 +644,7 @@ PHP_FUNCTION(gzfile) } /* }}} */ -/* {{{ proto resource gzopen(string filename, string mode [, int use_include_path]) - Open a .gz-file and return a .gz-file pointer */ +/* {{{ Open a .gz-file and return a .gz-file pointer */ PHP_FUNCTION(gzopen) { char *filename; @@ -675,8 +671,7 @@ PHP_FUNCTION(gzopen) } /* }}} */ -/* {{{ proto int readgzfile(string filename [, int use_include_path]) - Output a .gz-file */ +/* {{{ Output a .gz-file */ PHP_FUNCTION(readgzfile) { char *filename; @@ -760,44 +755,36 @@ PHP_FUNCTION(name) \ efree(out_buf); \ } -/* {{{ proto binary zlib_encode(binary data, int encoding[, int level = -1]) - Compress data with the specified encoding */ +/* {{{ Compress data with the specified encoding */ PHP_ZLIB_ENCODE_FUNC(zlib_encode, 0); /* }}} */ -/* {{{ proto binary zlib_decode(binary data[, int max_decoded_len]) - Uncompress any raw/gzip/zlib encoded data */ +/* {{{ Uncompress any raw/gzip/zlib encoded data */ PHP_ZLIB_DECODE_FUNC(zlib_decode, PHP_ZLIB_ENCODING_ANY); /* }}} */ /* NOTE: The naming of these userland functions was quite unlucky */ -/* {{{ proto binary gzdeflate(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_RAW]) - Encode data with the raw deflate encoding */ +/* {{{ Encode data with the raw deflate encoding */ PHP_ZLIB_ENCODE_FUNC(gzdeflate, PHP_ZLIB_ENCODING_RAW); /* }}} */ -/* {{{ proto binary gzencode(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_GZIP]) - Encode data with the gzip encoding */ +/* {{{ Encode data with the gzip encoding */ PHP_ZLIB_ENCODE_FUNC(gzencode, PHP_ZLIB_ENCODING_GZIP); /* }}} */ -/* {{{ proto binary gzcompress(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_DEFLATE]) - Encode data with the zlib encoding */ +/* {{{ Encode data with the zlib encoding */ PHP_ZLIB_ENCODE_FUNC(gzcompress, PHP_ZLIB_ENCODING_DEFLATE); /* }}} */ -/* {{{ proto binary gzinflate(binary data[, int max_decoded_len]) - Decode raw deflate encoded data */ +/* {{{ Decode raw deflate encoded data */ PHP_ZLIB_DECODE_FUNC(gzinflate, PHP_ZLIB_ENCODING_RAW); /* }}} */ -/* {{{ proto binary gzdecode(binary data[, int max_decoded_len]) - Decode gzip encoded data */ +/* {{{ Decode gzip encoded data */ PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP); /* }}} */ -/* {{{ proto binary gzuncompress(binary data[, int max_decoded_len]) - Decode zlib encoded data */ +/* {{{ Decode zlib encoded data */ PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE); /* }}} */ @@ -876,8 +863,7 @@ static zend_bool zlib_create_dictionary_string(HashTable *options, char **dict, return 1; } -/* {{{ proto InflateContext inflate_init(int encoding) - Initialize an incremental inflate context with the specified encoding */ +/* {{{ Initialize an incremental inflate context with the specified encoding */ PHP_FUNCTION(inflate_init) { php_zlib_context *ctx; @@ -950,8 +936,7 @@ PHP_FUNCTION(inflate_init) } /* }}} */ -/* {{{ proto string inflate_add(InflateContext context, string encoded_data[, int flush_mode = ZLIB_SYNC_FLUSH]) - Incrementally inflate encoded data in the specified context */ +/* {{{ Incrementally inflate encoded data in the specified context */ PHP_FUNCTION(inflate_add) { zend_string *out; @@ -1063,8 +1048,7 @@ complete: } /* }}} */ -/* {{{ proto bool inflate_get_status(resource context) - Get decompression status, usually returns either ZLIB_OK or ZLIB_STREAM_END. */ +/* {{{ Get decompression status, usually returns either ZLIB_OK or ZLIB_STREAM_END. */ PHP_FUNCTION(inflate_get_status) { zval *res; @@ -1080,8 +1064,7 @@ PHP_FUNCTION(inflate_get_status) } /* }}} */ -/* {{{ proto bool inflate_get_read_len(resource context) - Get number of bytes read so far. */ +/* {{{ Get number of bytes read so far. */ PHP_FUNCTION(inflate_get_read_len) { zval *res; @@ -1097,8 +1080,7 @@ PHP_FUNCTION(inflate_get_read_len) } /* }}} */ -/* {{{ proto DeflateContext deflate_init(int encoding[, array options]) - Initialize an incremental deflate context using the specified encoding */ +/* {{{ Initialize an incremental deflate context using the specified encoding */ PHP_FUNCTION(deflate_init) { php_zlib_context *ctx; @@ -1191,8 +1173,7 @@ PHP_FUNCTION(deflate_init) } /* }}} */ -/* {{{ proto string deflate_add(DeflateContext context, string data[, int flush_mode = ZLIB_SYNC_FLUSH]) - Incrementally deflate data in the specified context */ +/* {{{ Incrementally deflate data in the specified context */ PHP_FUNCTION(deflate_add) { zend_string *out; diff --git a/main/SAPI.c b/main/SAPI.c index b2840c18e9..b2963225ba 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -109,8 +109,7 @@ SAPI_API void sapi_free_header(sapi_header_struct *sapi_header) efree(sapi_header->header); } -/* {{{ proto bool header_register_callback(mixed callback) - call a header function */ +/* {{{ call a header function */ PHP_FUNCTION(header_register_callback) { zval *callback_func; diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index d61a7c6893..88519bc726 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -15,8 +15,7 @@ +----------------------------------------------------------------------+ */ -/* {{{ includes - */ +/* {{{ includes */ #include "php.h" #include "php_globals.h" #include "SAPI.h" @@ -267,8 +266,7 @@ PHPAPI int php_check_open_basedir(const char *path) return php_check_open_basedir_ex(path, 1); } -/* {{{ php_check_open_basedir - */ +/* {{{ php_check_open_basedir */ PHPAPI int php_check_open_basedir_ex(const char *path, int warn) { /* Only check when open_basedir is available */ @@ -316,8 +314,7 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn) } /* }}} */ -/* {{{ php_fopen_and_set_opened_path - */ +/* {{{ php_fopen_and_set_opened_path */ static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode, zend_string **opened_path) { FILE *fp; @@ -338,8 +335,7 @@ static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode, z } /* }}} */ -/* {{{ php_fopen_primary_script - */ +/* {{{ php_fopen_primary_script */ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle) { char *path_info; @@ -695,8 +691,7 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c } /* }}} */ -/* {{{ php_strip_url_passwd - */ +/* {{{ php_strip_url_passwd */ PHPAPI char *php_strip_url_passwd(char *url) { register char *p, *url_start; @@ -735,24 +730,21 @@ PHPAPI char *php_strip_url_passwd(char *url) } /* }}} */ -/* {{{ expand_filepath - */ +/* {{{ expand_filepath */ PHPAPI char *expand_filepath(const char *filepath, char *real_path) { return expand_filepath_ex(filepath, real_path, NULL, 0); } /* }}} */ -/* {{{ expand_filepath_ex - */ +/* {{{ expand_filepath_ex */ PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len) { return expand_filepath_with_mode(filepath, real_path, relative_to, relative_to_len, CWD_FILEPATH); } /* }}} */ -/* {{{ expand_filepath_use_realpath - */ +/* {{{ expand_filepath_use_realpath */ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode) { cwd_state new_state; diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index bbee5fd0e7..bad5ad0279 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -15,8 +15,7 @@ +----------------------------------------------------------------------+ */ -/* {{{ includes - */ +/* {{{ includes */ #include "php.h" #include "php_main.h" #include "zend_modules.h" @@ -96,8 +95,7 @@ #endif /* }}} */ -/* {{{ php_builtin_extensions[] - */ +/* {{{ php_builtin_extensions[] */ static zend_module_entry * const php_builtin_extensions[] = { phpext_standard_ptr #if HAVE_BCMATH diff --git a/main/main.c b/main/main.c index 90fec668dd..3b052d8b6e 100644 --- a/main/main.c +++ b/main/main.c @@ -16,8 +16,7 @@ +----------------------------------------------------------------------+ */ -/* {{{ includes - */ +/* {{{ includes */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -95,8 +94,7 @@ PHPAPI size_t core_globals_offset; #define SAFE_FILENAME(f) ((f)?(f):"-") -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnSetFacility) { const char *facility = ZSTR_VAL(new_value); @@ -232,8 +230,7 @@ static PHP_INI_MH(OnSetFacility) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnSetPrecision) { zend_long i; @@ -248,8 +245,7 @@ static PHP_INI_MH(OnSetPrecision) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnSetSerializePrecision) { zend_long i; @@ -265,8 +261,7 @@ static PHP_INI_MH(OnSetSerializePrecision) /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnChangeMemoryLimit) { if (new_value) { @@ -278,8 +273,7 @@ static PHP_INI_MH(OnChangeMemoryLimit) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnSetLogFilter) { const char *filter = ZSTR_VAL(new_value); @@ -305,8 +299,7 @@ static PHP_INI_MH(OnSetLogFilter) } /* }}} */ -/* {{{ php_disable_functions - */ +/* {{{ php_disable_functions */ static void php_disable_functions(void) { char *s = NULL, *e; @@ -343,8 +336,7 @@ static void php_disable_functions(void) } /* }}} */ -/* {{{ php_disable_classes - */ +/* {{{ php_disable_classes */ static void php_disable_classes(void) { char *s = NULL, *e; @@ -379,8 +371,7 @@ static void php_disable_classes(void) } /* }}} */ -/* {{{ php_binary_init - */ +/* {{{ php_binary_init */ static void php_binary_init(void) { char *binary_location = NULL; @@ -429,8 +420,7 @@ static void php_binary_init(void) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateTimeout) { if (stage==PHP_INI_STAGE_STARTUP) { @@ -445,8 +435,7 @@ static PHP_INI_MH(OnUpdateTimeout) } /* }}} */ -/* {{{ php_get_display_errors_mode() helper function - */ +/* {{{ php_get_display_errors_mode() helper function */ static zend_uchar php_get_display_errors_mode(char *value, size_t value_length) { zend_uchar mode; @@ -476,8 +465,7 @@ static zend_uchar php_get_display_errors_mode(char *value, size_t value_length) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateDisplayErrors) { PG(display_errors) = php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value)); @@ -486,8 +474,7 @@ static PHP_INI_MH(OnUpdateDisplayErrors) } /* }}} */ -/* {{{ PHP_INI_DISP - */ +/* {{{ PHP_INI_DISP */ static PHP_INI_DISP(display_errors_mode) { zend_uchar mode; @@ -564,8 +551,7 @@ PHPAPI const char *php_get_output_encoding() { PHPAPI void (*php_internal_encoding_changed)(void) = NULL; -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateDefaultCharset) { OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -581,8 +567,7 @@ static PHP_INI_MH(OnUpdateDefaultCharset) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateInternalEncoding) { OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -598,8 +583,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateInputEncoding) { OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -615,8 +599,7 @@ static PHP_INI_MH(OnUpdateInputEncoding) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateOutputEncoding) { OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -632,8 +615,7 @@ static PHP_INI_MH(OnUpdateOutputEncoding) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateErrorLog) { /* Only do the safemode/open_basedir check at runtime */ @@ -647,8 +629,7 @@ static PHP_INI_MH(OnUpdateErrorLog) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnUpdateMailLog) { /* Only do the safemode/open_basedir check at runtime */ @@ -662,8 +643,7 @@ static PHP_INI_MH(OnUpdateMailLog) } /* }}} */ -/* {{{ PHP_INI_MH - */ +/* {{{ PHP_INI_MH */ static PHP_INI_MH(OnChangeMailForceExtra) { /* Don't allow changing it in htaccess */ @@ -693,8 +673,7 @@ PHP_INI_MH(OnChangeBrowscap); # define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i" #endif -/* {{{ PHP_INI - */ +/* {{{ PHP_INI */ PHP_INI_BEGIN() PHP_INI_ENTRY_EX("highlight.comment", HL_COMMENT_COLOR, PHP_INI_ALL, NULL, php_ini_color_displayer_cb) PHP_INI_ENTRY_EX("highlight.default", HL_DEFAULT_COLOR, PHP_INI_ALL, NULL, php_ini_color_displayer_cb) @@ -813,16 +792,14 @@ static int php_during_module_shutdown(void) } /* }}} */ -/* {{{ php_get_module_initialized - */ +/* {{{ php_get_module_initialized */ PHPAPI int php_get_module_initialized(void) { return module_initialized; } /* }}} */ -/* {{{ php_log_err_with_severity - */ +/* {{{ php_log_err_with_severity */ PHPAPI ZEND_COLD void php_log_err_with_severity(const char *log_message, int syslog_type_int) { int fd = -1; @@ -892,8 +869,7 @@ PHPAPI size_t php_write(void *buf, size_t size) } /* }}} */ -/* {{{ php_printf - */ +/* {{{ php_printf */ PHPAPI size_t php_printf(const char *format, ...) { va_list args; @@ -911,8 +887,7 @@ PHPAPI size_t php_printf(const char *format, ...) } /* }}} */ -/* {{{ php_printf_unchecked - */ +/* {{{ php_printf_unchecked */ PHPAPI size_t php_printf_unchecked(const char *format, ...) { va_list args; @@ -1414,8 +1389,7 @@ static ZEND_COLD void php_error_cb(int orig_type, const char *error_filename, co } /* }}} */ -/* {{{ php_get_current_user - */ +/* {{{ php_get_current_user */ PHPAPI char *php_get_current_user(void) { zend_stat_t *pstat; @@ -1483,8 +1457,7 @@ PHPAPI char *php_get_current_user(void) } /* }}} */ -/* {{{ proto bool set_time_limit(int seconds) - Sets the maximum time a script can run */ +/* {{{ Sets the maximum time a script can run */ PHP_FUNCTION(set_time_limit) { zend_long new_timeout; @@ -1509,8 +1482,7 @@ PHP_FUNCTION(set_time_limit) } /* }}} */ -/* {{{ php_fopen_wrapper_for_zend - */ +/* {{{ php_fopen_wrapper_for_zend */ static FILE *php_fopen_wrapper_for_zend(const char *filename, zend_string **opened_path) { return php_stream_open_wrapper_as_file((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path); @@ -1578,16 +1550,14 @@ static zend_string *php_resolve_path_for_zend(const char *filename, size_t filen } /* }}} */ -/* {{{ php_get_configuration_directive_for_zend - */ +/* {{{ php_get_configuration_directive_for_zend */ static zval *php_get_configuration_directive_for_zend(zend_string *name) { return cfg_get_entry_ex(name); } /* }}} */ -/* {{{ php_free_request_globals - */ +/* {{{ php_free_request_globals */ static void php_free_request_globals(void) { clear_last_error(); @@ -1598,8 +1568,7 @@ static void php_free_request_globals(void) } /* }}} */ -/* {{{ php_message_handler_for_zend - */ +/* {{{ php_message_handler_for_zend */ static ZEND_COLD void php_message_handler_for_zend(zend_long message, const void *data) { switch (message) { @@ -1700,8 +1669,7 @@ void php_on_timeout(int seconds) } #if PHP_SIGCHILD -/* {{{ sigchld_handler - */ +/* {{{ sigchld_handler */ static void sigchld_handler(int apar) { int errno_save = errno; @@ -1714,8 +1682,7 @@ static void sigchld_handler(int apar) /* }}} */ #endif -/* {{{ php_request_startup - */ +/* {{{ php_request_startup */ int php_request_startup(void) { int retval = SUCCESS; @@ -1799,8 +1766,7 @@ int php_request_startup(void) } /* }}} */ -/* {{{ php_request_shutdown - */ +/* {{{ php_request_shutdown */ void php_request_shutdown(void *dummy) { zend_bool report_memleaks; @@ -1920,8 +1886,7 @@ void php_request_shutdown(void *dummy) } /* }}} */ -/* {{{ php_com_initialize - */ +/* {{{ php_com_initialize */ PHPAPI void php_com_initialize(void) { #ifdef PHP_WIN32 @@ -1935,8 +1900,7 @@ PHPAPI void php_com_initialize(void) /* }}} */ #ifdef ZTS -/* {{{ core_globals_ctor - */ +/* {{{ core_globals_ctor */ static void core_globals_ctor(php_core_globals *core_globals) { memset(core_globals, 0, sizeof(*core_globals)); @@ -1945,8 +1909,7 @@ static void core_globals_ctor(php_core_globals *core_globals) /* }}} */ #endif -/* {{{ core_globals_dtor - */ +/* {{{ core_globals_dtor */ static void core_globals_dtor(php_core_globals *core_globals) { /* These should have been freed earlier. */ @@ -1975,8 +1938,7 @@ PHP_MINFO_FUNCTION(php_core) { /* {{{ */ } /* }}} */ -/* {{{ php_register_extensions - */ +/* {{{ php_register_extensions */ int php_register_extensions(zend_module_entry * const * ptr, int count) { zend_module_entry * const * end = ptr + count; @@ -2043,8 +2005,7 @@ void dummy_invalid_parameter_handler( } #endif -/* {{{ php_module_startup - */ +/* {{{ php_module_startup */ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint32_t num_additional_modules) { zend_utility_functions zuf; @@ -2401,8 +2362,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod } /* }}} */ -/* {{{ php_module_shutdown_wrapper - */ +/* {{{ php_module_shutdown_wrapper */ int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals) { php_module_shutdown(); @@ -2410,8 +2370,7 @@ int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals) } /* }}} */ -/* {{{ php_module_shutdown - */ +/* {{{ php_module_shutdown */ void php_module_shutdown(void) { int module_number=0; /* for UNREGISTER_INI_ENTRIES() */ @@ -2488,8 +2447,7 @@ void php_module_shutdown(void) } /* }}} */ -/* {{{ php_execute_script - */ +/* {{{ php_execute_script */ PHPAPI int php_execute_script(zend_file_handle *primary_file) { zend_file_handle *prepend_file_p, *append_file_p; @@ -2601,8 +2559,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file) } /* }}} */ -/* {{{ php_execute_simple_script - */ +/* {{{ php_execute_simple_script */ PHPAPI int php_execute_simple_script(zend_file_handle *primary_file, zval *ret) { char *old_cwd; @@ -2638,8 +2595,7 @@ PHPAPI int php_execute_simple_script(zend_file_handle *primary_file, zval *ret) } /* }}} */ -/* {{{ php_handle_aborted_connection - */ +/* {{{ php_handle_aborted_connection */ PHPAPI void php_handle_aborted_connection(void) { @@ -2652,8 +2608,7 @@ PHPAPI void php_handle_aborted_connection(void) } /* }}} */ -/* {{{ php_handle_auth_data - */ +/* {{{ php_handle_auth_data */ PHPAPI int php_handle_auth_data(const char *auth) { int ret = -1; @@ -2694,8 +2649,7 @@ PHPAPI int php_handle_auth_data(const char *auth) } /* }}} */ -/* {{{ php_lint_script - */ +/* {{{ php_lint_script */ PHPAPI int php_lint_script(zend_file_handle *file) { zend_op_array *op_array; @@ -2720,8 +2674,7 @@ PHPAPI int php_lint_script(zend_file_handle *file) /* }}} */ #ifdef ZTS -/* {{{ php_reserve_tsrm_memory - */ +/* {{{ php_reserve_tsrm_memory */ PHPAPI void php_reserve_tsrm_memory(void) { tsrm_reserve( @@ -2741,8 +2694,7 @@ PHPAPI void php_reserve_tsrm_memory(void) } /* }}} */ -/* {{{ php_tsrm_startup - */ +/* {{{ php_tsrm_startup */ PHPAPI int php_tsrm_startup(void) { int ret = tsrm_startup(1, 1, 0, NULL); diff --git a/main/network.c b/main/network.c index 336d311068..ac4a2a3357 100644 --- a/main/network.c +++ b/main/network.c @@ -97,8 +97,7 @@ const struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */ # define PHP_GAI_STRERROR(x) (gai_strerror(x)) #else # define PHP_GAI_STRERROR(x) (php_gai_strerror(x)) -/* {{{ php_gai_strerror - */ +/* {{{ php_gai_strerror */ static const char *php_gai_strerror(int code) { static struct { @@ -136,8 +135,7 @@ static const char *php_gai_strerror(int code) #endif #endif -/* {{{ php_network_freeaddresses - */ +/* {{{ php_network_freeaddresses */ PHPAPI void php_network_freeaddresses(struct sockaddr **sal) { struct sockaddr **sap; diff --git a/main/output.c b/main/output.c index 4639001dd4..aab080ba01 100644 --- a/main/output.c +++ b/main/output.c @@ -1290,8 +1290,7 @@ static int php_output_handler_devnull_func(void **handler_context, php_output_co * USERLAND (nearly 1:1 of old output.c) */ -/* {{{ proto bool ob_start([string|array user_function [, int chunk_size [, int flags]]]) - Turn on Output Buffering (specifying an optional output handler). */ +/* {{{ Turn on Output Buffering (specifying an optional output handler). */ PHP_FUNCTION(ob_start) { zval *output_handler = NULL; @@ -1314,8 +1313,7 @@ PHP_FUNCTION(ob_start) } /* }}} */ -/* {{{ proto bool ob_flush(void) - Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ +/* {{{ Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ PHP_FUNCTION(ob_flush) { if (zend_parse_parameters_none() == FAILURE) { @@ -1335,8 +1333,7 @@ PHP_FUNCTION(ob_flush) } /* }}} */ -/* {{{ proto bool ob_clean(void) - Clean (delete) the current output buffer */ +/* {{{ Clean (delete) the current output buffer */ PHP_FUNCTION(ob_clean) { if (zend_parse_parameters_none() == FAILURE) { @@ -1356,8 +1353,7 @@ PHP_FUNCTION(ob_clean) } /* }}} */ -/* {{{ proto bool ob_end_flush(void) - Flush (send) the output buffer, and delete current output buffer */ +/* {{{ Flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_flush) { if (zend_parse_parameters_none() == FAILURE) { @@ -1373,8 +1369,7 @@ PHP_FUNCTION(ob_end_flush) } /* }}} */ -/* {{{ proto bool ob_end_clean(void) - Clean the output buffer, and delete current output buffer */ +/* {{{ Clean the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_clean) { if (zend_parse_parameters_none() == FAILURE) { @@ -1390,8 +1385,7 @@ PHP_FUNCTION(ob_end_clean) } /* }}} */ -/* {{{ proto string|false ob_get_flush(void) - Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ +/* {{{ Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_get_flush) { if (zend_parse_parameters_none() == FAILURE) { @@ -1409,8 +1403,7 @@ PHP_FUNCTION(ob_get_flush) } /* }}} */ -/* {{{ proto string|false ob_get_clean(void) - Get current buffer contents and delete current output buffer */ +/* {{{ Get current buffer contents and delete current output buffer */ PHP_FUNCTION(ob_get_clean) { if (zend_parse_parameters_none() == FAILURE) { @@ -1432,8 +1425,7 @@ PHP_FUNCTION(ob_get_clean) } /* }}} */ -/* {{{ proto string|false ob_get_contents(void) - Return the contents of the output buffer */ +/* {{{ Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { if (zend_parse_parameters_none() == FAILURE) { @@ -1446,8 +1438,7 @@ PHP_FUNCTION(ob_get_contents) } /* }}} */ -/* {{{ proto int ob_get_level(void) - Return the nesting level of the output buffer */ +/* {{{ Return the nesting level of the output buffer */ PHP_FUNCTION(ob_get_level) { if (zend_parse_parameters_none() == FAILURE) { @@ -1458,8 +1449,7 @@ PHP_FUNCTION(ob_get_level) } /* }}} */ -/* {{{ proto int|false ob_get_length(void) - Return the length of the output buffer */ +/* {{{ Return the length of the output buffer */ PHP_FUNCTION(ob_get_length) { if (zend_parse_parameters_none() == FAILURE) { @@ -1472,8 +1462,7 @@ PHP_FUNCTION(ob_get_length) } /* }}} */ -/* {{{ proto null|array ob_list_handlers() - List all output_buffers in an array */ +/* {{{ List all output_buffers in an array */ PHP_FUNCTION(ob_list_handlers) { if (zend_parse_parameters_none() == FAILURE) { @@ -1490,8 +1479,7 @@ PHP_FUNCTION(ob_list_handlers) } /* }}} */ -/* {{{ proto false|array ob_get_status([bool full_status]) - Return the status of the active or all output buffers */ +/* {{{ Return the status of the active or all output buffers */ PHP_FUNCTION(ob_get_status) { zend_bool full_status = 0; @@ -1514,8 +1502,7 @@ PHP_FUNCTION(ob_get_status) } /* }}} */ -/* {{{ proto void ob_implicit_flush([int flag]) - Turn implicit flush on/off and is equivalent to calling flush() after every output call */ +/* {{{ Turn implicit flush on/off and is equivalent to calling flush() after every output call */ PHP_FUNCTION(ob_implicit_flush) { zend_long flag = 1; @@ -1528,8 +1515,7 @@ PHP_FUNCTION(ob_implicit_flush) } /* }}} */ -/* {{{ proto bool output_reset_rewrite_vars(void) - Reset(clear) URL rewriter values */ +/* {{{ Reset(clear) URL rewriter values */ PHP_FUNCTION(output_reset_rewrite_vars) { if (zend_parse_parameters_none() == FAILURE) { @@ -1544,8 +1530,7 @@ PHP_FUNCTION(output_reset_rewrite_vars) } /* }}} */ -/* {{{ proto bool output_add_rewrite_var(string name, string value) - Add URL rewriter values */ +/* {{{ Add URL rewriter values */ PHP_FUNCTION(output_add_rewrite_var) { char *name, *value; diff --git a/main/php_content_types.c b/main/php_content_types.c index d953afcec6..920fc95906 100644 --- a/main/php_content_types.c +++ b/main/php_content_types.c @@ -20,8 +20,7 @@ #include "php_content_types.h" -/* {{{ php_post_entries[] - */ +/* {{{ php_post_entries[] */ static const sapi_post_entry php_post_entries[] = { { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1, sapi_read_standard_form_data, php_std_post_handler }, { MULTIPART_CONTENT_TYPE, sizeof(MULTIPART_CONTENT_TYPE)-1, NULL, rfc1867_post_handler }, @@ -29,8 +28,7 @@ static const sapi_post_entry php_post_entries[] = { }; /* }}} */ -/* {{{ SAPI_POST_READER_FUNC - */ +/* {{{ SAPI_POST_READER_FUNC */ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader) { if (!strcmp(SG(request_info).request_method, "POST")) { @@ -42,8 +40,7 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader) } /* }}} */ -/* {{{ php_startup_sapi_content_types - */ +/* {{{ php_startup_sapi_content_types */ int php_startup_sapi_content_types(void) { sapi_register_default_post_reader(php_default_post_reader); @@ -53,8 +50,7 @@ int php_startup_sapi_content_types(void) } /* }}} */ -/* {{{ php_setup_sapi_content_types - */ +/* {{{ php_setup_sapi_content_types */ int php_setup_sapi_content_types(void) { sapi_register_post_entries(php_post_entries); diff --git a/main/php_ini.c b/main/php_ini.c index 63d3db09b8..57573f4d30 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -65,8 +65,7 @@ static php_extension_lists extension_lists; PHPAPI char *php_ini_scanned_path=NULL; PHPAPI char *php_ini_scanned_files=NULL; -/* {{{ php_ini_displayer_cb - */ +/* {{{ php_ini_displayer_cb */ static ZEND_COLD void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) { if (ini_entry->displayer) { @@ -113,8 +112,7 @@ static ZEND_COLD void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) } /* }}} */ -/* {{{ display_ini_entries - */ +/* {{{ display_ini_entries */ PHPAPI ZEND_COLD void display_ini_entries(zend_module_entry *module) { int module_number; @@ -164,8 +162,7 @@ PHPAPI ZEND_COLD void display_ini_entries(zend_module_entry *module) #define PHP_EXTENSION_TOKEN "extension" #define ZEND_EXTENSION_TOKEN "zend_extension" -/* {{{ config_zval_dtor - */ +/* {{{ config_zval_dtor */ PHPAPI void config_zval_dtor(zval *zvalue) { if (Z_TYPE_P(zvalue) == IS_ARRAY) { @@ -182,8 +179,7 @@ PHPAPI void config_zval_dtor(zval *zvalue) } while (0) /* }}} */ -/* {{{ php_ini_parser_cb - */ +/* {{{ php_ini_parser_cb */ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_type, HashTable *target_hash) { zval *entry; @@ -314,8 +310,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t } /* }}} */ -/* {{{ php_load_php_extension_cb - */ +/* {{{ php_load_php_extension_cb */ static void php_load_php_extension_cb(void *arg) { #ifdef HAVE_LIBDL @@ -324,8 +319,7 @@ static void php_load_php_extension_cb(void *arg) } /* }}} */ -/* {{{ php_load_zend_extension_cb - */ +/* {{{ php_load_zend_extension_cb */ #ifdef HAVE_LIBDL static void php_load_zend_extension_cb(void *arg) { @@ -408,8 +402,7 @@ static void php_load_zend_extension_cb(void *arg) { } #endif /* }}} */ -/* {{{ php_init_config - */ +/* {{{ php_init_config */ int php_init_config(void) { char *php_ini_file_name = NULL; @@ -747,8 +740,7 @@ int php_init_config(void) } /* }}} */ -/* {{{ php_shutdown_config - */ +/* {{{ php_shutdown_config */ int php_shutdown_config(void) { zend_hash_destroy(&configuration_hash); @@ -764,8 +756,7 @@ int php_shutdown_config(void) } /* }}} */ -/* {{{ php_ini_register_extensions - */ +/* {{{ php_ini_register_extensions */ void php_ini_register_extensions(void) { zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb); @@ -776,8 +767,7 @@ void php_ini_register_extensions(void) } /* }}} */ -/* {{{ php_parse_user_ini_file - */ +/* {{{ php_parse_user_ini_file */ PHPAPI int php_parse_user_ini_file(const char *dirname, const char *ini_filename, HashTable *target_hash) { zend_stat_t sb; @@ -805,8 +795,7 @@ PHPAPI int php_parse_user_ini_file(const char *dirname, const char *ini_filename } /* }}} */ -/* {{{ php_ini_activate_config - */ +/* {{{ php_ini_activate_config */ PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage) { zend_string *str; @@ -819,16 +808,14 @@ PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int } /* }}} */ -/* {{{ php_ini_has_per_dir_config - */ +/* {{{ php_ini_has_per_dir_config */ PHPAPI int php_ini_has_per_dir_config(void) { return has_per_dir_config; } /* }}} */ -/* {{{ php_ini_activate_per_dir_config - */ +/* {{{ php_ini_activate_per_dir_config */ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len) { zval *tmp2; @@ -870,16 +857,14 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len) } /* }}} */ -/* {{{ php_ini_has_per_host_config - */ +/* {{{ php_ini_has_per_host_config */ PHPAPI int php_ini_has_per_host_config(void) { return has_per_host_config; } /* }}} */ -/* {{{ php_ini_activate_per_host_config - */ +/* {{{ php_ini_activate_per_host_config */ PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len) { zval *tmp; @@ -893,24 +878,21 @@ PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len) } /* }}} */ -/* {{{ cfg_get_entry - */ +/* {{{ cfg_get_entry */ PHPAPI zval *cfg_get_entry_ex(zend_string *name) { return zend_hash_find(&configuration_hash, name); } /* }}} */ -/* {{{ cfg_get_entry - */ +/* {{{ cfg_get_entry */ PHPAPI zval *cfg_get_entry(const char *name, size_t name_length) { return zend_hash_str_find(&configuration_hash, name, name_length); } /* }}} */ -/* {{{ cfg_get_long - */ +/* {{{ cfg_get_long */ PHPAPI int cfg_get_long(const char *varname, zend_long *result) { zval *tmp; @@ -924,8 +906,7 @@ PHPAPI int cfg_get_long(const char *varname, zend_long *result) } /* }}} */ -/* {{{ cfg_get_double - */ +/* {{{ cfg_get_double */ PHPAPI int cfg_get_double(const char *varname, double *result) { zval *tmp; @@ -939,8 +920,7 @@ PHPAPI int cfg_get_double(const char *varname, double *result) } /* }}} */ -/* {{{ cfg_get_string - */ +/* {{{ cfg_get_string */ PHPAPI int cfg_get_string(const char *varname, char **result) { zval *tmp; diff --git a/main/php_variables.c b/main/php_variables.c index 0a1eb0b4cd..dc33e54920 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -579,8 +579,7 @@ zend_bool php_std_auto_global_callback(char *name, uint32_t name_len) return 0; /* don't rearm */ } -/* {{{ php_build_argv - */ +/* {{{ php_build_argv */ PHPAPI void php_build_argv(const char *s, zval *track_vars_array) { zval arr, argc, tmp; @@ -638,8 +637,7 @@ PHPAPI void php_build_argv(const char *s, zval *track_vars_array) } /* }}} */ -/* {{{ php_register_server_variables - */ +/* {{{ php_register_server_variables */ static inline void php_register_server_variables(void) { zval tmp; @@ -677,8 +675,7 @@ static inline void php_register_server_variables(void) } /* }}} */ -/* {{{ php_autoglobal_merge - */ +/* {{{ php_autoglobal_merge */ static void php_autoglobal_merge(HashTable *dest, HashTable *src) { zval *src_entry, *dest_entry; @@ -710,8 +707,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src) } /* }}} */ -/* {{{ php_hash_environment - */ +/* {{{ php_hash_environment */ PHPAPI int php_hash_environment(void) { memset(PG(http_globals), 0, sizeof(PG(http_globals))); diff --git a/main/streams/streams.c b/main/streams/streams.c index 90475a8d90..ea0738c82a 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1922,8 +1922,7 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const } /* }}} */ -/* {{{ _php_stream_mkdir - */ +/* {{{ _php_stream_mkdir */ PHPAPI int _php_stream_mkdir(const char *path, int mode, int options, php_stream_context *context) { php_stream_wrapper *wrapper = NULL; @@ -1937,8 +1936,7 @@ PHPAPI int _php_stream_mkdir(const char *path, int mode, int options, php_stream } /* }}} */ -/* {{{ _php_stream_rmdir - */ +/* {{{ _php_stream_rmdir */ PHPAPI int _php_stream_rmdir(const char *path, int options, php_stream_context *context) { php_stream_wrapper *wrapper = NULL; @@ -2294,24 +2292,21 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context, } /* }}} */ -/* {{{ php_stream_dirent_alphasort - */ +/* {{{ php_stream_dirent_alphasort */ PHPAPI int php_stream_dirent_alphasort(const zend_string **a, const zend_string **b) { return strcoll(ZSTR_VAL(*a), ZSTR_VAL(*b)); } /* }}} */ -/* {{{ php_stream_dirent_alphasortr - */ +/* {{{ php_stream_dirent_alphasortr */ PHPAPI int php_stream_dirent_alphasortr(const zend_string **a, const zend_string **b) { return strcoll(ZSTR_VAL(*b), ZSTR_VAL(*a)); } /* }}} */ -/* {{{ php_stream_scandir - */ +/* {{{ php_stream_scandir */ PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], int flags, php_stream_context *context, int (*compare) (const zend_string **a, const zend_string **b)) { diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 6c75c1b2ed..ae00187483 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -486,8 +486,7 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, const char } -/* {{{ proto bool stream_wrapper_register(string protocol, string classname[, int flags]) - Registers a custom URL protocol handler class */ +/* {{{ Registers a custom URL protocol handler class */ PHP_FUNCTION(stream_wrapper_register) { zend_string *protocol, *classname; @@ -529,8 +528,7 @@ PHP_FUNCTION(stream_wrapper_register) } /* }}} */ -/* {{{ proto bool stream_wrapper_unregister(string protocol) - Unregister a wrapper for the life of the current request. */ +/* {{{ Unregister a wrapper for the life of the current request. */ PHP_FUNCTION(stream_wrapper_unregister) { zend_string *protocol; @@ -549,8 +547,7 @@ PHP_FUNCTION(stream_wrapper_unregister) } /* }}} */ -/* {{{ proto bool stream_wrapper_restore(string protocol) - Restore the original protocol handler, overriding if necessary */ +/* {{{ Restore the original protocol handler, overriding if necessary */ PHP_FUNCTION(stream_wrapper_restore) { zend_string *protocol; diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 834a079ee8..1a601e6906 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -70,8 +70,7 @@ static request_rec *php_apache_lookup_uri(char *filename) return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters); } -/* {{{ proto bool virtual(string uri) - Perform an apache sub-request */ +/* {{{ Perform an apache sub-request */ PHP_FUNCTION(virtual) { char *filename; @@ -171,8 +170,7 @@ PHP_FUNCTION(apache_lookup_uri) RETURN_FALSE; } -/* {{{ proto array getallheaders(void) - Fetch all HTTP request headers */ +/* {{{ Fetch all HTTP request headers */ PHP_FUNCTION(apache_request_headers) { php_struct *ctx; @@ -195,8 +193,7 @@ PHP_FUNCTION(apache_request_headers) } /* }}} */ -/* {{{ proto array apache_response_headers(void) - Fetch all HTTP response headers */ +/* {{{ Fetch all HTTP response headers */ PHP_FUNCTION(apache_response_headers) { php_struct *ctx; @@ -219,8 +216,7 @@ PHP_FUNCTION(apache_response_headers) } /* }}} */ -/* {{{ proto string apache_note(string note_name [, string note_value]) - Get and set Apache request notes */ +/* {{{ Get and set Apache request notes */ PHP_FUNCTION(apache_note) { php_struct *ctx; @@ -249,8 +245,7 @@ PHP_FUNCTION(apache_note) /* }}} */ -/* {{{ proto bool apache_setenv(string variable, string value [, bool walk_to_top]) - Set an Apache subprocess_env variable */ +/* {{{ Set an Apache subprocess_env variable */ /* * XXX this doesn't look right. shouldn't it be the parent ?*/ PHP_FUNCTION(apache_setenv) @@ -283,8 +278,7 @@ PHP_FUNCTION(apache_setenv) } /* }}} */ -/* {{{ proto bool apache_getenv(string variable [, bool walk_to_top]) - Get an Apache subprocess_env variable */ +/* {{{ Get an Apache subprocess_env variable */ /* * XXX: shouldn't this be the parent not the 'prev' */ @@ -332,8 +326,7 @@ static char *php_apache_get_version() #endif } -/* {{{ proto string apache_get_version(void) - Fetch Apache version */ +/* {{{ Fetch Apache version */ PHP_FUNCTION(apache_get_version) { char *apv = php_apache_get_version(); @@ -346,8 +339,7 @@ PHP_FUNCTION(apache_get_version) } /* }}} */ -/* {{{ proto array apache_get_modules(void) - Get a list of loaded Apache modules */ +/* {{{ Get a list of loaded Apache modules */ PHP_FUNCTION(apache_get_modules) { int n; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 7c9e1bdfa6..acbe69a7a9 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -773,8 +773,7 @@ static void sapi_cgi_log_message(const char *message, int syslog_type_int) } } -/* {{{ php_cgi_ini_activate_user_config - */ +/* {{{ php_cgi_ini_activate_user_config */ static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len) { user_config_cache_entry *new_entry, *entry; @@ -973,8 +972,7 @@ static int php_cgi_startup(sapi_module_struct *sapi_module) return SUCCESS; } -/* {{{ sapi_module_struct cgi_sapi_module - */ +/* {{{ sapi_module_struct cgi_sapi_module */ static sapi_module_struct cgi_sapi_module = { "cgi-fcgi", /* name */ "CGI/FastCGI", /* pretty name */ @@ -1019,8 +1017,7 @@ static const zend_function_entry additional_functions[] = { PHP_FE_END }; -/* {{{ php_cgi_usage - */ +/* {{{ php_cgi_usage */ static void php_cgi_usage(char *argv0) { char *prog; @@ -1525,8 +1522,7 @@ PHP_INI_BEGIN() #endif PHP_INI_END() -/* {{{ php_cgi_globals_ctor - */ +/* {{{ php_cgi_globals_ctor */ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) { #if defined(ZTS) && defined(PHP_WIN32) @@ -1547,8 +1543,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(cgi) { REGISTER_INI_ENTRIES(); @@ -1556,8 +1551,7 @@ static PHP_MINIT_FUNCTION(cgi) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(cgi) { zend_hash_destroy(&CGIG(user_config_cache)); @@ -1567,8 +1561,7 @@ static PHP_MSHUTDOWN_FUNCTION(cgi) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(cgi) { DISPLAY_INI_ENTRIES(); @@ -1735,8 +1728,7 @@ static zend_module_entry cgi_module_entry = { STANDARD_MODULE_PROPERTIES }; -/* {{{ main - */ +/* {{{ main */ int main(int argc, char *argv[]) { int free_query_string = 0; diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index dfda90fb8e..9972b0f7a7 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -423,8 +423,7 @@ static void sapi_cli_ini_defaults(HashTable *configuration_hash) } /* }}} */ -/* {{{ sapi_module_struct cli_sapi_module - */ +/* {{{ sapi_module_struct cli_sapi_module */ static sapi_module_struct cli_sapi_module = { "cli", /* name */ "Command Line Interface", /* pretty name */ @@ -471,8 +470,7 @@ static const zend_function_entry additional_functions[] = { PHP_FE_END }; -/* {{{ php_cli_usage - */ +/* {{{ php_cli_usage */ static void php_cli_usage(char *argv0) { char *prog; @@ -581,8 +579,7 @@ static void cli_register_file_handles(void) /* {{{ */ static const char *param_mode_conflict = "Either execute direct code, process stdin or use a file.\n"; -/* {{{ cli_seek_file_begin - */ +/* {{{ cli_seek_file_begin */ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file) { FILE *fp = VCWD_FOPEN(script_file, "rb"); @@ -1141,8 +1138,7 @@ err: } /* }}} */ -/* {{{ main - */ +/* {{{ main */ #ifdef PHP_CLI_WIN32_NO_CONSOLE int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) #else diff --git a/sapi/cli/php_cli_process_title.c b/sapi/cli/php_cli_process_title.c index 4437fdd46b..bd4eea59cd 100644 --- a/sapi/cli/php_cli_process_title.c +++ b/sapi/cli/php_cli_process_title.c @@ -22,8 +22,7 @@ #include "php_cli_process_title.h" #include "ps_title.h" -/* {{{ proto bool cli_set_process_title(string arg) - Return a boolean to confirm if the process title was successfully changed or not */ +/* {{{ Return a boolean to confirm if the process title was successfully changed or not */ PHP_FUNCTION(cli_set_process_title) { char *title = NULL; @@ -44,8 +43,7 @@ PHP_FUNCTION(cli_set_process_title) } /* }}} */ -/* {{{ proto string cli_get_process_title() - Return a string with the current process title. NULL if error. */ +/* {{{ Return a string with the current process title. NULL if error. */ PHP_FUNCTION(cli_get_process_title) { int length = 0; diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index ec658eb738..59929f21c9 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -436,8 +436,7 @@ PHP_FUNCTION(apache_response_headers) /* {{{ */ } /* }}} */ -/* {{{ cli_server module - */ +/* {{{ cli_server module */ static void cli_server_init_globals(zend_cli_server_globals *cg) { @@ -782,8 +781,7 @@ static void sapi_cli_server_log_message(const char *msg, int syslog_type_int) /* sapi_cli_server_log_write(PHP_CLI_SERVER_LOG_MESSAGE, msg); } /* }}} */ -/* {{{ sapi_module_struct cli_server_sapi_module - */ +/* {{{ sapi_module_struct cli_server_sapi_module */ sapi_module_struct cli_server_sapi_module = { "cli-server", /* name */ "Built-in HTTP server", /* pretty name */ diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index c2a1bd5df3..84b9e5958a 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -605,16 +605,14 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len) } /* }}} */ -/* {{{ sapi_cgi_log_message - */ +/* {{{ sapi_cgi_log_message */ static void sapi_cgi_log_message(const char *message, int syslog_type_int) { zlog_msg(ZLOG_NOTICE, "PHP message: ", message); } /* }}} */ -/* {{{ php_cgi_ini_activate_user_config - */ +/* {{{ php_cgi_ini_activate_user_config */ static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len) { char *ptr; @@ -777,8 +775,7 @@ static int php_cgi_startup(sapi_module_struct *sapi_module) /* {{{ */ } /* }}} */ -/* {{{ sapi_module_struct cgi_sapi_module - */ +/* {{{ sapi_module_struct cgi_sapi_module */ static sapi_module_struct cgi_sapi_module = { "fpm-fcgi", /* name */ "FPM/FastCGI", /* pretty name */ @@ -812,8 +809,7 @@ static sapi_module_struct cgi_sapi_module = { }; /* }}} */ -/* {{{ php_cgi_usage - */ +/* {{{ php_cgi_usage */ static void php_cgi_usage(char *argv0) { char *prog; @@ -1404,8 +1400,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("fpm.config", NULL, PHP_INI_SYSTEM, OnUpdateString, fpm_config, php_cgi_globals_struct, php_cgi_globals) PHP_INI_END() -/* {{{ php_cgi_globals_ctor - */ +/* {{{ php_cgi_globals_ctor */ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) { php_cgi_globals->rfc2616_headers = 0; @@ -1421,8 +1416,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(cgi) { #ifdef ZTS @@ -1435,8 +1429,7 @@ static PHP_MINIT_FUNCTION(cgi) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ static PHP_MSHUTDOWN_FUNCTION(cgi) { zend_hash_destroy(&CGIG(user_config_cache)); @@ -1446,8 +1439,7 @@ static PHP_MSHUTDOWN_FUNCTION(cgi) } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ static PHP_MINFO_FUNCTION(cgi) { php_info_print_table_start(); @@ -1494,8 +1486,7 @@ PHP_FUNCTION(apache_request_headers) /* {{{ */ } } /* }}} */ -/* {{{ proto array fpm_get_status - * Returns the status of the fastcgi process manager */ +/* {{{ Returns the status of the fastcgi process manager */ PHP_FUNCTION(fpm_get_status) /* {{{ */ { if (zend_parse_parameters_none() == FAILURE) { @@ -1521,8 +1512,7 @@ static zend_module_entry cgi_module_entry = { STANDARD_MODULE_PROPERTIES }; -/* {{{ main - */ +/* {{{ main */ int main(int argc, char *argv[]) { int exit_status = FPM_EXIT_OK; diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 6fec0c2b54..c3386f47ec 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -93,8 +93,7 @@ static void init_sapi_from_env(sapi_module_struct *sapi_module) sapi_module->php_ini_path_override = p; } -/* {{{ php_lsapi_startup - */ +/* {{{ php_lsapi_startup */ static int php_lsapi_startup(sapi_module_struct *sapi_module) { if (php_module_startup(sapi_module, NULL, 0)==FAILURE) { @@ -131,8 +130,7 @@ static void sapi_lsapi_ini_defaults(HashTable *configuration_hash) /* }}} */ -/* {{{ sapi_lsapi_ub_write - */ +/* {{{ sapi_lsapi_ub_write */ static size_t sapi_lsapi_ub_write(const char *str, size_t str_length) { int ret; @@ -160,8 +158,7 @@ static size_t sapi_lsapi_ub_write(const char *str, size_t str_length) /* }}} */ -/* {{{ sapi_lsapi_flush - */ +/* {{{ sapi_lsapi_flush */ static void sapi_lsapi_flush(void * server_context) { if ( lsapi_mode ) { @@ -173,8 +170,7 @@ static void sapi_lsapi_flush(void * server_context) /* }}} */ -/* {{{ sapi_lsapi_deactivate - */ +/* {{{ sapi_lsapi_deactivate */ static int sapi_lsapi_deactivate(void) { if ( SG(request_info).path_translated ) { @@ -189,8 +185,7 @@ static int sapi_lsapi_deactivate(void) -/* {{{ sapi_lsapi_getenv - */ +/* {{{ sapi_lsapi_getenv */ static char *sapi_lsapi_getenv(const char * name, size_t name_len ) { if ( lsapi_mode ) { @@ -260,8 +255,7 @@ static void litespeed_php_import_environment_variables(zval *array_ptr) } } -/* {{{ sapi_lsapi_register_variables - */ +/* {{{ sapi_lsapi_register_variables */ static void sapi_lsapi_register_variables(zval *track_vars_array) { char * php_self = ""; @@ -288,8 +282,7 @@ static void sapi_lsapi_register_variables(zval *track_vars_array) /* }}} */ -/* {{{ sapi_lsapi_read_post - */ +/* {{{ sapi_lsapi_read_post */ static size_t sapi_lsapi_read_post(char *buffer, size_t count_bytes) { if ( lsapi_mode ) { @@ -304,8 +297,7 @@ static size_t sapi_lsapi_read_post(char *buffer, size_t count_bytes) -/* {{{ sapi_lsapi_read_cookies - */ +/* {{{ sapi_lsapi_read_cookies */ static char *sapi_lsapi_read_cookies(void) { if ( lsapi_mode ) { @@ -463,8 +455,7 @@ static int sapi_lsapi_send_headers_like_cgi(sapi_headers_struct *sapi_headers) static int mod_lsapi_mode = 0; -/* {{{ sapi_lsapi_send_headers - */ +/* {{{ sapi_lsapi_send_headers */ static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers) { sapi_header_struct *h; @@ -507,8 +498,7 @@ static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers) /* }}} */ -/* {{{ sapi_lsapi_send_headers - */ +/* {{{ sapi_lsapi_send_headers */ static void sapi_lsapi_log_message(const char *message, int syslog_type_int) { char buf[8192]; @@ -597,8 +587,7 @@ static int sapi_lsapi_activate() } return SUCCESS; } -/* {{{ sapi_module_struct cgi_sapi_module - */ +/* {{{ sapi_module_struct cgi_sapi_module */ static sapi_module_struct lsapi_sapi_module = { "litespeed", @@ -1678,8 +1667,7 @@ static int add_associate_array( const char * pKey, int keyLen, const char * pVal } -/* {{{ proto array litespeed_request_headers(void) - Fetch all HTTP request headers */ +/* {{{ Fetch all HTTP request headers */ PHP_FUNCTION(litespeed_request_headers) { if (zend_parse_parameters_none() == FAILURE) { @@ -1694,8 +1682,7 @@ PHP_FUNCTION(litespeed_request_headers) -/* {{{ proto array litespeed_response_headers(void) - Fetch all HTTP response headers */ +/* {{{ Fetch all HTTP response headers */ PHP_FUNCTION(litespeed_response_headers) { sapi_header_struct *h; @@ -1737,8 +1724,7 @@ PHP_FUNCTION(litespeed_response_headers) /* }}} */ -/* {{{ proto array apache_get_modules(void) - Fetch all loaded module names */ +/* {{{ Fetch all loaded module names */ PHP_FUNCTION(apache_get_modules) { static const char * mod_names[] = @@ -1761,8 +1747,7 @@ PHP_FUNCTION(apache_get_modules) /* }}} */ -/* {{{ proto bool litespeed_finish_request(void) - Flushes all response data to the client */ +/* {{{ Flushes all response data to the client */ PHP_FUNCTION(litespeed_finish_request) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index f978c21ea3..176ab4cb49 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -286,8 +286,7 @@ static PHP_RSHUTDOWN_FUNCTION(phpdbg) /* {{{ */ return SUCCESS; } /* }}} */ -/* {{{ proto mixed phpdbg_exec(string context) - Attempt to set the execution context for phpdbg +/* {{{ Attempt to set the execution context for phpdbg If the execution context was set previously it is returned If the execution context was not set previously boolean true is returned If the request to set the context fails, boolean false is returned, and an E_WARNING raised */ @@ -329,8 +328,7 @@ PHP_FUNCTION(phpdbg_exec) } } /* }}} */ -/* {{{ proto void phpdbg_break() - instructs phpdbg to insert a breakpoint at the next opcode */ +/* {{{ instructs phpdbg to insert a breakpoint at the next opcode */ PHP_FUNCTION(phpdbg_break_next) { zend_execute_data *ex; @@ -351,7 +349,7 @@ PHP_FUNCTION(phpdbg_break_next) phpdbg_set_breakpoint_opline_ex((phpdbg_opline_ptr_t) ex->opline + 1); } /* }}} */ -/* {{{ proto void phpdbg_break_file(string file, int line) */ +/* {{{ */ PHP_FUNCTION(phpdbg_break_file) { char *file; @@ -365,7 +363,7 @@ PHP_FUNCTION(phpdbg_break_file) phpdbg_set_breakpoint_file(file, 0, line); } /* }}} */ -/* {{{ proto void phpdbg_break_method(string class, string method) */ +/* {{{ */ PHP_FUNCTION(phpdbg_break_method) { char *class, *method; @@ -378,7 +376,7 @@ PHP_FUNCTION(phpdbg_break_method) phpdbg_set_breakpoint_method(class, method); } /* }}} */ -/* {{{ proto void phpdbg_break_function(string function) */ +/* {{{ */ PHP_FUNCTION(phpdbg_break_function) { char *function; @@ -391,8 +389,7 @@ PHP_FUNCTION(phpdbg_break_function) phpdbg_set_breakpoint_symbol(function, function_len); } /* }}} */ -/* {{{ proto void phpdbg_clear(void) - instructs phpdbg to clear breakpoints */ +/* {{{ instructs phpdbg to clear breakpoints */ PHP_FUNCTION(phpdbg_clear) { if (zend_parse_parameters_none() == FAILURE) { @@ -410,7 +407,7 @@ PHP_FUNCTION(phpdbg_clear) zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]); } /* }}} */ -/* {{{ proto void phpdbg_color(int element, string color) */ +/* {{{ */ PHP_FUNCTION(phpdbg_color) { zend_long element; @@ -433,7 +430,7 @@ PHP_FUNCTION(phpdbg_color) } } /* }}} */ -/* {{{ proto void phpdbg_prompt(string prompt) */ +/* {{{ */ PHP_FUNCTION(phpdbg_prompt) { char *prompt = NULL; @@ -446,7 +443,7 @@ PHP_FUNCTION(phpdbg_prompt) phpdbg_set_prompt(prompt); } /* }}} */ -/* {{{ proto void phpdbg_start_oplog() */ +/* {{{ */ PHP_FUNCTION(phpdbg_start_oplog) { phpdbg_oplog_list *prev; @@ -523,7 +520,7 @@ static inline HashTable* phpdbg_add_empty_array(HashTable *ht, zend_string *name return Z_ARR_P(ht_zv); } -/* {{{ proto void phpdbg_get_executable() */ +/* {{{ */ PHP_FUNCTION(phpdbg_get_executable) { HashTable *options = NULL; @@ -621,7 +618,7 @@ PHP_FUNCTION(phpdbg_get_executable) } } -/* {{{ proto void phpdbg_end_oplog() */ +/* {{{ */ PHP_FUNCTION(phpdbg_end_oplog) { phpdbg_oplog_entry *cur; @@ -981,8 +978,7 @@ void phpdbg_register_file_handles(void) /* {{{ */ } /* }}} */ -/* {{{ sapi_module_struct phpdbg_sapi_module -*/ +/* {{{ sapi_module_struct phpdbg_sapi_module */ static sapi_module_struct phpdbg_sapi_module = { "phpdbg", /* name */ "phpdbg", /* pretty name */ diff --git a/win32/codepage.c b/win32/codepage.c index 5ed0fd50a5..6c00c532ec 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -555,8 +555,7 @@ PW32CP const struct php_win32_cp *php_win32_cp_cli_do_restore(DWORD id) /* Userspace functions, see basic_functions.* for arginfo and decls. */ -/* {{{ proto bool sapi_windows_cp_set(int cp) - * Set process codepage. */ +/* {{{ Set process codepage. */ PHP_FUNCTION(sapi_windows_cp_set) { zend_long id; @@ -585,8 +584,7 @@ PHP_FUNCTION(sapi_windows_cp_set) } /* }}} */ -/* {{{ proto int sapi_windows_cp_get([string kind]) - * Get process codepage. */ +/* {{{ Get process codepage. */ PHP_FUNCTION(sapi_windows_cp_get) { char *kind; @@ -608,8 +606,7 @@ PHP_FUNCTION(sapi_windows_cp_get) /* }}} */ -/* {{{ proto bool sapi_windows_cp_is_utf8(void) - * Indicates whether the codepage is UTF-8 compatible. */ +/* {{{ Indicates whether the codepage is UTF-8 compatible. */ PHP_FUNCTION(sapi_windows_cp_is_utf8) { if (zend_parse_parameters_none() == FAILURE) { @@ -620,8 +617,7 @@ PHP_FUNCTION(sapi_windows_cp_is_utf8) } /* }}} */ -/* {{{ proto string sapi_windows_cp_conv(int|string in_codepage, int|string out_codepage, string subject) - * Convert string from one codepage to another. */ +/* {{{ Convert string from one codepage to another. */ PHP_FUNCTION(sapi_windows_cp_conv) { char *ret; diff --git a/win32/signal.c b/win32/signal.c index 26bedd1088..2436313d2a 100644 --- a/win32/signal.c +++ b/win32/signal.c @@ -84,8 +84,7 @@ static BOOL WINAPI php_win32_signal_system_ctrl_handler(DWORD evt) return TRUE; }/*}}}*/ -/* {{{ proto bool sapi_windows_set_ctrl_handler(callable handler, [, bool add = true]) - Assigns a CTRL signal handler to a PHP function */ +/* {{{ Assigns a CTRL signal handler to a PHP function */ PHP_FUNCTION(sapi_windows_set_ctrl_handler) { zval *handler = NULL; |