Skip to content

Commit 28d7bb9

Browse files
rlerdorfrlerdorf
committed
Fix more proto comments
1 parent 2d2bd2d commit 28d7bb9

File tree

20 files changed

+57
-57
lines changed

20 files changed

+57
-57
lines changed

‎ext/exif/exif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2328,7 +2328,7 @@ static char * exif_get_markername(int marker)
23282328
#endif
23292329
/* }}} */
23302330

2331-
/* {{{ proto string exif_tagname(index)
2331+
/* {{{ proto string exif_tagname(int index)
23322332
Get headername for index or false if not defined */
23332333
PHP_FUNCTION(exif_tagname)
23342334
{
@@ -3905,7 +3905,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
39053905
}
39063906
/* }}} */
39073907

3908-
/* {{{ proto array exif_read_data(string filename [, sections_needed [, sub_arrays[, read_thumbnail]]])
3908+
/* {{{ proto array exif_read_data(string filename [, string sections_needed [, bool sub_arrays[, bool read_thumbnail]]])
39093909
Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */
39103910
PHP_FUNCTION(exif_read_data)
39113911
{

‎ext/gd/gd.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,7 +2670,7 @@ PHP_FUNCTION(imagepng)
26702670

26712671

26722672
#ifdef HAVE_GD_WEBP
2673-
/* {{{ proto bool imagewebp(resource im [, string filename[, quality]] )
2673+
/* {{{ proto bool imagewebp(resource im [, string filename[, int quality]] )
26742674
Output WEBP image to browser or file */
26752675
PHP_FUNCTION(imagewebp)
26762676
{
@@ -2690,7 +2690,7 @@ PHP_FUNCTION(imagejpeg)
26902690
/* }}} */
26912691
#endif /* HAVE_GD_JPG */
26922692

2693-
/* {{{ proto bool imagewbmp(resource im [, string filename, [, int foreground]])
2693+
/* {{{ proto bool imagewbmp(resource im [, string filename [, int foreground]])
26942694
Output WBMP image to browser or file */
26952695
PHP_FUNCTION(imagewbmp)
26962696
{
@@ -2706,7 +2706,7 @@ PHP_FUNCTION(imagegd)
27062706
}
27072707
/* }}} */
27082708

2709-
/* {{{ proto bool imagegd2(resource im [, string filename, [, int chunk_size, [, int type]]])
2709+
/* {{{ proto bool imagegd2(resource im [, string filename [, int chunk_size [, int type]]])
27102710
Output GD2 image to browser or file */
27112711
PHP_FUNCTION(imagegd2)
27122712
{
@@ -4376,7 +4376,7 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
43764376
RETURN_FALSE;
43774377
}
43784378

4379-
/* {{{ proto bool imagefilter(resource src_im, int filtertype, [args] )
4379+
/* {{{ proto bool imagefilter(resource src_im, int filtertype[, int arg1 [, int arg2 [, int arg3 [, int arg4 ]]]] )
43804380
Applies Filter an image using a custom angle */
43814381
PHP_FUNCTION(imagefilter)
43824382
{
@@ -4582,7 +4582,7 @@ PHP_FUNCTION(imagecrop)
45824582
}
45834583
/* }}} */
45844584

4585-
/* {{{ proto void imagecropauto(resource im [, int mode [, threshold [, color]]])
4585+
/* {{{ proto void imagecropauto(resource im [, int mode [, float threshold [, int color]]])
45864586
Crop an image automatically using one of the available modes. */
45874587
PHP_FUNCTION(imagecropauto)
45884588
{
@@ -4632,7 +4632,7 @@ PHP_FUNCTION(imagecropauto)
46324632
}
46334633
/* }}} */
46344634

4635-
/* {{{ proto resource imagescale(resource im, new_width[, new_height[, method]])
4635+
/* {{{ proto resource imagescale(resource im, int new_width[, int new_height[, int method]])
46364636
Scale an image using the given new width and height. */
46374637
PHP_FUNCTION(imagescale)
46384638
{
@@ -4775,7 +4775,7 @@ PHP_FUNCTION(imageaffine)
47754775
}
47764776
/* }}} */
47774777

4778-
/* {{{ proto array imageaffinematrixget(type[, options])
4778+
/* {{{ proto array imageaffinematrixget(int type[, array options])
47794779
Return an image containing the affine tramsformed src image, using an optional clipping area */
47804780
PHP_FUNCTION(imageaffinematrixget)
47814781
{
@@ -4923,7 +4923,7 @@ PHP_FUNCTION(imageaffinematrixconcat)
49234923
}
49244924
} /* }}} */
49254925

4926-
/* {{{ proto resource imagesetinterpolation(resource im, [, method]])
4926+
/* {{{ proto resource imagesetinterpolation(resource im [, int method]])
49274927
Set the default interpolation method, passing -1 or 0 sets it to the libgd default (bilinear). */
49284928
PHP_FUNCTION(imagesetinterpolation)
49294929
{

‎ext/mysqli/mysqli_api.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
315315
#endif
316316
/* }}} */
317317

318-
/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed,....]) U
318+
/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed ...])
319319
Bind variables to a prepared statement as parameters */
320320
PHP_FUNCTION(mysqli_stmt_bind_param)
321321
{
@@ -580,7 +580,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc)
580580
#endif
581581
/* }}} */
582582

