diff options
| author | Remi Collet <remi@remirepo.net> | 2022-11-28 08:02:51 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-11-28 08:02:51 +0100 |
| commit | 8ecf5dcd822a245b1d138b893ed843f2f38567b2 (patch) | |
| tree | 9d7d3d38d6a2d47cbd411a3492b95535bc18becb /mustache-php82.patch | |
| parent | c7537a22ba77e92e6065a027875a64a300a1ba7d (diff) | |
update to 0.9.3
drop patch merged upstream
Diffstat (limited to 'mustache-php82.patch')
| -rw-r--r-- | mustache-php82.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/mustache-php82.patch b/mustache-php82.patch deleted file mode 100644 index 9e40b5c..0000000 --- a/mustache-php82.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4b998185887213029616163c6fa336d6a985ff06 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 13 Sep 2022 11:06:35 +0200 -Subject: [PATCH] fix __toString return type for PHP 8.2 - ---- - mustache_ast.cpp | 4 ++++ - mustache_template.cpp | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/mustache_ast.cpp b/mustache_ast.cpp -index eb0ba06..70abc4b 100644 ---- a/mustache_ast.cpp -+++ b/mustache_ast.cpp -@@ -24,7 +24,11 @@ ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(MustacheAST__toArray_args, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) - ZEND_END_ARG_INFO() - -+#if PHP_VERSION_ID >= 80200 -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(MustacheAST____toString_args, 0, 0, IS_STRING, 0) -+#else - ZEND_BEGIN_ARG_INFO_EX(MustacheAST____toString_args, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) -+#endif - ZEND_END_ARG_INFO() - - ZEND_BEGIN_ARG_INFO_EX(MustacheAST____wakeup_args, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) -diff --git a/mustache_template.cpp b/mustache_template.cpp -index e25ab24..7cd47a6 100644 ---- a/mustache_template.cpp -+++ b/mustache_template.cpp -@@ -17,7 +17,11 @@ ZEND_BEGIN_ARG_INFO_EX(MustacheTemplate____construct_args, ZEND_SEND_BY_VAL, ZEN - ZEND_ARG_INFO(0, vars) - ZEND_END_ARG_INFO() - -+#if PHP_VERSION_ID >= 80200 -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(MustacheTemplate____toString_args, 0, 0, IS_STRING, 0) -+#else - ZEND_BEGIN_ARG_INFO_EX(MustacheTemplate____toString_args, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0) -+#endif - ZEND_END_ARG_INFO() - /* }}} */ - |