com php-src: Fix more proto comments: ext/exif/exif.c ext/gd/gd.c ext/mysqli/mysqli_api.c ext/oci8/oci8_interface.c ext/odbc/php_odbc.c
ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/simplexml/simplexml.c ext/soap/soap.c ext/spl/php _spl.c
ext/spl/spl_directory.c ext/spl/spl_dllist .c ext/spl/spl_heap.c ext/spl/spl_iterators.c e xt/spl/spl_observer.c ext/standard/array.c ext/standa
rd/string.c ext/standard/var.c ex

Commit: 28d7bb97a11c8eb55d568cb095517861c2e33d45 Author: Rasmus Lerdorf <rasmus@php.net> Tue, 23 Jun 2015 17:46:07 -0400 Parents: 2d2bd2db971d4a3d9447418ec47dc79b1a782c95 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28d7bb97a11c8eb55d568cb095517861c2e33d45 Log: Fix more proto comments Changed paths: M ext/exif/exif.c M ext/gd/gd.c M ext/mysqli/mysqli_api..c M ext/oci8/oci8_interface.c M ext/odbc/php_odbc.c M ext/pdo_pgsql/pgsql_driver.c M ext/pgsql/pgsql.c M ext/reflection/php_reflection.c M ext/simplexml/simplexml.c M ext/soap/soap.c M ext/spl/php_spl.c M ext/spl/spl_directory.c M ext/spl/spl_dllist..c M ext/spl/spl_heap.c M ext/spl/spl_iterators.c M ext/spl/spl_observer.c M ext/standard/array.c M ext/standard/string.c M ext/standard/var.c M ext/xmlrpc/xmlrpc-epi-php.c