583-
/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var, [,mixed, ...]) U
583+
/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var [,mixed ...])
584584
Bind variables to a prepared statement for result storage */
585585
PHP_FUNCTION(mysqli_stmt_bind_result)
586586
{
@@ -790,7 +790,7 @@ PHP_FUNCTION(mysqli_data_seek)
790790
}
791791
/* }}} */
792792

793-
/* {{{ proto void mysqli_debug(string debug) U
793+
/* {{{ proto void mysqli_debug(string debug)
794794
*/
795795
PHP_FUNCTION(mysqli_debug)
796796
{
@@ -1137,7 +1137,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
11371137
#endif
11381138
/* }}} */
11391139

1140-
/* {{{ proto mixed mysqli_stmt_fetch(object stmt) U
1140+
/* {{{ proto mixed mysqli_stmt_fetch(object stmt)
11411141
Fetch results from a prepared statement into the bound variables */
11421142
PHP_FUNCTION(mysqli_stmt_fetch)
11431143
{
@@ -2235,7 +2235,7 @@ PHP_FUNCTION(mysqli_sqlstate)
22352235
}
22362236
/* }}} */
22372237

2238-
/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) U
2238+
/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher])
22392239
*/
22402240
PHP_FUNCTION(mysqli_ssl_set)
22412241
{
@@ -2507,7 +2507,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata)
25072507
}
25082508
/* }}} */
25092509

2510-
/* {{{ proto bool mysqli_stmt_store_result(stmt)
2510+
/* {{{ proto bool mysqli_stmt_store_result(object stmt)
25112511
*/
25122512
PHP_FUNCTION(mysqli_stmt_store_result)
25132513
{
@@ -2576,7 +2576,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate)
25762576
}
25772577
/* }}} */
25782578

2579-
/* {{{ proto object mysqli_store_result(object link [, flags])
2579+
/* {{{ proto object mysqli_store_result(object link [, int flags])
25802580
Buffer result set on client */
25812581
PHP_FUNCTION(mysqli_store_result)
25822582
{

‎ext/oci8/oci8_interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ PHP_FUNCTION(oci_define_by_name)
9393
}
9494
/* }}} */
9595

96-
/* {{{ proto bool oci_bind_by_name(resource stmt, string name, mixed &var, [, int maxlength [, int type]])
96+
/* {{{ proto bool oci_bind_by_name(resource stmt, string name, mixed &var [, int maxlength [, int type]])
9797
Bind a PHP variable to an Oracle placeholder by name */
9898
/* if you want to bind a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE binding!!! */
9999
PHP_FUNCTION(oci_bind_by_name)

