Skip to content

Commit 7f871a5

Browse files
CodeLieutenantCodeLieutenant
authored
Merge pull request #29 from remicollet/issue-php81
fix proto for PHP 8.1
2 parents 5139c39 + 10cdaa8 commit 7f871a5

File tree

7 files changed

+190
-44
lines changed

7 files changed

+190
-44
lines changed

‎ext/php_driver.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ typedef int pid_t;
5656
#endif
5757
#endif
5858

59+
#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX
60+
#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
61+
ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args)
62+
#endif
63+
5964
#include <ext/spl/spl_iterators.h>
6065
#include <ext/spl/spl_exceptions.h>
6166

‎ext/src/Collection.c‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,24 @@ ZEND_END_ARG_INFO()
296296
ZEND_BEGIN_ARG_INFO_EX(arginfo_none, 0, ZEND_RETURN_VALUE, 0)
297297
ZEND_END_ARG_INFO()
298298

299+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
300+
ZEND_END_ARG_INFO()
301+
302+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
303+
ZEND_END_ARG_INFO()
304+
305+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
306+
ZEND_END_ARG_INFO()
307+
308+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
309+
ZEND_END_ARG_INFO()
310+
311+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
312+
ZEND_END_ARG_INFO()
313+
314+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
315+
ZEND_END_ARG_INFO()
316+
299317
static zend_function_entry php_driver_collection_methods[] = {
300318
PHP_ME(Collection, __construct, arginfo__construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
301319
PHP_ME(Collection, type, arginfo_none, ZEND_ACC_PUBLIC)
@@ -308,13 +326,13 @@ static zend_function_entry php_driver_collection_methods[] = {
308326
PHP_ME(Collection, get, arginfo_index, ZEND_ACC_PUBLIC)
309327
PHP_ME(Collection, find, arginfo_value, ZEND_ACC_PUBLIC)
310328
/* Countable */
311-
PHP_ME(Collection, count, arginfo_none, ZEND_ACC_PUBLIC)
329+
PHP_ME(Collection, count, arginfo_count, ZEND_ACC_PUBLIC)
312330
/* Iterator */
313-
PHP_ME(Collection, current, arginfo_none, ZEND_ACC_PUBLIC)
314-
PHP_ME(Collection, key, arginfo_none, ZEND_ACC_PUBLIC)
315-
PHP_ME(Collection, next, arginfo_none, ZEND_ACC_PUBLIC)
316-
PHP_ME(Collection, valid, arginfo_none, ZEND_ACC_PUBLIC)
317-
PHP_ME(Collection, rewind, arginfo_none, ZEND_ACC_PUBLIC)
331+
PHP_ME(Collection, current, arginfo_current, ZEND_ACC_PUBLIC)
332+
PHP_ME(Collection, key, arginfo_key, ZEND_ACC_PUBLIC)
333+
PHP_ME(Collection, next, arginfo_next, ZEND_ACC_PUBLIC)
334+
PHP_ME(Collection, valid, arginfo_valid, ZEND_ACC_PUBLIC)
335+
PHP_ME(Collection, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
318336
PHP_ME(Collection, remove, arginfo_index, ZEND_ACC_PUBLIC)
319337
PHP_FE_END
320338
};

‎ext/src/Map.c‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,41 @@ ZEND_END_ARG_INFO()
426426
ZEND_BEGIN_ARG_INFO_EX(arginfo_none, 0, ZEND_RETURN_VALUE, 0)
427427
ZEND_END_ARG_INFO()
428428

429+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
430+
ZEND_END_ARG_INFO()
431+
432+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
433+
ZEND_END_ARG_INFO()
434+
435+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
436+
ZEND_END_ARG_INFO()
437+
438+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
439+
ZEND_END_ARG_INFO()
440+
441+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
442+
ZEND_END_ARG_INFO()
443+
444+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
445+
ZEND_END_ARG_INFO()
446+
447+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetExists, 0, 1, _IS_BOOL, 0)
448+
ZEND_ARG_INFO(0, offset)
449+
ZEND_END_ARG_INFO()
450+
451+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetGet, 0, 1, IS_MIXED, 0)
452+
ZEND_ARG_INFO(0, offset)
453+
ZEND_END_ARG_INFO()
454+
455+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetSet, 0, 2, IS_VOID, 0)
456+
ZEND_ARG_INFO(0, offset)
457+
ZEND_ARG_INFO(0, value)
458+
ZEND_END_ARG_INFO()
459+
460+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetUnset, 0, 1, IS_VOID, 0)
461+
ZEND_ARG_INFO(0, offset)
462+
ZEND_END_ARG_INFO()
463+
429464
static zend_function_entry php_driver_map_methods[] = {
430465
PHP_ME(Map, __construct, arginfo__construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
431466
PHP_ME(Map, type, arginfo_none, ZEND_ACC_PUBLIC)
@@ -436,18 +471,18 @@ static zend_function_entry php_driver_map_methods[] = {
436471
PHP_ME(Map, remove, arginfo_one, ZEND_ACC_PUBLIC)
437472
PHP_ME(Map, has, arginfo_one, ZEND_ACC_PUBLIC)
438473
/* Countable */
439-
PHP_ME(Map, count, arginfo_none, ZEND_ACC_PUBLIC)
474+
PHP_ME(Map, count, arginfo_count, ZEND_ACC_PUBLIC)
440475
/* Iterator */
441-
PHP_ME(Map, current, arginfo_none, ZEND_ACC_PUBLIC)
442-
PHP_ME(Map, key, arginfo_none, ZEND_ACC_PUBLIC)
443-
PHP_ME(Map, next, arginfo_none, ZEND_ACC_PUBLIC)
444-
PHP_ME(Map, valid, arginfo_none, ZEND_ACC_PUBLIC)
445-
PHP_ME(Map, rewind, arginfo_none, ZEND_ACC_PUBLIC)
476+
PHP_ME(Map, current, arginfo_current, ZEND_ACC_PUBLIC)
477+
PHP_ME(Map, key, arginfo_key, ZEND_ACC_PUBLIC)
478+
PHP_ME(Map, next, arginfo_next, ZEND_ACC_PUBLIC)
479+
PHP_ME(Map, valid, arginfo_valid, ZEND_ACC_PUBLIC)
480+
PHP_ME(Map, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
446481
/* ArrayAccess */
447-
PHP_ME(Map, offsetSet, arginfo_two, ZEND_ACC_PUBLIC)
448-
PHP_ME(Map, offsetGet, arginfo_one, ZEND_ACC_PUBLIC)
449-
PHP_ME(Map, offsetUnset, arginfo_one, ZEND_ACC_PUBLIC)
450-
PHP_ME(Map, offsetExists, arginfo_one, ZEND_ACC_PUBLIC)
482+
PHP_ME(Map, offsetSet, arginfo_offsetSet, ZEND_ACC_PUBLIC)
483+
PHP_ME(Map, offsetGet, arginfo_offsetGet, ZEND_ACC_PUBLIC)
484+
PHP_ME(Map, offsetUnset, arginfo_offsetUnset, ZEND_ACC_PUBLIC)
485+
PHP_ME(Map, offsetExists, arginfo_offsetExists, ZEND_ACC_PUBLIC)
451486
PHP_FE_END
452487
};
453488

‎ext/src/Rows.c‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,53 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_timeout, 0, ZEND_RETURN_VALUE, 1)
395395
ZEND_END_ARG_INFO()
396396
#endif
397397

398+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
399+
ZEND_END_ARG_INFO()
400+
401+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
402+
ZEND_END_ARG_INFO()
403+
404+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
405+
ZEND_END_ARG_INFO()
406+
407+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
408+
ZEND_END_ARG_INFO()
409+
410+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
411+
ZEND_END_ARG_INFO()
412+
413+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
414+
ZEND_END_ARG_INFO()
415+
416+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetExists, 0, 1, _IS_BOOL, 0)
417+
ZEND_ARG_INFO(0, offset)
418+
ZEND_END_ARG_INFO()
419+
420+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetGet, 0, 1, IS_MIXED, 0)
421+
ZEND_ARG_INFO(0, offset)
422+
ZEND_END_ARG_INFO()
423+
424+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetSet, 0, 2, IS_VOID, 0)
425+
ZEND_ARG_INFO(0, offset)
426+
ZEND_ARG_INFO(0, value)
427+
ZEND_END_ARG_INFO()
428+
429+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetUnset, 0, 1, IS_VOID, 0)
430+
ZEND_ARG_INFO(0, offset)
431+
ZEND_END_ARG_INFO()
432+
398433
static zend_function_entry php_driver_rows_methods[] = {
399434
PHP_ME(Rows, __construct, arginfo_none, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
400-
PHP_ME(Rows, count, arginfo_none, ZEND_ACC_PUBLIC)
401-
PHP_ME(Rows, rewind, arginfo_none, ZEND_ACC_PUBLIC)
402-
PHP_ME(Rows, current, arginfo_none, ZEND_ACC_PUBLIC)
403-
PHP_ME(Rows, key, arginfo_none, ZEND_ACC_PUBLIC)
404-
PHP_ME(Rows, next, arginfo_none, ZEND_ACC_PUBLIC)
405-
PHP_ME(Rows, valid, arginfo_none, ZEND_ACC_PUBLIC)
406-
PHP_ME(Rows, offsetExists, arginfo_offset, ZEND_ACC_PUBLIC)
407-
PHP_ME(Rows, offsetGet, arginfo_offset, ZEND_ACC_PUBLIC)
408-
PHP_ME(Rows, offsetSet, arginfo_set, ZEND_ACC_PUBLIC)
409-
PHP_ME(Rows, offsetUnset, arginfo_offset, ZEND_ACC_PUBLIC)
435+
PHP_ME(Rows, count, arginfo_count, ZEND_ACC_PUBLIC)
436+
PHP_ME(Rows, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
437+
PHP_ME(Rows, current, arginfo_current, ZEND_ACC_PUBLIC)
438+
PHP_ME(Rows, key, arginfo_key, ZEND_ACC_PUBLIC)
439+
PHP_ME(Rows, next, arginfo_next, ZEND_ACC_PUBLIC)
440+
PHP_ME(Rows, valid, arginfo_valid, ZEND_ACC_PUBLIC)
441+
PHP_ME(Rows, offsetExists, arginfo_offsetExists, ZEND_ACC_PUBLIC)
442+
PHP_ME(Rows, offsetGet, arginfo_offsetGet, ZEND_ACC_PUBLIC)
443+
PHP_ME(Rows, offsetSet, arginfo_offsetSet, ZEND_ACC_PUBLIC)
444+
PHP_ME(Rows, offsetUnset, arginfo_offsetUnset, ZEND_ACC_PUBLIC)
410445
PHP_ME(Rows, isLastPage, arginfo_none, ZEND_ACC_PUBLIC)
411446
PHP_ME(Rows, nextPage, arginfo_timeout, ZEND_ACC_PUBLIC)
412447
PHP_ME(Rows, nextPageAsync, arginfo_none, ZEND_ACC_PUBLIC)

‎ext/src/Set.c‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,24 @@ ZEND_END_ARG_INFO()
278278
ZEND_BEGIN_ARG_INFO_EX(arginfo_none, 0, ZEND_RETURN_VALUE, 0)
279279
ZEND_END_ARG_INFO()
280280

281+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
282+
ZEND_END_ARG_INFO()
283+
284+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
285+
ZEND_END_ARG_INFO()
286+
287+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
288+
ZEND_END_ARG_INFO()
289+
290+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
291+
ZEND_END_ARG_INFO()
292+
293+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
294+
ZEND_END_ARG_INFO()
295+
296+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
297+
ZEND_END_ARG_INFO()
298+
281299
static zend_function_entry php_driver_set_methods[] = {
282300
PHP_ME(Set, __construct, arginfo__construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
283301
PHP_ME(Set, type, arginfo_none, ZEND_ACC_PUBLIC)
@@ -286,13 +304,13 @@ static zend_function_entry php_driver_set_methods[] = {
286304
PHP_ME(Set, has, arginfo_one, ZEND_ACC_PUBLIC)
287305
PHP_ME(Set, remove, arginfo_one, ZEND_ACC_PUBLIC)
288306
/* Countable */
289-
PHP_ME(Set, count, arginfo_none, ZEND_ACC_PUBLIC)
307+
PHP_ME(Set, count, arginfo_count, ZEND_ACC_PUBLIC)
290308
/* Iterator */
291-
PHP_ME(Set, current, arginfo_none, ZEND_ACC_PUBLIC)
292-
PHP_ME(Set, key, arginfo_none, ZEND_ACC_PUBLIC)
293-
PHP_ME(Set, next, arginfo_none, ZEND_ACC_PUBLIC)
294-
PHP_ME(Set, valid, arginfo_none, ZEND_ACC_PUBLIC)
295-
PHP_ME(Set, rewind, arginfo_none, ZEND_ACC_PUBLIC)
309+
PHP_ME(Set, current, arginfo_current, ZEND_ACC_PUBLIC)
310+
PHP_ME(Set, key, arginfo_key, ZEND_ACC_PUBLIC)
311+
PHP_ME(Set, next, arginfo_next, ZEND_ACC_PUBLIC)
312+
PHP_ME(Set, valid, arginfo_valid, ZEND_ACC_PUBLIC)
313+
PHP_ME(Set, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
296314
PHP_FE_END
297315
};
298316

‎ext/src/Tuple.c‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_index_value, 0, ZEND_RETURN_VALUE, 1)
278278
ZEND_END_ARG_INFO()
279279
#endif
280280

281+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
282+
ZEND_END_ARG_INFO()
283+
284+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
285+
ZEND_END_ARG_INFO()
286+
287+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
288+
ZEND_END_ARG_INFO()
289+
290+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
291+
ZEND_END_ARG_INFO()
292+
293+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
294+
ZEND_END_ARG_INFO()
295+
296+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
297+
ZEND_END_ARG_INFO()
281298

282299
static zend_function_entry php_driver_tuple_methods[] = {
283300
PHP_ME(Tuple, __construct, arginfo__construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
@@ -290,13 +307,13 @@ static zend_function_entry php_driver_tuple_methods[] = {
290307
#endif
291308
PHP_ME(Tuple, get, arginfo_index, ZEND_ACC_PUBLIC)
292309
/* Countable */
293-
PHP_ME(Tuple, count, arginfo_none, ZEND_ACC_PUBLIC)
310+
PHP_ME(Tuple, count, arginfo_count, ZEND_ACC_PUBLIC)
294311
/* Iterator */
295-
PHP_ME(Tuple, current, arginfo_none, ZEND_ACC_PUBLIC)
296-
PHP_ME(Tuple, key, arginfo_none, ZEND_ACC_PUBLIC)
297-
PHP_ME(Tuple, next, arginfo_none, ZEND_ACC_PUBLIC)
298-
PHP_ME(Tuple, valid, arginfo_none, ZEND_ACC_PUBLIC)
299-
PHP_ME(Tuple, rewind, arginfo_none, ZEND_ACC_PUBLIC)
312+
PHP_ME(Tuple, current, arginfo_current, ZEND_ACC_PUBLIC)
313+
PHP_ME(Tuple, key, arginfo_key, ZEND_ACC_PUBLIC)
314+
PHP_ME(Tuple, next, arginfo_next, ZEND_ACC_PUBLIC)
315+
PHP_ME(Tuple, valid, arginfo_valid, ZEND_ACC_PUBLIC)
316+
PHP_ME(Tuple, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
300317
PHP_FE_END
301318
};
302319

‎ext/src/UserTypeValue.c‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,24 @@ ZEND_END_ARG_INFO()
318318
ZEND_BEGIN_ARG_INFO_EX(arginfo_none, 0, ZEND_RETURN_VALUE, 0)
319319
ZEND_END_ARG_INFO()
320320

321+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
322+
ZEND_END_ARG_INFO()
323+
324+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
325+
ZEND_END_ARG_INFO()
326+
327+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
328+
ZEND_END_ARG_INFO()
329+
330+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
331+
ZEND_END_ARG_INFO()
332+
333+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
334+
ZEND_END_ARG_INFO()
335+
336+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
337+
ZEND_END_ARG_INFO()
338+
321339
static zend_function_entry php_driver_user_type_value_methods[] = {
322340
PHP_ME(UserTypeValue, __construct, arginfo__construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
323341
PHP_ME(UserTypeValue, type, arginfo_none, ZEND_ACC_PUBLIC)
@@ -329,13 +347,13 @@ static zend_function_entry php_driver_user_type_value_methods[] = {
329347
#endif
330348
PHP_ME(UserTypeValue, get, arginfo_name, ZEND_ACC_PUBLIC)
331349
/* Countable */
332-
PHP_ME(UserTypeValue, count, arginfo_none, ZEND_ACC_PUBLIC)
350+
PHP_ME(UserTypeValue, count, arginfo_count, ZEND_ACC_PUBLIC)
333351
/* Iterator */
334-
PHP_ME(UserTypeValue, current, arginfo_none, ZEND_ACC_PUBLIC)
335-
PHP_ME(UserTypeValue, key, arginfo_none, ZEND_ACC_PUBLIC)
336-
PHP_ME(UserTypeValue, next, arginfo_none, ZEND_ACC_PUBLIC)
337-
PHP_ME(UserTypeValue, valid, arginfo_none, ZEND_ACC_PUBLIC)
338-
PHP_ME(UserTypeValue, rewind, arginfo_none, ZEND_ACC_PUBLIC)
352+
PHP_ME(UserTypeValue, current, arginfo_current, ZEND_ACC_PUBLIC)
353+
PHP_ME(UserTypeValue, key, arginfo_key, ZEND_ACC_PUBLIC)
354+
PHP_ME(UserTypeValue, next, arginfo_next, ZEND_ACC_PUBLIC)
355+
PHP_ME(UserTypeValue, valid, arginfo_valid, ZEND_ACC_PUBLIC)
356+
PHP_ME(UserTypeValue, rewind, arginfo_rewind, ZEND_ACC_PUBLIC)
339357
PHP_FE_END
340358
};
341359

0 commit comments

Comments
 (0)