diff options
| author | Remi Collet <remi@remirepo.net> | 2021-01-18 16:59:44 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-01-18 16:59:44 +0100 |
| commit | f2b045e6df0a7734146cc15b1215c1de0f44d0e4 (patch) | |
| tree | 5200f5cefbb0314c0d87aa165e9ad68b5e570fe8 /469.patch | |
| parent | f9a74f77ea1bdce93dfe19fae9edd141bfe23b9b (diff) | |
more patches for PHP 8 from
https://github.com/php-memcached-dev/php-memcached/pull/465
https://github.com/php-memcached-dev/php-memcached/pull/467
https://github.com/php-memcached-dev/php-memcached/pull/468
https://github.com/php-memcached-dev/php-memcached/pull/469
https://github.com/php-memcached-dev/php-memcached/pull/472
https://github.com/php-memcached-dev/php-memcached/pull/473
Diffstat (limited to '469.patch')
| -rw-r--r-- | 469.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/469.patch b/469.patch new file mode 100644 index 0000000..9644ab5 --- /dev/null +++ b/469.patch @@ -0,0 +1,86 @@ +From 034d6e89121de79fd022bfef0ed2c273588fbfcf Mon Sep 17 00:00:00 2001 +From: Graham Campbell <graham@alt-three.com> +Date: Fri, 18 Dec 2020 19:25:59 +0000 +Subject: [PATCH] Re-generated .h files after stubs were modified + +--- + php_memcached_arginfo.h | 22 +++++++++++----------- + php_memcached_legacy_arginfo.h | 2 +- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/php_memcached_arginfo.h b/php_memcached_arginfo.h +index 18b17cc..6b05cf4 100644 +--- a/php_memcached_arginfo.h ++++ b/php_memcached_arginfo.h +@@ -1,10 +1,10 @@ + /* This is a generated file, edit the .stub.php file instead. +- * Stub hash: 3e5af769d67ce91bd713bb11b325a9ccaabbfb7a */ ++ * Stub hash: 8ce11ff45ccb2b1c765e5f313305f539ca3fa4f6 */ + + ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Memcached___construct, 0, 0, 0) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 1, "NULL") +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 1, "NULL") +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_str, IS_STRING, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 0, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, callback, IS_CALLABLE, 0, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_str, IS_STRING, 0, "NULL") + ZEND_END_ARG_INFO() + + 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() + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_get, 0, 1, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_flags, IS_LONG, 0, "0") + ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getByKey, 0, 2, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cache_cb, IS_CALLABLE, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_flags, IS_LONG, 0, "0") + ZEND_END_ARG_INFO() + +@@ -39,15 +39,15 @@ ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getDelayed, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "0") +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 0, "NULL") + ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Memcached_getDelayedByKey, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, server_key, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "0") +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, with_cas, _IS_BOOL, 0, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value_cb, IS_CALLABLE, 0, "NULL") + ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Memcached_fetch, 0, 0, MAY_BE_FALSE|MAY_BE_ARRAY) +@@ -202,7 +202,7 @@ ZEND_END_ARG_INFO() + #define arginfo_class_Memcached_getLastDisconnectedServer arginfo_class_Memcached_fetch + + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Memcached_getStats, 0, 0, MAY_BE_FALSE|MAY_BE_ARRAY) +- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 1, "NULL") ++ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "NULL") + ZEND_END_ARG_INFO() + + #define arginfo_class_Memcached_getVersion arginfo_class_Memcached_fetch +diff --git a/php_memcached_legacy_arginfo.h b/php_memcached_legacy_arginfo.h +index 2c0b2de..c942616 100644 +--- a/php_memcached_legacy_arginfo.h ++++ b/php_memcached_legacy_arginfo.h +@@ -1,5 +1,5 @@ + /* This is a generated file, edit the .stub.php file instead. +- * Stub hash: 3e5af769d67ce91bd713bb11b325a9ccaabbfb7a */ ++ * Stub hash: 8ce11ff45ccb2b1c765e5f313305f539ca3fa4f6 */ + + ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Memcached___construct, 0, 0, 0) + ZEND_ARG_INFO(0, persistent_id) |