‎ext/odbc/php_odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,7 @@ PHP_FUNCTION(odbc_fetch_array)
18431843
/* }}} */
18441844
#endif
18451845

1846-
/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array, [, int rownumber])
1846+
/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array [, int rownumber])
18471847
Fetch one result row into an array */
18481848
PHP_FUNCTION(odbc_fetch_into)
18491849
{

‎ext/pdo_pgsql/pgsql_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromFile)
750750
/* }}} */
751751

752752

753-
/* {{{ proto string PDO::pgsqlCopyToFile(string $table_name , $filename, [string $delimiter [, string $null_as [, string $fields]]])
753+
/* {{{ proto string PDO::pgsqlCopyToFile(string $table_name , string $filename, [string $delimiter [, string $null_as [, string $fields]]])
754754
Returns true if the copy worked fine or false if error */
755755
static PHP_METHOD(PDO, pgsqlCopyToFile)
756756
{

‎ext/pgsql/pgsql.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5260,7 +5260,7 @@ PHP_FUNCTION(pg_result_status)
52605260
}
52615261
/* }}} */
52625262

5263-
/* {{{ proto array pg_get_notify([resource connection[, result_type]])
5263+
/* {{{ proto mixed pg_get_notify([resource connection[, int result_type]])
52645264
Get asynchronous notification */
52655265
PHP_FUNCTION(pg_get_notify)
52665266
{
@@ -5400,7 +5400,7 @@ static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret) /* {{{
54005400
}
54015401
/* }}} */
54025402

5403-
/* {{{ proto resource pg_socket(resource)
5403+
/* {{{ proto resource pg_socket(resource connection)
54045404
Get a read-only handle to the socket underlying the pgsql connection */
54055405
PHP_FUNCTION(pg_socket)
54065406
{
@@ -5427,7 +5427,7 @@ PHP_FUNCTION(pg_socket)
54275427
}
54285428
/* }}} */
54295429

5430-
/* {{{ proto bool pg_consume_input(resource)
5430+
/* {{{ proto bool pg_consume_input(resource connection)
54315431
Reads input on the connection */
54325432
PHP_FUNCTION(pg_consume_input)
54335433
{
@@ -5446,7 +5446,7 @@ PHP_FUNCTION(pg_consume_input)
54465446
}
54475447
/* }}} */
54485448

5449-
/* {{{ proto mixed pg_flush(resource)
5449+
/* {{{ proto mixed pg_flush(resource connection)
54505450
Flush outbound query data on the connection */
54515451
PHP_FUNCTION(pg_flush)
54525452
{

‎ext/reflection/php_reflection.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,7 +2153,7 @@ ZEND_METHOD(reflection_function, getExtensionName)
21532153
}
21542154
/* }}} */
21552155

2156-
/* {{{ proto public void ReflectionGenerator::__construct(Generator) */
2156+
/* {{{ proto public void ReflectionGenerator::__construct(object Generator) */
21572157
ZEND_METHOD(reflection_generator, __construct)
21582158
{
21592159
zval *generator, *object;
@@ -3839,7 +3839,7 @@ ZEND_METHOD(reflection_class, getStaticPropertyValue)
38393839
}
38403840
/* }}} */
38413841

3842-
/* {{{ proto public void ReflectionClass::setStaticPropertyValue($name, $value)
3842+
/* {{{ proto public void ReflectionClass::setStaticPropertyValue(string $name, mixed $value)
38433843
Sets the value of a static property */
38443844
ZEND_METHOD(reflection_class, setStaticPropertyValue)
38453845
{

‎ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1926,7 +1926,7 @@ static int sxe_object_cast(zval *readobj, zval *writeobj, int type)
19261926
}
19271927
/* }}} */
19281928

