Skip to content

Commit 8f3c5dc

Browse files
m6w6m6w6
authored
fix php8 arginfo (#467)
1 parent 9a429d4 commit 8f3c5dc

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎php_memcached.stub.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ public function cas(string $cas_token, string $key, mixed $value, int $expiratio
3535
public function casByKey(string $cas_token, string $server_key, string $key, mixed $value, int $expiration=0): bool {}
3636
public function add(string $key, mixed $value, int $expiration=0): bool {}
3737
public function addByKey(string $server_key, string $key, mixed $value, int $expiration=0): bool {}
38-
public function append(string $key, string $value): bool {}
39-
public function appendByKey(string $server_key, string $key, string $value): bool {}
40-
public function prepend(string $key, string $value): bool {}
41-
public function prependByKey(string $server_key, string $key, string $value): bool {}
38+
public function append(string $key, string $value): ?bool {}
39+
public function appendByKey(string $server_key, string $key, string $value): ?bool {}
40+
public function prepend(string $key, string $value): ?bool {}
41+
public function prependByKey(string $server_key, string $key, string $value): ?bool {}
4242
public function replace(string $key, mixed $value, int $expiration=0): bool {}
4343
public function replaceByKey(string $server_key, string $key, mixed $value, int $expiration=0): bool {}
4444
public function delete(string $key, int $time=0): bool {}
45-
public function deleteMulti(array $keys, int $time=0): bool {}
45+
public function deleteMulti(array $keys, int $time=0): array {}
4646
public function deleteByKey(string $server_key, string $key, int $time=0): bool {}
47-
public function deleteMultiByKey(string $server_key, array $keys, int $time=0): bool {}
47+
public function deleteMultiByKey(string $server_key, array $keys, int $time=0): array {}
4848

4949
public function increment(string $key, int $offset=1, int $initial_value=0, int $expiry=0): false|int {}
5050
public function decrement(string $key, int $offset=1, int $initial_value=0, int $expiry=0): false|int {}
@@ -73,7 +73,7 @@ public function flush(int $delay=0): bool {}
7373
public function getOption(int $option): mixed {}
7474
public function setOption(int $option, mixed $value): bool {}
7575
public function setOptions(array $options): bool {}
76-
public function setBucket(array $host_map, array $forward_map, int $replicas): bool {}
76+
public function setBucket(array $host_map, ?array $forward_map, int $replicas): bool {}
7777
#ifdef HAVE_MEMCACHED_SASL
7878
public function setSaslAuthData(string $username, string $password): bool {}
7979
#endif

‎php_memcached_arginfo.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: a33d23c6659922e98d3704879eb4bc820e1819df */
2+
* Stub hash: 3e5af769d67ce91bd713bb11b325a9ccaabbfb7a */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Memcached___construct, 0, 0, 0)
5-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 0, "NULL")
6-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 0, "NULL")
7-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_str, IS_STRING, 0, "NULL")
5+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 1, "NULL")
6+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 1, "NULL")
7+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_str, IS_STRING, 1, "NULL")
88
ZEND_END_ARG_INFO()
99

1010
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getResultCode, 0, 0, IS_LONG, 0)
@@ -15,14 +15,14 @@ ZEND_END_ARG_INFO()
1515

1616
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_get, 0, 1, IS_MIXED, 0)
1717
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
18-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 0, "NULL")
18+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 1, "NULL")
1919
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_flags, IS_LONG, 0, "0")
2020
ZEND_END_ARG_INFO()
2121

2222
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getByKey, 0, 2, IS_MIXED, 0)
2323
ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0)
2424
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
25-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 0, "NULL")
25+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 1, "NULL")
2626
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_flags, IS_LONG, 0, "0")
2727
ZEND_END_ARG_INFO()
2828

@@ -40,14 +40,14 @@ ZEND_END_ARG_INFO()
4040
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getDelayed, 0, 1, _IS_BOOL, 0)
4141
ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
4242
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "0")
43-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 0, "NULL")
43+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 1, "NULL")
4444
ZEND_END_ARG_INFO()
4545

4646
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getDelayedByKey, 0, 2, _IS_BOOL, 0)
4747
ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0)
4848
ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
4949
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "0")
50-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 0, "NULL")
50+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 1, "NULL")
5151
ZEND_END_ARG_INFO()
5252

5353
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Memcached_fetch, 0, 0, MAY_BE_FALSE|MAY_BE_ARRAY)
@@ -109,12 +109,12 @@ ZEND_END_ARG_INFO()
109109

110110
#define arginfo_class_Memcached_addByKey arginfo_class_Memcached_setByKey
111111

112-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_append, 0, 2, _IS_BOOL, 0)
112+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_append, 0, 2, _IS_BOOL, 1)
113113
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
114114
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
115115
ZEND_END_ARG_INFO()
116116

117-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_appendByKey, 0, 3, _IS_BOOL, 0)
117+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_appendByKey, 0, 3, _IS_BOOL, 1)
118118
ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0)
119119
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
120120
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
@@ -133,7 +133,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_delete, 0, 1, _I
133133
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, time, IS_LONG, 0, "0")
134134
ZEND_END_ARG_INFO()
135135

136-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_deleteMulti, 0, 1, _IS_BOOL, 0)
136+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_deleteMulti, 0, 1, IS_ARRAY, 0)
137137
ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
138138
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, time, IS_LONG, 0, "0")
139139
ZEND_END_ARG_INFO()
@@ -144,7 +144,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_deleteByKey, 0,
144144
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, time, IS_LONG, 0, "0")
145145
ZEND_END_ARG_INFO()
146146

147-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_deleteMultiByKey, 0, 2, _IS_BOOL, 0)
147+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_deleteMultiByKey, 0, 2, IS_ARRAY, 0)
148148
ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0)
149149
ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
150150
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, time, IS_LONG, 0, "0")
@@ -202,7 +202,7 @@ ZEND_END_ARG_INFO()
202202
#define arginfo_class_Memcached_getLastDisconnectedServer arginfo_class_Memcached_fetch
203203

204204
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Memcached_getStats, 0, 0, MAY_BE_FALSE|MAY_BE_ARRAY)
205-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "NULL")
205+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 1, "NULL")
206206
ZEND_END_ARG_INFO()
207207

208208
#define arginfo_class_Memcached_getVersion arginfo_class_Memcached_fetch
@@ -228,7 +228,7 @@ ZEND_END_ARG_INFO()
228228

229229
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_setBucket, 0, 3, _IS_BOOL, 0)
230230
ZEND_ARG_TYPE_INFO(0, host_map, IS_ARRAY, 0)
231-
ZEND_ARG_TYPE_INFO(0, forward_map, IS_ARRAY, 0)
231+
ZEND_ARG_TYPE_INFO(0, forward_map, IS_ARRAY, 1)
232232
ZEND_ARG_TYPE_INFO(0, replicas, IS_LONG, 0)
233233
ZEND_END_ARG_INFO()
234234

‎php_memcached_legacy_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: a33d23c6659922e98d3704879eb4bc820e1819df */
2+
* Stub hash: 3e5af769d67ce91bd713bb11b325a9ccaabbfb7a */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Memcached___construct, 0, 0, 0)
55
ZEND_ARG_INFO(0, persistent_id)

0 commit comments

Comments
 (0)