diff --git a/ext/exif/exif.c b/ext/exif/exif.c index e063087..0d7d99e 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2328,7 +2328,7 @@ static char * exif_get_markername(int marker) #endif /* }}} */ -/* {{{ proto string exif_tagname(index) +/* {{{ proto string exif_tagname(int index) Get headername for index or false if not defined */ PHP_FUNCTION(exif_tagname) { @@ -3905,7 +3905,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t } /* }}} */ -/* {{{ proto array exif_read_data(string filename [, sections_needed [, sub_arrays[, read_thumbnail]]]) +/* {{{ proto array exif_read_data(string filename [, string sections_needed [, bool sub_arrays[, bool read_thumbnail]]]) Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */ PHP_FUNCTION(exif_read_data) { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 9b47118..8004585 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2670,7 +2670,7 @@ PHP_FUNCTION(imagepng) #ifdef HAVE_GD_WEBP -/* {{{ proto bool imagewebp(resource im [, string filename[, quality]] ) +/* {{{ proto bool imagewebp(resource im [, string filename[, int quality]] ) Output WEBP image to browser or file */ PHP_FUNCTION(imagewebp) { @@ -2690,7 +2690,7 @@ PHP_FUNCTION(imagejpeg) /* }}} */ #endif /* HAVE_GD_JPG */ -/* {{{ proto bool imagewbmp(resource im [, string filename, [, int foreground]]) +/* {{{ proto bool imagewbmp(resource im [, string filename [, int foreground]]) Output WBMP image to browser or file */ PHP_FUNCTION(imagewbmp) { @@ -2706,7 +2706,7 @@ PHP_FUNCTION(imagegd) } /* }}} */ -/* {{{ proto bool imagegd2(resource im [, string filename, [, int chunk_size, [, int type]]]) +/* {{{ proto bool imagegd2(resource im [, string filename [, int chunk_size [, int type]]]) Output GD2 image to browser or file */ PHP_FUNCTION(imagegd2) { @@ -4376,7 +4376,7 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS) RETURN_FALSE; } -/* {{{ proto bool imagefilter(resource src_im, int filtertype, [args] ) +/* {{{ proto bool imagefilter(resource src_im, int filtertype[, int arg1 [, int arg2 [, int arg3 [, int arg4 ]]]] ) Applies Filter an image using a custom angle */ PHP_FUNCTION(imagefilter) { @@ -4582,7 +4582,7 @@ PHP_FUNCTION(imagecrop) } /* }}} */ -/* {{{ proto void imagecropauto(resource im [, int mode [, threshold [, color]]]) +/* {{{ proto void imagecropauto(resource im [, int mode [, float threshold [, int color]]]) Crop an image automatically using one of the available modes. */ PHP_FUNCTION(imagecropauto) { @@ -4632,7 +4632,7 @@ PHP_FUNCTION(imagecropauto) } /* }}} */ -/* {{{ proto resource imagescale(resource im, new_width[, new_height[, method]]) +/* {{{ proto resource imagescale(resource im, int new_width[, int new_height[, int method]]) Scale an image using the given new width and height. */ PHP_FUNCTION(imagescale) { @@ -4775,7 +4775,7 @@ PHP_FUNCTION(imageaffine) } /* }}} */ -/* {{{ proto array imageaffinematrixget(type[, options]) +/* {{{ proto array imageaffinematrixget(int type[, array options]) Return an image containing the affine tramsformed src image, using an optional clipping area */ PHP_FUNCTION(imageaffinematrixget) { @@ -4923,7 +4923,7 @@ PHP_FUNCTION(imageaffinematrixconcat) } } /* }}} */ -/* {{{ proto resource imagesetinterpolation(resource im, [, method]]) +/* {{{ proto resource imagesetinterpolation(resource im [, int method]]) Set the default interpolation method, passing -1 or 0 sets it to the libgd default (bilinear). */ PHP_FUNCTION(imagesetinterpolation) { diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 22ef0c8..f52884f 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -315,7 +315,7 @@ end: #endif /* }}} */ -/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed,....]) U +/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed ...]) Bind variables to a prepared statement as parameters */ PHP_FUNCTION(mysqli_stmt_bind_param) { @@ -580,7 +580,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, ...]) U +/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var [,mixed ...]) Bind variables to a prepared statement for result storage */ PHP_FUNCTION(mysqli_stmt_bind_result) { @@ -790,7 +790,7 @@ PHP_FUNCTION(mysqli_data_seek) } /* }}} */ -/* {{{ proto void mysqli_debug(string debug) U +/* {{{ proto void mysqli_debug(string debug) */ PHP_FUNCTION(mysqli_debug) { @@ -1137,7 +1137,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS) #endif /* }}} */ -/* {{{ proto mixed mysqli_stmt_fetch(object stmt) U +/* {{{ proto mixed mysqli_stmt_fetch(object stmt) Fetch results from a prepared statement into the bound variables */ PHP_FUNCTION(mysqli_stmt_fetch) { @@ -2235,7 +2235,7 @@ PHP_FUNCTION(mysqli_sqlstate) } /* }}} */ -/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) U +/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) */ PHP_FUNCTION(mysqli_ssl_set) { @@ -2507,7 +2507,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata) } /* }}} */ -/* {{{ proto bool mysqli_stmt_store_result(stmt) +/* {{{ proto bool mysqli_stmt_store_result(object stmt) */ PHP_FUNCTION(mysqli_stmt_store_result) { @@ -2576,7 +2576,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate) } /* }}} */ -/* {{{ proto object mysqli_store_result(object link [, flags]) +/* {{{ proto object mysqli_store_result(object link [, int flags]) Buffer result set on client */ PHP_FUNCTION(mysqli_store_result) { diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index c4a2773..e1452dc 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -93,7 +93,7 @@ PHP_FUNCTION(oci_define_by_name) } /* }}} */ -/* {{{ proto bool oci_bind_by_name(resource stmt, string name, mixed &var, [, int maxlength [, int type]]) +/* {{{ 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 */ /* if you want to bind a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE binding!!! */ PHP_FUNCTION(oci_bind_by_name) diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 9e51dca..eac4436 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1843,7 +1843,7 @@ PHP_FUNCTION(odbc_fetch_array) /* }}} */ #endif -/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array, [, int rownumber]) +/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array [, int rownumber]) Fetch one result row into an array */ PHP_FUNCTION(odbc_fetch_into) { diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index f913eb7..9fa78e0 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -750,7 +750,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromFile) /* }}} */ -/* {{{ proto string PDO::pgsqlCopyToFile(string $table_name , $filename, [string $delimiter [, string $null_as [, string $fields]]]) +/* {{{ 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 */ static PHP_METHOD(PDO, pgsqlCopyToFile) { diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 6965589..704a919 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5260,7 +5260,7 @@ PHP_FUNCTION(pg_result_status) } /* }}} */ -/* {{{ proto array pg_get_notify([resource connection[, result_type]]) +/* {{{ proto mixed pg_get_notify([resource connection[, int result_type]]) Get asynchronous notification */ PHP_FUNCTION(pg_get_notify) { @@ -5400,7 +5400,7 @@ static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret) /* {{{ } /* }}} */ -/* {{{ proto resource pg_socket(resource) +/* {{{ proto resource pg_socket(resource connection) Get a read-only handle to the socket underlying the pgsql connection */ PHP_FUNCTION(pg_socket) { @@ -5427,7 +5427,7 @@ PHP_FUNCTION(pg_socket) } /* }}} */ -/* {{{ proto bool pg_consume_input(resource) +/* {{{ proto bool pg_consume_input(resource connection) Reads input on the connection */ PHP_FUNCTION(pg_consume_input) { @@ -5446,7 +5446,7 @@ PHP_FUNCTION(pg_consume_input) } /* }}} */ -/* {{{ proto mixed pg_flush(resource) +/* {{{ proto mixed pg_flush(resource connection) Flush outbound query data on the connection */ PHP_FUNCTION(pg_flush) { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 2252233..5c7f26a 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2153,7 +2153,7 @@ ZEND_METHOD(reflection_function, getExtensionName) } /* }}} */ -/* {{{ proto public void ReflectionGenerator::__construct(Generator) */ +/* {{{ proto public void ReflectionGenerator::__construct(object Generator) */ ZEND_METHOD(reflection_generator, __construct) { zval *generator, *object; @@ -3839,7 +3839,7 @@ ZEND_METHOD(reflection_class, getStaticPropertyValue) } /* }}} */ -/* {{{ proto public void ReflectionClass::setStaticPropertyValue($name, $value) +/* {{{ proto public void ReflectionClass::setStaticPropertyValue(string $name, mixed $value) Sets the value of a static property */ ZEND_METHOD(reflection_class, setStaticPropertyValue) { diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 9beb946..003ad4c 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1926,7 +1926,7 @@ static int sxe_object_cast(zval *readobj, zval *writeobj, int type) } /* }}} */ -/* {{{ proto object SimpleXMLElement::__toString() U +/* {{{ proto object SimpleXMLElement::__toString() Returns the string content */ SXE_METHOD(__toString) { diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 05c7b85..29e09e8 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1333,7 +1333,7 @@ PHP_METHOD(SoapServer, setClass) /* }}} */ -/* {{{ proto void SoapServer::setObject(object) +/* {{{ proto void SoapServer::setObject(object obj) Sets object which will handle SOAP requests */ PHP_METHOD(SoapServer, setObject) { diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 917411a..40e3126 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -450,7 +450,7 @@ PHP_FUNCTION(spl_autoload_call) zend_hash_rehash(ht); \ } while (0) -/* {{{ proto bool spl_autoload_register([mixed autoload_function = "spl_autoload" [, throw = true [, prepend]]]) +/* {{{ proto bool spl_autoload_register([mixed autoload_function [, bool throw [, bool prepend]]]) Register given function as __autoload() implementation */ PHP_FUNCTION(spl_autoload_register) { diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 3fed819..b159601 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -978,7 +978,7 @@ SPL_METHOD(DirectoryIterator, getExtension) } /* }}} */ -/* {{{ proto string SplFileInfo::getBasename([string $suffix]) U +/* {{{ proto string SplFileInfo::getBasename([string $suffix]) Returns filename component of path */ SPL_METHOD(SplFileInfo, getBasename) { @@ -1005,7 +1005,7 @@ SPL_METHOD(SplFileInfo, getBasename) } /* }}}*/ -/* {{{ proto string DirectoryIterator::getBasename([string $suffix]) U +/* {{{ proto string DirectoryIterator::getBasename([string $suffix]) Returns filename component of current dir entry */ SPL_METHOD(DirectoryIterator, getBasename) { @@ -1215,7 +1215,7 @@ FileInfoFunction(isDir, FS_IS_DIR) FileInfoFunction(isLink, FS_IS_LINK) /* }}} */ -/* {{{ proto string SplFileInfo::getLinkTarget() U +/* {{{ proto string SplFileInfo::getLinkTarget() Return the target of a symbolic link */ SPL_METHOD(SplFileInfo, getLinkTarget) { @@ -2656,7 +2656,7 @@ SPL_METHOD(SplFileObject, fputcsv) } /* }}} */ -/* {{{ proto void SplFileObject::setCsvControl([string delimiter = ',' [, string enclosure = '"' [, string escape = '\\']]]) +/* {{{ proto void SplFileObject::setCsvControl([string delimiter [, string enclosure [, string escape ]]]) Set the delimiter and enclosure character used in fgetcsv */ SPL_METHOD(SplFileObject, setCsvControl) { diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 6dc2e23..dfdbfda 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -559,7 +559,7 @@ static HashTable *spl_dllist_object_get_gc(zval *obj, zval **gc_data, int *gc_da } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::push(mixed $value) +/* {{{ proto bool SplDoublyLinkedList::push(mixed value) Push $value on the SplDoublyLinkedList */ SPL_METHOD(SplDoublyLinkedList, push) { @@ -577,7 +577,7 @@ SPL_METHOD(SplDoublyLinkedList, push) } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::unshift(mixed $value) +/* {{{ proto bool SplDoublyLinkedList::unshift(mixed value) Unshift $value on the SplDoublyLinkedList */ SPL_METHOD(SplDoublyLinkedList, unshift) { @@ -712,7 +712,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty) } /* }}} */ -/* {{{ proto int SplDoublyLinkedList::setIteratorMode($flags) +/* {{{ proto int SplDoublyLinkedList::setIteratorMode(int flags) Set the mode of iteration */ SPL_METHOD(SplDoublyLinkedList, setIteratorMode) { @@ -753,7 +753,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode) } /* }}} */ -/* {{{ proto bool SplDoublyLinkedList::offsetExists(mixed $index) +/* {{{ proto bool SplDoublyLinkedList::offsetExists(mixed index) Returns whether the requested $index exists. */ SPL_METHOD(SplDoublyLinkedList, offsetExists) { @@ -771,7 +771,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetExists) RETURN_BOOL(index >= 0 && index < intern->llist->count); } /* }}} */ -/* {{{ proto mixed SplDoublyLinkedList::offsetGet(mixed $index) +/* {{{ proto mixed SplDoublyLinkedList::offsetGet(mixed index) Returns the value at the specified $index. */ SPL_METHOD(SplDoublyLinkedList, offsetGet) { @@ -802,7 +802,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet) } } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::offsetSet(mixed $index, mixed $newval) +/* {{{ proto void SplDoublyLinkedList::offsetSet(mixed index, mixed newval) Sets the value at the specified $index to $newval. */ SPL_METHOD(SplDoublyLinkedList, offsetSet) { @@ -856,7 +856,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet) } } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::offsetUnset(mixed $index) +/* {{{ proto void SplDoublyLinkedList::offsetUnset(mixed index) Unsets the value at the specified $index. */ SPL_METHOD(SplDoublyLinkedList, offsetUnset) { @@ -1226,7 +1226,7 @@ error: } /* }}} */ -/* {{{ proto void SplDoublyLinkedList::add(mixed $index, mixed $newval) +/* {{{ proto void SplDoublyLinkedList::add(mixed index, mixed newval) Inserts a new entry before the specified $index consisting of $newval. */ SPL_METHOD(SplDoublyLinkedList, add) { diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 5d045f7..f790576 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -579,7 +579,7 @@ SPL_METHOD(SplHeap, isEmpty) } /* }}} */ -/* {{{ proto bool SplHeap::insert(mixed $value) +/* {{{ proto bool SplHeap::insert(mixed value) Push $value on the heap */ SPL_METHOD(SplHeap, insert) { @@ -630,7 +630,7 @@ SPL_METHOD(SplHeap, extract) } /* }}} */ -/* {{{ proto bool SplPriorityQueue::insert(mixed $value, mixed $priority) +/* {{{ proto bool SplPriorityQueue::insert(mixed value, mixed priority) Push $value with the priority $priodiry on the priorityqueue */ SPL_METHOD(SplPriorityQueue, insert) { @@ -736,7 +736,7 @@ SPL_METHOD(SplPriorityQueue, top) /* }}} */ -/* {{{ proto int SplPriorityQueue::setExtractFlags($flags) +/* {{{ proto int SplPriorityQueue::setExtractFlags(int flags) Set the flags of extraction*/ SPL_METHOD(SplPriorityQueue, setExtractFlags) { diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index ed325a1..eca51fb 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1602,7 +1602,7 @@ SPL_METHOD(FilterIterator, __construct) spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_FilterIterator, zend_ce_iterator, DIT_FilterIterator); } /* }}} */ -/* {{{ proto void CallbackFilterIterator::__construct(Iterator it, callback) +/* {{{ proto void CallbackFilterIterator::__construct(Iterator it, callback func) Create an Iterator from another iterator */ SPL_METHOD(CallbackFilterIterator, __construct) { @@ -1881,7 +1881,7 @@ SPL_METHOD(FilterIterator, next) spl_filter_it_next(getThis(), intern); } /* }}} */ -/* {{{ proto void RecursiveCallbackFilterIterator::__construct(RecursiveIterator it, callback) +/* {{{ proto void RecursiveCallbackFilterIterator::__construct(RecursiveIterator it, callback func) Create a RecursiveCallbackFilterIterator from a RecursiveIterator */ SPL_METHOD(RecursiveCallbackFilterIterator, __construct) { diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index e2a5573..23cc73f 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -417,7 +417,7 @@ int spl_object_storage_contains(spl_SplObjectStorage *intern, zval *this, zval * return found; } /* }}} */ -/* {{{ proto void SplObjectStorage::attach($obj, $inf = NULL) +/* {{{ proto void SplObjectStorage::attach(object obj, mixed inf = NULL) Attaches an object to the storage if not yet contained */ SPL_METHOD(SplObjectStorage, attach) { @@ -431,7 +431,7 @@ SPL_METHOD(SplObjectStorage, attach) spl_object_storage_attach(intern, getThis(), obj, inf); } /* }}} */ -/* {{{ proto void SplObjectStorage::detach($obj) +/* {{{ proto void SplObjectStorage::detach(object obj) Detaches an object from the storage */ SPL_METHOD(SplObjectStorage, detach) { @@ -447,7 +447,7 @@ SPL_METHOD(SplObjectStorage, detach) intern->index = 0; } /* }}} */ -/* {{{ proto string SplObjectStorage::getHash($object) +/* {{{ proto string SplObjectStorage::getHash(object obj) Returns the hash of an object */ SPL_METHOD(SplObjectStorage, getHash) { @@ -461,7 +461,7 @@ SPL_METHOD(SplObjectStorage, getHash) } /* }}} */ -/* {{{ proto mixed SplObjectStorage::offsetGet($object) +/* {{{ proto mixed SplObjectStorage::offsetGet(object obj) Returns associated information for a stored object */ SPL_METHOD(SplObjectStorage, offsetGet) { @@ -564,7 +564,7 @@ SPL_METHOD(SplObjectStorage, removeAllExcept) } /* }}} */ -/* {{{ proto bool SplObjectStorage::contains($obj) +/* {{{ proto bool SplObjectStorage::contains(object obj) Determine whethe an object is contained in the storage */ SPL_METHOD(SplObjectStorage, contains) { diff --git a/ext/standard/array.c b/ext/standard/array.c index a998079..1cf5da1 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4389,7 +4389,7 @@ static void array_bucket_p_sawp(void *p, void *q) /* {{{ */ { } /* }}} */ -/* {{{ proto bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) +/* {{{ 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 */ PHP_FUNCTION(array_multisort) { diff --git a/ext/standard/string.c b/ext/standard/string.c index 186f687..16b3925 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -347,7 +347,7 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) / } /* }}} */ -/* {{{ proto int strspn(string str, string mask [, start [, len]]) +/* {{{ proto int 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) */ PHP_FUNCTION(strspn) { @@ -355,7 +355,7 @@ PHP_FUNCTION(strspn) } /* }}} */ -/* {{{ proto int strcspn(string str, string mask [, start [, len]]) +/* {{{ proto int 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) */ PHP_FUNCTION(strcspn) { diff --git a/ext/standard/var.c b/ext/standard/var.c index fc6be92..2870821 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -1054,7 +1054,7 @@ PHP_FUNCTION(unserialize) } /* }}} */ -/* {{{ proto int memory_get_usage([real_usage]) +/* {{{ proto int memory_get_usage([bool real_usage]) Returns the allocated by PHP memory */ PHP_FUNCTION(memory_get_usage) { zend_bool real_usage = 0; @@ -1067,7 +1067,7 @@ PHP_FUNCTION(memory_get_usage) { } /* }}} */ -/* {{{ proto int memory_get_peak_usage([real_usage]) +/* {{{ proto int memory_get_peak_usage([bool real_usage]) Returns the peak allocated by PHP memory */ PHP_FUNCTION(memory_get_peak_usage) { zend_bool real_usage = 0; diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 1d3de75..4c1b6ef 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1417,7 +1417,7 @@ PHP_FUNCTION(xmlrpc_get_type) } /* }}} */ -/* {{{ proto bool xmlrpc_is_fault(array) +/* {{{ proto bool xmlrpc_is_fault(array arg) Determines if an array value represents an XMLRPC fault. */ PHP_FUNCTION(xmlrpc_is_fault) {