1929-
/* {{{ proto object SimpleXMLElement::__toString() U
1929+
/* {{{ proto object SimpleXMLElement::__toString()
19301930
Returns the string content */
19311931
SXE_METHOD(__toString)
19321932
{

‎ext/soap/soap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ PHP_METHOD(SoapServer, setClass)
13331333
/* }}} */
13341334

13351335

1336-
/* {{{ proto void SoapServer::setObject(object)
1336+
/* {{{ proto void SoapServer::setObject(object obj)
13371337
Sets object which will handle SOAP requests */
13381338
PHP_METHOD(SoapServer, setObject)
13391339
{

‎ext/spl/php_spl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ PHP_FUNCTION(spl_autoload_call)
450450
zend_hash_rehash(ht); \
451451
} while (0)
452452

453-
/* {{{ proto bool spl_autoload_register([mixed autoload_function = "spl_autoload" [, throw = true [, prepend]]])
453+
/* {{{ proto bool spl_autoload_register([mixed autoload_function [, bool throw [, bool prepend]]])
454454
Register given function as __autoload() implementation */
455455
PHP_FUNCTION(spl_autoload_register)
456456
{

‎ext/spl/spl_directory.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ SPL_METHOD(DirectoryIterator, getExtension)
978978
}
979979
/* }}} */
980980

981-
/* {{{ proto string SplFileInfo::getBasename([string $suffix]) U
981+
/* {{{ proto string SplFileInfo::getBasename([string $suffix])
982982
Returns filename component of path */
983983
SPL_METHOD(SplFileInfo, getBasename)
984984
{
@@ -1005,7 +1005,7 @@ SPL_METHOD(SplFileInfo, getBasename)
10051005
}
10061006
/* }}}*/
10071007

1008-
/* {{{ proto string DirectoryIterator::getBasename([string $suffix]) U
1008+
/* {{{ proto string DirectoryIterator::getBasename([string $suffix])
10091009
Returns filename component of current dir entry */
10101010
SPL_METHOD(DirectoryIterator, getBasename)
10111011
{
@@ -1215,7 +1215,7 @@ FileInfoFunction(isDir, FS_IS_DIR)
12151215
FileInfoFunction(isLink, FS_IS_LINK)
12161216
/* }}} */
12171217

1218-
/* {{{ proto string SplFileInfo::getLinkTarget() U
1218+
/* {{{ proto string SplFileInfo::getLinkTarget()
12191219
Return the target of a symbolic link */
12201220
SPL_METHOD(SplFileInfo, getLinkTarget)
12211221
{
@@ -2656,7 +2656,7 @@ SPL_METHOD(SplFileObject, fputcsv)
26562656
}
26572657
/* }}} */
26582658

2659-
/* {{{ proto void SplFileObject::setCsvControl([string delimiter = ',' [, string enclosure = '"' [, string escape = '\\']]])
2659+
/* {{{ proto void SplFileObject::setCsvControl([string delimiter [, string enclosure [, string escape ]]])
26602660
Set the delimiter and enclosure character used in fgetcsv */
26612661
SPL_METHOD(SplFileObject, setCsvControl)
26622662
{

‎ext/spl/spl_dllist.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ static HashTable *spl_dllist_object_get_gc(zval *obj, zval **gc_data, int *gc_da
559559
}
560560
/* }}} */
561561

562-
/* {{{ proto bool SplDoublyLinkedList::push(mixed $value)
562+
/* {{{ proto bool SplDoublyLinkedList::push(mixed value)
563563
Push $value on the SplDoublyLinkedList */
564564
SPL_METHOD(SplDoublyLinkedList, push)
565565
{
@@ -577,7 +577,7 @@ SPL_METHOD(SplDoublyLinkedList, push)
577577
}
578578
/* }}} */
579579

580-
/* {{{ proto bool SplDoublyLinkedList::unshift(mixed $value)
580+
/* {{{ proto bool SplDoublyLinkedList::unshift(mixed value)
581581
Unshift $value on the SplDoublyLinkedList */
582582
SPL_METHOD(SplDoublyLinkedList, unshift)
583583
{
@@ -712,7 +712,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty)
712712
}
713713
/* }}} */
714714

715-
/* {{{ proto int SplDoublyLinkedList::setIteratorMode($flags)
715+
/* {{{ proto int SplDoublyLinkedList::setIteratorMode(int flags)
716716
Set the mode of iteration */
717717
SPL_METHOD(SplDoublyLinkedList, setIteratorMode)
718718
{
@@ -753,7 +753,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode)
753753
}
754754
/* }}} */
755755

756-
/* {{{ proto bool SplDoublyLinkedList::offsetExists(mixed $index)
756+
/* {{{ proto bool SplDoublyLinkedList::offsetExists(mixed index)
757757
Returns whether the requested $index exists. */
758758
SPL_METHOD(SplDoublyLinkedList, offsetExists)
759759
{
@@ -771,7 +771,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetExists)
771771
RETURN_BOOL(index >= 0 && index < intern->llist->count);
772772
} /* }}} */
773773

