You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Schmidt
bae53a7fa0
Closes: https://trac.macports.org/ticket/66291 Closes: https://trac.macports.org/ticket/66399
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
Fix __toString prototype for PHP 8.2
|
|
https://github.com/cataphract/php-rar/pull/18
|
|
--- rararch.c.orig
|
|
+++ rararch.c
|
|
@@ -970,6 +970,13 @@ ZEND_END_ARG_INFO()
|
|
|
|
ZEND_BEGIN_ARG_INFO(arginfo_rararchive_void, 0)
|
|
ZEND_END_ARG_INFO()
|
|
+
|
|
+#if PHP_VERSION_ID >= 80200
|
|
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rararchive_tostring, 0, 0, IS_STRING, 0)
|
|
+ZEND_END_ARG_INFO()
|
|
+#else
|
|
+#define arginfo_rararchive_tostring arginfo_rararchive_void
|
|
+#endif
|
|
/* }}} */
|
|
|
|
static zend_function_entry php_rararch_class_functions[] = {
|
|
@@ -984,7 +991,7 @@ static zend_function_entry php_rararch_class_functions[] = {
|
|
PHP_ME_MAPPING(isBroken, rar_broken_is, arginfo_rararchive_void, ZEND_ACC_PUBLIC)
|
|
PHP_ME_MAPPING(setAllowBroken, rar_allow_broken_set, arginfo_rararchive_setallowbroken, ZEND_ACC_PUBLIC)
|
|
PHP_ME_MAPPING(close, rar_close, arginfo_rararchive_void, ZEND_ACC_PUBLIC)
|
|
- PHP_ME(rararch, __toString, arginfo_rararchive_void, ZEND_ACC_PUBLIC)
|
|
+ PHP_ME(rararch, __toString, arginfo_rararchive_tostring, ZEND_ACC_PUBLIC)
|
|
PHP_ME_MAPPING(__construct, rar_bogus_ctor, arginfo_rararchive_void, ZEND_ACC_PRIVATE | ZEND_ACC_CTOR)
|
|
#if PHP_MAJOR_VERSION >= 8
|
|
PHP_ME(rararch, getIterator, arginfo_rararchive_getiterator, ZEND_ACC_PUBLIC)
|
|
--- rarentry.c.orig
|
|
+++ rarentry.c
|
|
@@ -735,6 +735,13 @@ ZEND_END_ARG_INFO()
|
|
|
|
ZEND_BEGIN_ARG_INFO(arginfo_rar_void, 0)
|
|
ZEND_END_ARG_INFO()
|
|
+
|
|
+#if PHP_VERSION_ID >= 80200
|
|
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rar_tostring, 0, 0, IS_STRING, 0)
|
|
+ZEND_END_ARG_INFO()
|
|
+#else
|
|
+#define arginfo_rar_tostring arginfo_rar_void
|
|
+#endif
|
|
/* }}} */
|
|
|
|
static zend_function_entry php_rar_class_functions[] = {
|
|
@@ -755,7 +762,7 @@ static zend_function_entry php_rar_class_functions[] = {
|
|
PHP_ME(rarentry, getRedirType, arginfo_rar_void, ZEND_ACC_PUBLIC)
|
|
PHP_ME(rarentry, isRedirectToDirectory, arginfo_rar_void, ZEND_ACC_PUBLIC)
|
|
PHP_ME(rarentry, getRedirTarget, arginfo_rar_void, ZEND_ACC_PUBLIC)
|
|
- PHP_ME(rarentry, __toString, arginfo_rar_void, ZEND_ACC_PUBLIC)
|
|
+ PHP_ME(rarentry, __toString, arginfo_rar_tostring, ZEND_ACC_PUBLIC)
|
|
PHP_ME_MAPPING(__construct, rar_bogus_ctor, arginfo_rar_void, ZEND_ACC_PRIVATE | ZEND_ACC_CTOR)
|
|
{NULL, NULL, NULL}
|
|
};
|