774-
/* {{{ proto mixed SplDoublyLinkedList::offsetGet(mixed $index)
774+
/* {{{ proto mixed SplDoublyLinkedList::offsetGet(mixed index)
775775
Returns the value at the specified $index. */
776776
SPL_METHOD(SplDoublyLinkedList, offsetGet)
777777
{
@@ -802,7 +802,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet)
802802
}
803803
} /* }}} */
804804

805-
/* {{{ proto void SplDoublyLinkedList::offsetSet(mixed $index, mixed $newval)
805+
/* {{{ proto void SplDoublyLinkedList::offsetSet(mixed index, mixed newval)
806806
Sets the value at the specified $index to $newval. */
807807
SPL_METHOD(SplDoublyLinkedList, offsetSet)
808808
{
@@ -856,7 +856,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet)
856856
}
857857
} /* }}} */
858858

859-
/* {{{ proto void SplDoublyLinkedList::offsetUnset(mixed $index)
859+
/* {{{ proto void SplDoublyLinkedList::offsetUnset(mixed index)
860860
Unsets the value at the specified $index. */
861861
SPL_METHOD(SplDoublyLinkedList, offsetUnset)
862862
{
@@ -1226,7 +1226,7 @@ SPL_METHOD(SplDoublyLinkedList, unserialize)
12261226

12271227
} /* }}} */
12281228

1229-
/* {{{ proto void SplDoublyLinkedList::add(mixed $index, mixed $newval)
1229+
/* {{{ proto void SplDoublyLinkedList::add(mixed index, mixed newval)
12301230
Inserts a new entry before the specified $index consisting of $newval. */
12311231
SPL_METHOD(SplDoublyLinkedList, add)
12321232
{

‎ext/spl/spl_heap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ SPL_METHOD(SplHeap, isEmpty)
579579
}
580580
/* }}} */
581581

582-
/* {{{ proto bool SplHeap::insert(mixed $value)
582+
/* {{{ proto bool SplHeap::insert(mixed value)
583583
Push $value on the heap */
584584
SPL_METHOD(SplHeap, insert)
585585
{
@@ -630,7 +630,7 @@ SPL_METHOD(SplHeap, extract)
630630
}
631631
/* }}} */
632632

633-
/* {{{ proto bool SplPriorityQueue::insert(mixed $value, mixed $priority)
633+
/* {{{ proto bool SplPriorityQueue::insert(mixed value, mixed priority)
634634
Push $value with the priority $priodiry on the priorityqueue */
635635
SPL_METHOD(SplPriorityQueue, insert)
636636
{
@@ -736,7 +736,7 @@ SPL_METHOD(SplPriorityQueue, top)
736736
/* }}} */
737737

738738

739-
/* {{{ proto int SplPriorityQueue::setExtractFlags($flags)
739+
/* {{{ proto int SplPriorityQueue::setExtractFlags(int flags)
740740
Set the flags of extraction*/
741741
SPL_METHOD(SplPriorityQueue, setExtractFlags)
742742
{

0 commit comments

Comments
 (0)