* [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10
@ 2023-09-05 18:06 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0 Adam Duskett
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php/0003-configure-disable-the-phar-tool.patch | 2 +-
package/php/php.hash | 2 +-
package/php/php.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch
index ab3aecdaa3..6bfaf6640f 100644
--- a/package/php/0003-configure-disable-the-phar-tool.patch
+++ b/package/php/0003-configure-disable-the-phar-tool.patch
@@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac
index 0dfab302..6026fb66 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1566,13 +1566,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
diff --git a/package/php/php.hash b/package/php/php.hash
index 9fb4aebec1..b8ff7ccc5c 100644
--- a/package/php/php.hash
+++ b/package/php/php.hash
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php
-sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 php-8.2.8.tar.xz
+sha256 561dc4acd5386e47f25be76f2c8df6ae854756469159248313bcf276e282fbb3 php-8.2.10.tar.xz
# License file
sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE
diff --git a/package/php/php.mk b/package/php/php.mk
index 691436926b..ede0980629 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_VERSION = 8.2.8
+PHP_VERSION = 8.2.10
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 03/10] package/php-apcu: bump version to 5.1.22 Adam Duskett
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Drop upstream patches
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
.../0001-add-build-support-for-php-8.patch | 54 -
.../php-amqp/0002-more-work-for-php-8.patch | 1265 -----------------
package/php-amqp/php-amqp.hash | 2 +-
package/php-amqp/php-amqp.mk | 2 +-
4 files changed, 2 insertions(+), 1321 deletions(-)
delete mode 100644 package/php-amqp/0001-add-build-support-for-php-8.patch
delete mode 100644 package/php-amqp/0002-more-work-for-php-8.patch
diff --git a/package/php-amqp/0001-add-build-support-for-php-8.patch b/package/php-amqp/0001-add-build-support-for-php-8.patch
deleted file mode 100644
index 6fe09ad3bd..0000000000
--- a/package/php-amqp/0001-add-build-support-for-php-8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001
-From: mmokhi <mokhi64@gmail.com>
-Date: Thu, 30 Jul 2020 11:25:33 +0200
-Subject: [PATCH] Add build support for PHP8.0 (#381)
-
-From upstream commit: 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438
-
-Signed-off-by: mmokhi <mokhi64@gmail.com>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- amqp_envelope.h | 7 +++++++
- php7_support.h | 11 +++++++++++
- 2 files changed, 18 insertions(+)
-
-diff --git a/amqp_envelope.h b/amqp_envelope.h
-index e63a3a5..e315682 100644
---- a/amqp_envelope.h
-+++ b/amqp_envelope.h
-@@ -20,6 +20,13 @@
- | - Jonathan Tansavatdi |
- +----------------------------------------------------------------------+
- */
-+
-+#if PHP_MAJOR_VERSION >= 7
-+ #include "php7_support.h"
-+#else
-+ #include "php5_support.h"
-+#endif
-+
- extern zend_class_entry *amqp_envelope_class_entry;
-
- void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC);
-diff --git a/php7_support.h b/php7_support.h
-index 47ce983..c9e8f5b 100644
---- a/php7_support.h
-+++ b/php7_support.h
-@@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t;
-
- #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
-
-+/* Small change to let it build after a major internal change for php8.0
-+ * More info:
-+ * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47
-+ */
-+#if PHP_MAJOR_VERSION >= 8
-+# define TSRMLS_DC
-+# define TSRMLS_D
-+# define TSRMLS_CC
-+# define TSRMLS_C
-+# endif
-+
- #endif //PHP_AMQP_PHP7_SUPPORT_H
-
- /*
diff --git a/package/php-amqp/0002-more-work-for-php-8.patch b/package/php-amqp/0002-more-work-for-php-8.patch
deleted file mode 100644
index 3651f5a0d3..0000000000
--- a/package/php-amqp/0002-more-work-for-php-8.patch
+++ /dev/null
@@ -1,1265 +0,0 @@
-From df1241852b359cf12c346beaa68de202257efdf1 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 9 Dec 2020 17:00:46 +0100
-Subject: [PATCH] more work for PHP 8 (#383)
-
-* more work for PHP 8
-
-* split test
-
-Signed-off-by: Remi Collet <remi@remirepo.net>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- amqp_basic_properties.c | 84 +++++++++++++--------------
- amqp_channel.c | 49 +++++++++-------
- amqp_connection.c | 106 +++++++++++++++++-----------------
- amqp_connection_resource.c | 12 ++--
- amqp_decimal.c | 8 +--
- amqp_envelope.c | 12 ++--
- amqp_exchange.c | 22 +++----
- amqp_queue.c | 38 ++++++------
- amqp_timestamp.c | 6 +-
- amqp_type.c | 6 +-
- php5_support.h | 2 +
- php7_support.h | 9 +++
- php_amqp.h | 8 +--
- tests/amqptimestamp.phpt | 4 +-
- tests/amqptimestamp_php8.phpt | 60 +++++++++++++++++++
- tests/bug_61533.phpt | 2 +-
- 16 files changed, 254 insertions(+), 174 deletions(-)
- create mode 100644 tests/amqptimestamp_php8.phpt
-
-diff --git a/amqp_basic_properties.c b/amqp_basic_properties.c
-index 69b813e..5375f44 100644
---- a/amqp_basic_properties.c
-+++ b/amqp_basic_properties.c
-@@ -70,7 +70,7 @@ void php_amqp_basic_properties_set_empty_headers(zval *obj TSRMLS_DC) {
- PHP5to7_MAYBE_INIT(headers);
- PHP5to7_ARRAY_INIT(headers);
-
-- zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
-
- PHP5to7_MAYBE_DESTROY(headers);
- }
-@@ -118,29 +118,29 @@ static PHP_METHOD(AMQPBasicProperties, __construct) {
- ) == FAILURE) {
- return;
- }
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_type"), content_type, content_type_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_encoding"), content_encoding, content_encoding_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("content_type"), content_type, content_type_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("content_encoding"), content_encoding, content_encoding_len TSRMLS_CC);
-
- if (headers != NULL) {
-- zend_update_property(this_ce, getThis(), ZEND_STRL("headers"), headers TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("headers"), headers TSRMLS_CC);
- } else {
- php_amqp_basic_properties_set_empty_headers(getThis() TSRMLS_CC);
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("delivery_mode"), delivery_mode TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("priority"), priority TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("delivery_mode"), delivery_mode TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("priority"), priority TSRMLS_CC);
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("correlation_id"), correlation_id, correlation_id_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("reply_to"), reply_to, reply_to_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("expiration"), expiration, expiration_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("message_id"), message_id, message_id_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("correlation_id"), correlation_id, correlation_id_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("reply_to"), reply_to, reply_to_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("expiration"), expiration, expiration_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("message_id"), message_id, message_id_len TSRMLS_CC);
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("timestamp"), timestamp TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("timestamp"), timestamp TSRMLS_CC);
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("user_id"), user_id, user_id_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("app_id"), app_id, app_id_len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cluster_id"), cluster_id, cluster_id_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("type"), type, type_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("user_id"), user_id, user_id_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("app_id"), app_id, app_id_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cluster_id"), cluster_id, cluster_id_len TSRMLS_CC);
- }
- /* }}} */
-
-@@ -460,7 +460,7 @@ void parse_amqp_table(amqp_table_t *table, zval *result TSRMLS_DC) {
- object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_timestamp_class_entry);
-
- zend_call_method_with_1_params(
-- &value,
-+ PHP5to8_OBJ_PROP(&value),
- amqp_timestamp_class_entry,
- NULL,
- "__construct",
-@@ -488,7 +488,7 @@ void parse_amqp_table(amqp_table_t *table, zval *result TSRMLS_DC) {
- object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_decimal_class_entry);
-
- zend_call_method_with_2_params(
-- &value,
-+ PHP5to8_OBJ_PROP(&value),
- amqp_decimal_class_entry,
- NULL,
- "__construct",
-@@ -525,93 +525,93 @@ void php_amqp_basic_properties_extract(amqp_basic_properties_t *p, zval *obj TSR
- PHP5to7_ARRAY_INIT(headers);
-
- if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_type"), (const char *) p->content_type.bytes, (PHP5to7_param_str_len_type_t) p->content_type.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_type"), (const char *) p->content_type.bytes, (PHP5to7_param_str_len_type_t) p->content_type.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_type"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_type"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_CONTENT_ENCODING_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_encoding"), (const char *) p->content_encoding.bytes, (PHP5to7_param_str_len_type_t) p->content_encoding.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_encoding"), (const char *) p->content_encoding.bytes, (PHP5to7_param_str_len_type_t) p->content_encoding.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_HEADERS_FLAG) {
- parse_amqp_table(&(p->headers), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
- }
-
-- zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
-
- if (p->_flags & AMQP_BASIC_DELIVERY_MODE_FLAG) {
-- zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_PRIORITY_FLAG) {
-- zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("priority"), 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_CORRELATION_ID_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("correlation_id"), (const char *) p->correlation_id.bytes, (PHP5to7_param_str_len_type_t) p->correlation_id.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("correlation_id"), (const char *) p->correlation_id.bytes, (PHP5to7_param_str_len_type_t) p->correlation_id.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_REPLY_TO_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("reply_to"), (const char *) p->reply_to.bytes, (PHP5to7_param_str_len_type_t) p->reply_to.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("reply_to"), (const char *) p->reply_to.bytes, (PHP5to7_param_str_len_type_t) p->reply_to.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("reply_to"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("reply_to"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_EXPIRATION_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("expiration"), (const char *) p->expiration.bytes, (PHP5to7_param_str_len_type_t) p->expiration.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("expiration"), (const char *) p->expiration.bytes, (PHP5to7_param_str_len_type_t) p->expiration.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("expiration"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("expiration"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_MESSAGE_ID_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("message_id"), (const char *) p->message_id.bytes, (PHP5to7_param_str_len_type_t) p->message_id.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("message_id"), (const char *) p->message_id.bytes, (PHP5to7_param_str_len_type_t) p->message_id.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("message_id"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("message_id"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_TIMESTAMP_FLAG) {
-- zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("timestamp"), 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_TYPE_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("type"), (const char *) p->type.bytes, (PHP5to7_param_str_len_type_t) p->type.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("type"), (const char *) p->type.bytes, (PHP5to7_param_str_len_type_t) p->type.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("type"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("type"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_USER_ID_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("user_id"), (const char *) p->user_id.bytes, (PHP5to7_param_str_len_type_t) p->user_id.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("user_id"), (const char *) p->user_id.bytes, (PHP5to7_param_str_len_type_t) p->user_id.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("user_id"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("user_id"), "", 0 TSRMLS_CC);
- }
-
- if (p->_flags & AMQP_BASIC_APP_ID_FLAG) {
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("app_id"), (const char *) p->app_id.bytes, (PHP5to7_param_str_len_type_t) p->app_id.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("app_id"), (const char *) p->app_id.bytes, (PHP5to7_param_str_len_type_t) p->app_id.len TSRMLS_CC);
- } else {
- /* BC */
-- zend_update_property_stringl(this_ce, obj, ZEND_STRL("app_id"), "", 0 TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(obj), ZEND_STRL("app_id"), "", 0 TSRMLS_CC);
- }
-
- PHP5to7_MAYBE_DESTROY(headers);
-diff --git a/amqp_channel.c b/amqp_channel.c
-index ef9552a..493c6d3 100644
---- a/amqp_channel.c
-+++ b/amqp_channel.c
-@@ -152,10 +152,15 @@ static zval * php_amqp_get_fci_gc_data(zend_fcall_info *fci, zval *gc_data) {
- return gc_data;
- }
-
-+#if PHP_MAJOR_VERSION < 8
- static HashTable *amqp_channel_gc(zval *object, zval **table, int *n) /* {{{ */
- {
-- amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object);
--
-+ amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object);
-+#else
-+static HashTable *amqp_channel_gc(zend_object *object, zval **table, int *n) /* {{{ */
-+{
-+ amqp_channel_object *channel = php_amqp_channel_object_fetch(object);
-+#endif
- int basic_return_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_return.fci);
- int basic_ack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_ack.fci);
- int basic_nack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_nack.fci);
-@@ -249,7 +254,7 @@ static HashTable *amqp_channel_gc(zval *object, zval ***table, int *n TSRMLS_DC)
- *table = channel->gc_data;
- *n = cnt;
-
-- return zend_std_get_properties(object TSRMLS_CC);
-+ return zend_std_get_properties(PHP5to8_OBJ_PROP(object) TSRMLS_CC);
- } /* }}} */
-
- #endif
-@@ -331,7 +336,7 @@ static PHP_METHOD(amqp_channel_class, __construct)
- amqp_connection_object *connection;
-
- /* Parse out the method parameters */
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &connection_object) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &connection_object, amqp_connection_class_entry) == FAILURE) {
- zend_throw_exception(amqp_channel_exception_class_entry, "Parameter must be an instance of AMQPConnection.", 0 TSRMLS_CC);
- RETURN_NULL();
- }
-@@ -341,7 +346,7 @@ static PHP_METHOD(amqp_channel_class, __construct)
- PHP5to7_MAYBE_INIT(consumers);
- PHP5to7_ARRAY_INIT(consumers);
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("consumers"), PHP5to7_MAYBE_PTR(consumers) TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumers"), PHP5to7_MAYBE_PTR(consumers) TSRMLS_CC);
-
- PHP5to7_MAYBE_DESTROY(consumers);
-
-@@ -351,16 +356,16 @@ static PHP_METHOD(amqp_channel_class, __construct)
- #endif
-
- /* Set the prefetch count */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC);
-
- /* Set the prefetch size */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), INI_INT("amqp.prefetch_size") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), INI_INT("amqp.prefetch_size") TSRMLS_CC);
-
- /* Set the global prefetch count */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), INI_INT("amqp.global_prefetch_count") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), INI_INT("amqp.global_prefetch_count") TSRMLS_CC);
-
- /* Set the global prefetch size */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), INI_INT("amqp.global_prefetch_size") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), INI_INT("amqp.global_prefetch_size") TSRMLS_CC);
-
- /* Pull out and verify the connection */
- connection = PHP_AMQP_GET_CONNECTION(connection_object);
-@@ -376,7 +381,7 @@ static PHP_METHOD(amqp_channel_class, __construct)
- return;
- }
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), connection_object TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), connection_object TSRMLS_CC);
-
- channel_resource = (amqp_channel_resource*)ecalloc(1, sizeof(amqp_channel_resource));
- channel->channel_resource = channel_resource;
-@@ -580,8 +585,8 @@ static PHP_METHOD(amqp_channel_class, setPrefetchCount)
- }
-
- /* Set the prefetch count - the implication is to disable the size */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), 0 TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -659,8 +664,8 @@ static PHP_METHOD(amqp_channel_class, setPrefetchSize)
- }
-
- /* Set the prefetch size - the implication is to disable the count */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), 0 TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -715,8 +720,8 @@ static PHP_METHOD(amqp_channel_class, setGlobalPrefetchCount)
- }
-
- /* Set the global prefetch count - the implication is to disable the size */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), global_prefetch_count TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), global_prefetch_count TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), 0 TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -771,8 +776,8 @@ static PHP_METHOD(amqp_channel_class, setGlobalPrefetchSize)
- }
-
- /* Set the global prefetch size - the implication is to disable the count */
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), 0 TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), global_prefetch_size TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), 0 TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), global_prefetch_size TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -808,11 +813,11 @@ static PHP_METHOD(amqp_channel_class, qos)
-
- /* Set the prefetch size and prefetch count */
- if (global) {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), prefetch_size TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), prefetch_count TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_size"), prefetch_size TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("global_prefetch_count"), prefetch_count TSRMLS_CC);
- } else {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
- }
-
- /* If we are already connected, set the new prefetch count */
-diff --git a/amqp_connection.c b/amqp_connection.c
-index 5891a4f..466501a 100644
---- a/amqp_connection.c
-+++ b/amqp_connection.c
-@@ -68,9 +68,9 @@ zend_object_handlers amqp_connection_object_handlers;
- convert_to_string(PHP5to7_MAYBE_DEREF(zdata)); \
- } \
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { \
-- zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
-+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
- } else { \
-- zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), INI_STR("amqp." name) TSRMLS_CC); \
-+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), INI_STR("amqp." name) TSRMLS_CC); \
- }
-
- #define PHP_AMQP_EXTRACT_CONNECTION_BOOL(name) \
-@@ -80,9 +80,9 @@ zend_object_handlers amqp_connection_object_handlers;
- convert_to_long(PHP5to7_MAYBE_DEREF(zdata)); \
- } \
- if (zdata) { \
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
- } else { \
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), INI_INT("amqp." name) TSRMLS_CC); \
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), INI_INT("amqp." name) TSRMLS_CC); \
- }
-
- static int php_amqp_connection_resource_deleter(PHP5to7_zend_resource_le_t *el, amqp_connection_resource *connection_resource TSRMLS_DC)
-@@ -344,13 +344,13 @@ static PHP_METHOD(amqp_connection_class, __construct)
- /* Validate the given login */
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
- if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
-- zend_update_property(this_ce, getThis(), ZEND_STRL("login"), PHP5to7_MAYBE_DEREF(zdata)TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), PHP5to7_MAYBE_DEREF(zdata)TSRMLS_CC);
- } else {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'login' exceeds 128 character limit.", 0 TSRMLS_CC);
- return;
- }
- } else {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), INI_STR("amqp.login"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), INI_STR("amqp.login"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC);
- }
-
- /* Pull the password out of the $params array */
-@@ -362,13 +362,13 @@ static PHP_METHOD(amqp_connection_class, __construct)
- /* Validate the given password */
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
- if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- } else {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'password' exceeds 128 character limit.", 0 TSRMLS_CC);
- return;
- }
- } else {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), INI_STR("amqp.password"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.password"))) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), INI_STR("amqp.password"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.password"))) TSRMLS_CC);
- }
-
- /* Pull the host out of the $params array */
-@@ -380,13 +380,13 @@ static PHP_METHOD(amqp_connection_class, __construct)
- /* Validate the given host */
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
- if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- } else {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'host' exceeds 128 character limit.", 0 TSRMLS_CC);
- return;
- }
- } else {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), INI_STR("amqp.host"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host"))) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), INI_STR("amqp.host"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host"))) TSRMLS_CC);
- }
-
- /* Pull the vhost out of the $params array */
-@@ -398,25 +398,25 @@ static PHP_METHOD(amqp_connection_class, __construct)
- /* Validate the given vhost */
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
- if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- } else {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 character limit.", 0 TSRMLS_CC);
- return;
- }
- } else {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), INI_STR("amqp.vhost"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost"))) TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), INI_STR("amqp.vhost"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost"))) TSRMLS_CC);
-
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), INI_INT("amqp.port") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), INI_INT("amqp.port") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "port", sizeof("port"), zdata)) {
- SEPARATE_ZVAL(zdata);
- convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "read_timeout", sizeof("read_timeout"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -424,7 +424,7 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "timeout", sizeof("timeout"), zdata)) {
-@@ -441,7 +441,7 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- } else {
-
-@@ -450,17 +450,17 @@ static PHP_METHOD(amqp_connection_class, __construct)
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "INI setting 'amqp.timeout' is deprecated; use 'amqp.read_timeout' instead");
-
- if (strcmp(DEFAULT_READ_TIMEOUT, INI_STR("amqp.read_timeout")) == 0) {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.timeout") TSRMLS_CC);
- } else {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "INI setting 'amqp.read_timeout' will be used instead of 'amqp.timeout'");
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
- }
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
- }
- }
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), INI_FLT("amqp.write_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), INI_FLT("amqp.write_timeout") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "write_timeout", sizeof("write_timeout"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -468,11 +468,11 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), INI_FLT("amqp.rpc_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), INI_FLT("amqp.rpc_timeout") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "rpc_timeout", sizeof("rpc_timeout"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -480,11 +480,11 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'rpc_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), INI_FLT("amqp.connect_timeout") TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connect_timeout"), INI_FLT("amqp.connect_timeout") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "connect_timeout", sizeof("connect_timeout"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -492,12 +492,12 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'connect_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connect_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-
- }
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), INI_INT("amqp.channel_max") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), INI_INT("amqp.channel_max") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "channel_max", sizeof("channel_max"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -506,14 +506,14 @@ static PHP_METHOD(amqp_connection_class, __construct)
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'channel_max' is out of range.", 0 TSRMLS_CC);
- } else {
- if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), PHP_AMQP_DEFAULT_CHANNEL_MAX TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), PHP_AMQP_DEFAULT_CHANNEL_MAX TSRMLS_CC);
- } else {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), INI_INT("amqp.frame_max") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), INI_INT("amqp.frame_max") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "frame_max", sizeof("frame_max"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -522,14 +522,14 @@ static PHP_METHOD(amqp_connection_class, __construct)
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'frame_max' is out of range.", 0 TSRMLS_CC);
- } else {
- if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), PHP_AMQP_DEFAULT_FRAME_MAX TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), PHP_AMQP_DEFAULT_FRAME_MAX TSRMLS_CC);
- } else {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("frame_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), INI_INT("amqp.heartbeat") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("heartbeat"), INI_INT("amqp.heartbeat") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "heartbeat", sizeof("heartbeat"), zdata)) {
- SEPARATE_ZVAL(zdata);
-@@ -537,16 +537,16 @@ static PHP_METHOD(amqp_connection_class, __construct)
- if (Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0 || Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) > PHP_AMQP_MAX_HEARTBEAT) {
- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'heartbeat' is out of range.", 0 TSRMLS_CC);
- } else {
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("heartbeat"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), INI_INT("amqp.sasl_method") TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), INI_INT("amqp.sasl_method") TSRMLS_CC);
-
- if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "sasl_method", sizeof("sasl_method"), zdata)) {
- SEPARATE_ZVAL(zdata);
- convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
-
-
-@@ -563,7 +563,7 @@ static PHP_METHOD(amqp_connection_class, __construct)
- convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
- }
- if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
-- zend_update_property_string(this_ce, getThis(), ZEND_STRL("connection_name"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
-+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
- }
- }
- /* }}} */
-@@ -789,7 +789,7 @@ static PHP_METHOD(amqp_connection_class, setLogin)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), login, login_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("login"), login, login_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -823,7 +823,7 @@ static PHP_METHOD(amqp_connection_class, setPassword)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), password, password_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("password"), password, password_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -858,7 +858,7 @@ static PHP_METHOD(amqp_connection_class, setHost)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), host, host_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("host"), host, host_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -910,7 +910,7 @@ static PHP_METHOD(amqp_connection_class, setPort)
- return;
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), port TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("port"), port TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -943,7 +943,7 @@ static PHP_METHOD(amqp_connection_class, setVhost)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), vhost, vhost_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("vhost"), vhost, vhost_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -986,7 +986,7 @@ static PHP_METHOD(amqp_connection_class, setTimeout)
- /* Get the connection object out of the store */
- connection = PHP_AMQP_GET_CONNECTION(getThis());
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
-
- if (connection->connection_resource && connection->connection_resource->is_connected) {
- if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) {
-@@ -1032,7 +1032,7 @@ static PHP_METHOD(amqp_connection_class, setReadTimeout)
- /* Get the connection object out of the store */
- connection = PHP_AMQP_GET_CONNECTION(getThis());
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
-
- if (connection->connection_resource && connection->connection_resource->is_connected) {
- if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) {
-@@ -1078,7 +1078,7 @@ static PHP_METHOD(amqp_connection_class, setWriteTimeout)
- /* Get the connection object out of the store */
- connection = PHP_AMQP_GET_CONNECTION(getThis());
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), write_timeout TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("write_timeout"), write_timeout TSRMLS_CC);
-
- if (connection->connection_resource && connection->connection_resource->is_connected) {
- if (php_amqp_set_resource_write_timeout(connection->connection_resource, write_timeout TSRMLS_CC) == 0) {
-@@ -1124,7 +1124,7 @@ static PHP_METHOD(amqp_connection_class, setRpcTimeout)
- /* Get the connection object out of the store */
- connection = PHP_AMQP_GET_CONNECTION(getThis());
-
-- zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_timeout"), rpc_timeout TSRMLS_CC);
-+ zend_update_property_double(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("rpc_timeout"), rpc_timeout TSRMLS_CC);
-
- if (connection->connection_resource && connection->connection_resource->is_connected) {
- if (php_amqp_set_resource_rpc_timeout(connection->connection_resource, rpc_timeout TSRMLS_CC) == 0) {
-@@ -1255,7 +1255,7 @@ static PHP_METHOD(amqp_connection_class, setCACert)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cacert"), str, str_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cacert"), str, str_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -1279,7 +1279,7 @@ static PHP_METHOD(amqp_connection_class, setCert)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cert"), str, str_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("cert"), str, str_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -1303,7 +1303,7 @@ static PHP_METHOD(amqp_connection_class, setKey)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("key"), str, str_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("key"), str, str_len TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -1328,7 +1328,7 @@ static PHP_METHOD(amqp_connection_class, setVerify)
- return;
- }
-
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("verify"), verify TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("verify"), verify TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -1361,7 +1361,7 @@ static PHP_METHOD(amqp_connection_class, setSaslMethod)
- return;
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), method TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("sasl_method"), method TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -1385,9 +1385,9 @@ static PHP_METHOD(amqp_connection_class, setConnectionName)
- return;
- }
- if (str == NULL) {
-- zend_update_property_null(this_ce, getThis(), ZEND_STRL("connection_name") TSRMLS_CC);
-+ zend_update_property_null(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name") TSRMLS_CC);
- } else {
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("connection_name"), str, str_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection_name"), str, str_len TSRMLS_CC);
- }
-
-
-diff --git a/amqp_connection_resource.c b/amqp_connection_resource.c
-index 7e20a5c..b0e065a 100644
---- a/amqp_connection_resource.c
-+++ b/amqp_connection_resource.c
-@@ -112,15 +112,15 @@ static void php_amqp_close_connection_from_server(amqp_rpc_reply_t reply, char *
-
- if (!reply.reply.id) {
- PHP_AMQP_G(error_code) = -1;
-- spprintf(message, 0, "Server connection error: %d, message: %s",
-- PHP_AMQP_G(error_code),
-+ spprintf(message, 0, "Server connection error: %ld, message: %s",
-+ (long)PHP_AMQP_G(error_code),
- "unexpected response"
- );
- } else {
- PHP_AMQP_G(error_code) = m->reply_code;
- spprintf(message, 0, "Server connection error: %d, message: %.*s",
- m->reply_code,
-- (PHP5to7_param_str_len_type_t) m->reply_text.len,
-+ (int) m->reply_text.len,
- (char *) m->reply_text.bytes
- );
- }
-@@ -156,15 +156,15 @@ static void php_amqp_close_channel_from_server(amqp_rpc_reply_t reply, char **me
-
- if (!reply.reply.id) {
- PHP_AMQP_G(error_code) = -1;
-- spprintf(message, 0, "Server channel error: %d, message: %s",
-- PHP_AMQP_G(error_code),
-+ spprintf(message, 0, "Server channel error: %ld, message: %s",
-+ (long)PHP_AMQP_G(error_code),
- "unexpected response"
- );
- } else {
- PHP_AMQP_G(error_code) = m->reply_code;
- spprintf(message, 0, "Server channel error: %d, message: %.*s",
- m->reply_code,
-- (PHP5to7_param_str_len_type_t) m->reply_text.len,
-+ (int) m->reply_text.len,
- (char *)m->reply_text.bytes
- );
- }
-diff --git a/amqp_decimal.c b/amqp_decimal.c
-index 83c9f20..8fd92c1 100644
---- a/amqp_decimal.c
-+++ b/amqp_decimal.c
-@@ -53,7 +53,7 @@ static PHP_METHOD(amqp_decimal_class, __construct)
- }
-
- if (exponent > AMQP_DECIMAL_EXPONENT_MAX) {
-- zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal exponent value must be less than %u.", AMQP_DECIMAL_EXPONENT_MAX);
-+ zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal exponent value must be less than %u.", (unsigned)AMQP_DECIMAL_EXPONENT_MAX);
- return;
- }
- if (significand < AMQP_DECIMAL_SIGNIFICAND_MIN) {
-@@ -62,12 +62,12 @@ static PHP_METHOD(amqp_decimal_class, __construct)
- }
-
- if (significand > AMQP_DECIMAL_SIGNIFICAND_MAX) {
-- zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal significand value must be less than %u.", AMQP_DECIMAL_SIGNIFICAND_MAX);
-+ zend_throw_exception_ex(amqp_value_exception_class_entry, 0 TSRMLS_CC, "Decimal significand value must be less than %u.", (unsigned)AMQP_DECIMAL_SIGNIFICAND_MAX);
- return;
- }
-
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("exponent"), exponent TSRMLS_CC);
-- zend_update_property_long(this_ce, getThis(), ZEND_STRL("significand"), significand TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("exponent"), exponent TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("significand"), significand TSRMLS_CC);
- }
- /* }}} */
-
-diff --git a/amqp_envelope.c b/amqp_envelope.c
-index 8127bed..b7a7a45 100644
---- a/amqp_envelope.c
-+++ b/amqp_envelope.c
-@@ -67,13 +67,13 @@ void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelop
- amqp_basic_properties_t *p = &amqp_envelope->message.properties;
- amqp_message_t *message = &amqp_envelope->message;
-
-- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("body"), (const char *) message->body.bytes, (PHP5to7_param_str_len_type_t) message->body.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("body"), (const char *) message->body.bytes, (PHP5to7_param_str_len_type_t) message->body.len TSRMLS_CC);
-
-- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("consumer_tag"), (const char *) amqp_envelope->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->consumer_tag.len TSRMLS_CC);
-- zend_update_property_long(this_ce, envelope, ZEND_STRL("delivery_tag"), (PHP5to7_param_long_type_t) amqp_envelope->delivery_tag TSRMLS_CC);
-- zend_update_property_bool(this_ce, envelope, ZEND_STRL("is_redelivery"), (PHP5to7_param_long_type_t) amqp_envelope->redelivered TSRMLS_CC);
-- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("exchange_name"), (const char *) amqp_envelope->exchange.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->exchange.len TSRMLS_CC);
-- zend_update_property_stringl(this_ce, envelope, ZEND_STRL("routing_key"), (const char *) amqp_envelope->routing_key.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->routing_key.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("consumer_tag"), (const char *) amqp_envelope->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->consumer_tag.len TSRMLS_CC);
-+ zend_update_property_long(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("delivery_tag"), (PHP5to7_param_long_type_t) amqp_envelope->delivery_tag TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("is_redelivery"), (PHP5to7_param_long_type_t) amqp_envelope->redelivered TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("exchange_name"), (const char *) amqp_envelope->exchange.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->exchange.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(envelope), ZEND_STRL("routing_key"), (const char *) amqp_envelope->routing_key.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->routing_key.len TSRMLS_CC);
-
- php_amqp_basic_properties_extract(p, envelope TSRMLS_CC);
- }
-diff --git a/amqp_exchange.c b/amqp_exchange.c
-index 4f80d3b..4bfe397 100644
---- a/amqp_exchange.c
-+++ b/amqp_exchange.c
-@@ -65,20 +65,20 @@ static PHP_METHOD(amqp_exchange_class, __construct)
- zval *channelObj;
- amqp_channel_resource *channel_resource;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &channelObj, amqp_channel_class_entry) == FAILURE) {
- return;
- }
-
- PHP5to7_MAYBE_INIT(arguments);
- PHP5to7_ARRAY_INIT(arguments);
-- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
- PHP5to7_MAYBE_DESTROY(arguments);
-
- channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj);
- PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create exchange.");
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC);
-- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel"), channelObj TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
- }
- /* }}} */
-
-@@ -119,7 +119,7 @@ static PHP_METHOD(amqp_exchange_class, setName)
- }
-
- /* Set the exchange name */
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name, name_len TSRMLS_CC);
- }
- /* }}} */
-
-@@ -168,10 +168,10 @@ static PHP_METHOD(amqp_exchange_class, setFlags)
- /* Set the flags based on the bitmask we were given */
- flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_EXCHANGE_FLAGS : flagBitmask;
-
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("internal"), IS_INTERNAL(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("internal"), IS_INTERNAL(flagBitmask) TSRMLS_CC);
- }
- /* }}} */
-
-@@ -204,7 +204,7 @@ static PHP_METHOD(amqp_exchange_class, setType)
- return;
- }
-
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("type"), type, type_len TSRMLS_CC);
- }
- /* }}} */
-
-@@ -273,7 +273,7 @@ static PHP_METHOD(amqp_exchange_class, setArguments)
- return;
- }
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
-
- RETURN_TRUE;
- }
-diff --git a/amqp_queue.c b/amqp_queue.c
-index c13629c..eeba144 100644
---- a/amqp_queue.c
-+++ b/amqp_queue.c
-@@ -68,20 +68,20 @@ static PHP_METHOD(amqp_queue_class, __construct)
- zval *channelObj;
- amqp_channel_resource *channel_resource;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &channelObj, amqp_channel_class_entry) == FAILURE) {
- return;
- }
-
- PHP5to7_MAYBE_INIT(arguments);
- PHP5to7_ARRAY_INIT(arguments);
-- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
- PHP5to7_MAYBE_DESTROY(arguments);
-
- channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj);
- PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create queue.");
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC);
-- zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("channel"), channelObj TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
-
- }
- /* }}} */
-@@ -122,7 +122,7 @@ static PHP_METHOD(amqp_queue_class, setName)
- }
-
- /* Set the queue name */
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name, name_len TSRMLS_CC);
-
- /* BC */
- RETURN_TRUE;
-@@ -175,10 +175,10 @@ static PHP_METHOD(amqp_queue_class, setFlags)
- /* Set the flags based on the bitmask we were given */
- flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_QUEUE_FLAGS : flagBitmask;
-
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("exclusive"), IS_EXCLUSIVE(flagBitmask) TSRMLS_CC);
-- zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("exclusive"), IS_EXCLUSIVE(flagBitmask) TSRMLS_CC);
-+ zend_update_property_bool(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
-
- /* BC */
- RETURN_TRUE;
-@@ -250,7 +250,7 @@ static PHP_METHOD(amqp_queue_class, setArguments)
- return;
- }
-
-- zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
-+ zend_update_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
-
- RETURN_TRUE;
- }
-@@ -342,7 +342,7 @@ static PHP_METHOD(amqp_queue_class, declareQueue)
-
- /* Set the queue name, in case it is an autogenerated queue name */
- name = php_amqp_type_amqp_bytes_to_char(r->queue);
-- zend_update_property_string(this_ce, getThis(), ZEND_STRL("name"), name TSRMLS_CC);
-+ zend_update_property_string(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("name"), name TSRMLS_CC);
- efree(name);
-
- php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
-@@ -525,7 +525,7 @@ static PHP_METHOD(amqp_queue_class, consume)
- }
-
- zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel");
-- zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
-+ zval *consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
-
- if (IS_ARRAY != Z_TYPE_P(consumers)) {
- zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC);
-@@ -594,7 +594,7 @@ static PHP_METHOD(amqp_queue_class, consume)
- efree(key);
-
- /* Set the consumer tag name, in case it is an autogenerated consumer tag name */
-- zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("consumer_tag"), (const char *) r->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) r->consumer_tag.len TSRMLS_CC);
-+ zend_update_property_stringl(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumer_tag"), (const char *) r->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) r->consumer_tag.len TSRMLS_CC);
- }
-
- if (!ZEND_FCI_INITIALIZED(fci)) {
-@@ -674,7 +674,7 @@ static PHP_METHOD(amqp_queue_class, consume)
- current_channel_zv = current_channel_resource->parent->this_ptr;
- #endif
-
-- consumers = zend_read_property(amqp_channel_class_entry, PHP5to7_MAYBE_PTR(current_channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
-+ consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(current_channel_zv)), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
-
- if (IS_ARRAY != Z_TYPE_P(consumers)) {
- zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC);
-@@ -689,8 +689,8 @@ static PHP_METHOD(amqp_queue_class, consume)
- PHP5to7_zval_t exception PHP5to7_MAYBE_SET_TO_NULL;
- PHP5to7_MAYBE_INIT(exception);
- object_init_ex(PHP5to7_MAYBE_PTR(exception), amqp_envelope_exception_class_entry);
-- zend_update_property_string(zend_exception_get_default(TSRMLS_C), PHP5to7_MAYBE_PTR(exception), ZEND_STRL("message"), "Orphaned envelope" TSRMLS_CC);
-- zend_update_property(amqp_envelope_exception_class_entry, PHP5to7_MAYBE_PTR(exception), ZEND_STRL("envelope"), PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
-+ zend_update_property_string(zend_exception_get_default(TSRMLS_C), PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(exception)), ZEND_STRL("message"), "Orphaned envelope" TSRMLS_CC);
-+ zend_update_property(amqp_envelope_exception_class_entry, PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PTR(exception)), ZEND_STRL("envelope"), PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
-
- zend_throw_exception_object(PHP5to7_MAYBE_PTR(exception) TSRMLS_CC);
-
-@@ -946,7 +946,7 @@ static PHP_METHOD(amqp_queue_class, cancel)
- }
-
- zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel");
-- zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
-+ zval *consumers = zend_read_property(amqp_channel_class_entry, PHP5to8_OBJ_PROP(channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
- zend_bool has_consumer_tag = (zend_bool) (IS_STRING == Z_TYPE_P(PHP_AMQP_READ_THIS_PROP("consumer_tag")));
-
- if (IS_ARRAY != Z_TYPE_P(consumers)) {
-@@ -977,8 +977,8 @@ static PHP_METHOD(amqp_queue_class, cancel)
- return;
- }
-
-- if (!consumer_tag_len || has_consumer_tag && strcmp(consumer_tag, PHP_AMQP_READ_THIS_PROP_STR("consumer_tag")) != 0) {
-- zend_update_property_null(this_ce, getThis(), ZEND_STRL("consumer_tag") TSRMLS_CC);
-+ if (!consumer_tag_len || (has_consumer_tag && strcmp(consumer_tag, PHP_AMQP_READ_THIS_PROP_STR("consumer_tag")) != 0)) {
-+ zend_update_property_null(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("consumer_tag") TSRMLS_CC);
- }
-
- char *key;
-diff --git a/amqp_timestamp.c b/amqp_timestamp.c
-index d9eec39..ed07ab6 100644
---- a/amqp_timestamp.c
-+++ b/amqp_timestamp.c
-@@ -61,7 +61,7 @@ static PHP_METHOD(amqp_timestamp_class, __construct)
- #if PHP_MAJOR_VERSION >= 7
- zend_string *str;
- str = _php_math_number_format_ex(timestamp, 0, "", 0, "", 0);
-- zend_update_property_str(this_ce, getThis(), ZEND_STRL("timestamp"), str);
-+ zend_update_property_str(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL("timestamp"), str);
- zend_string_delref(str);
- #else
- char *str;
-@@ -104,7 +104,11 @@ ZEND_END_ARG_INFO()
- ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_timestamp_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
- ZEND_END_ARG_INFO()
-
-+#if PHP_MAJOR_VERSION < 8
- ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_timestamp_class_toString, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
-+#else
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_amqp_timestamp_class_toString, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, IS_STRING, 0)
-+#endif
- ZEND_END_ARG_INFO()
-
- zend_function_entry amqp_timestamp_class_functions[] = {
-diff --git a/amqp_type.c b/amqp_type.c
-index fb87727..5f1ab91 100644
---- a/amqp_type.c
-+++ b/amqp_type.c
-@@ -250,7 +250,7 @@ zend_bool php_amqp_type_internal_convert_php_to_amqp_field_value(zval *value, am
- if (instanceof_function(Z_OBJCE_P(value), amqp_timestamp_class_entry TSRMLS_CC)) {
- PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL;
-
-- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_timestamp_class_entry, NULL, "gettimestamp", &result_zv);
-+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_timestamp_class_entry, NULL, "gettimestamp", &result_zv);
-
- field->kind = AMQP_FIELD_KIND_TIMESTAMP;
- field->value.u64 = strtoimax(Z_STRVAL(PHP5to7_MAYBE_DEREF(result_zv)), NULL, 10);
-@@ -262,11 +262,11 @@ zend_bool php_amqp_type_internal_convert_php_to_amqp_field_value(zval *value, am
- field->kind = AMQP_FIELD_KIND_DECIMAL;
- PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL;
-
-- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getexponent", &result_zv);
-+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_decimal_class_entry, NULL, "getexponent", &result_zv);
- field->value.decimal.decimals = (uint8_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv));
- PHP5to7_MAYBE_DESTROY(result_zv);
-
-- zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getsignificand", &result_zv);
-+ zend_call_method_with_0_params(PHP5to8_OBJ_PROP(PHP5to7_MAYBE_PARAM_PTR(value)), amqp_decimal_class_entry, NULL, "getsignificand", &result_zv);
- field->value.decimal.value = (uint32_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv));
-
- PHP5to7_MAYBE_DESTROY(result_zv);
-diff --git a/php5_support.h b/php5_support.h
-index 5c57620..25c2d96 100644
---- a/php5_support.h
-+++ b/php5_support.h
-@@ -109,6 +109,8 @@ typedef zend_rsrc_list_entry PHP5to7_zend_resource_le_t;
- #define ZEND_ULONG_FMT "%" PRIu64
- #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL_CLASS
-
-+#define PHP5to8_OBJ_PROP(zv) (zv)
-+
- #endif //PHP_AMQP_PHP5_SUPPORT_H
-
- /*
-diff --git a/php7_support.h b/php7_support.h
-index c9e8f5b..0dbd6b2 100644
---- a/php7_support.h
-+++ b/php7_support.h
-@@ -101,15 +101,24 @@ typedef zval PHP5to7_zend_resource_le_t;
-
- #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
-
-+
- /* Small change to let it build after a major internal change for php8.0
- * More info:
- * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47
- */
- #if PHP_MAJOR_VERSION >= 8
-+
- # define TSRMLS_DC
- # define TSRMLS_D
- # define TSRMLS_CC
- # define TSRMLS_C
-+
-+#define PHP5to8_OBJ_PROP(zv) Z_OBJ_P(zv)
-+
-+#else
-+
-+#define PHP5to8_OBJ_PROP(zv) (zv)
-+
- # endif
-
- #endif //PHP_AMQP_PHP7_SUPPORT_H
-diff --git a/php_amqp.h b/php_amqp.h
-index 752edd7..686741d 100644
---- a/php_amqp.h
-+++ b/php_amqp.h
-@@ -221,14 +221,14 @@ struct _amqp_connection_object {
- #define PHP_AMQP_NOPARAMS() if (zend_parse_parameters_none() == FAILURE) { return; }
-
- #define PHP_AMQP_RETURN_THIS_PROP(prop_name) \
-- zval * _zv = zend_read_property(this_ce, getThis(), ZEND_STRL(prop_name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); \
-+ zval * _zv = zend_read_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(prop_name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); \
- RETURN_ZVAL(_zv, 1, 0);
-
--#define PHP_AMQP_READ_OBJ_PROP(cls, obj, name) zend_read_property((cls), (obj), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
-+#define PHP_AMQP_READ_OBJ_PROP(cls, obj, name) zend_read_property((cls), PHP5to8_OBJ_PROP(obj), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
- #define PHP_AMQP_READ_OBJ_PROP_DOUBLE(cls, obj, name) Z_DVAL_P(PHP_AMQP_READ_OBJ_PROP((cls), (obj), (name)))
-
--#define PHP_AMQP_READ_THIS_PROP_CE(name, ce) zend_read_property((ce), getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
--#define PHP_AMQP_READ_THIS_PROP(name) zend_read_property(this_ce, getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
-+#define PHP_AMQP_READ_THIS_PROP_CE(name, ce) zend_read_property((ce), PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
-+#define PHP_AMQP_READ_THIS_PROP(name) zend_read_property(this_ce, PHP5to8_OBJ_PROP(getThis()), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
- #define PHP_AMQP_READ_THIS_PROP_BOOL(name) Z_BVAL_P(PHP_AMQP_READ_THIS_PROP(name))
- #define PHP_AMQP_READ_THIS_PROP_STR(name) Z_STRVAL_P(PHP_AMQP_READ_THIS_PROP(name))
- #define PHP_AMQP_READ_THIS_PROP_STRLEN(name) (Z_TYPE_P(PHP_AMQP_READ_THIS_PROP(name)) == IS_STRING ? Z_STRLEN_P(PHP_AMQP_READ_THIS_PROP(name)) : 0)
-diff --git a/tests/amqptimestamp.phpt b/tests/amqptimestamp.phpt
-index 9835883..6424f8b 100644
---- a/tests/amqptimestamp.phpt
-+++ b/tests/amqptimestamp.phpt
-@@ -2,7 +2,7 @@
- AMQPTimestamp
- --SKIPIF--
- <?php
--if (!extension_loaded("amqp") || version_compare(PHP_VERSION, '5.3', '<')) {
-+if (!extension_loaded("amqp") || version_compare(PHP_VERSION, '5.3', '<') || version_compare(PHP_VERSION, '8.0', '>')) {
- print "skip";
- }
- --FILE--
-@@ -52,4 +52,4 @@ bool(true)
- string(20) "18446744073709551616"
- string(1) "0"
-
--==END==
-\ No newline at end of file
-+==END==
-diff --git a/tests/amqptimestamp_php8.phpt b/tests/amqptimestamp_php8.phpt
-new file mode 100644
-index 0000000..dabecc5
---- /dev/null
-+++ b/tests/amqptimestamp_php8.phpt
-@@ -0,0 +1,60 @@
-+--TEST--
-+AMQPTimestamp
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("amqp") || version_compare(PHP_VERSION, '8.0', '<')) {
-+ print "skip";
-+}
-+--FILE--
-+<?php
-+
-+$timestamp = new AMQPTimestamp(100000);
-+var_dump($timestamp->getTimestamp(), (string) $timestamp);
-+
-+$timestamp = new AMQPTimestamp(100000.1);
-+var_dump($timestamp->getTimestamp(), (string) $timestamp);
-+
-+try {
-+ new AMQPTimestamp();
-+} catch(ArgumentCountError $e) {
-+ echo $e->getMessage() . "\n";
-+}
-+try {
-+ new AMQPTimestamp("string");
-+} catch(TypeError $e) {
-+ echo $e->getMessage() . "\n";
-+}
-+
-+try {
-+ new AMQPTimestamp(AMQPTimestamp::MIN - 1);
-+} catch (AMQPValueException $e) {
-+ echo $e->getMessage() . "\n";
-+}
-+
-+try {
-+ new AMQPTimestamp(INF);
-+} catch (AMQPValueException $e) {
-+ echo $e->getMessage() . "\n";
-+}
-+
-+var_dump((new ReflectionClass("AMQPTimestamp"))->isFinal());
-+
-+var_dump(AMQPTimestamp::MAX);
-+var_dump(AMQPTimestamp::MIN);
-+?>
-+
-+==END==
-+--EXPECTF--
-+string(6) "100000"
-+string(6) "100000"
-+string(6) "100000"
-+string(6) "100000"
-+AMQPTimestamp::__construct() expects exactly 1 parameter, 0 given
-+AMQPTimestamp::__construct(): Argument #1 ($timestamp) must be of type float, string given
-+The timestamp parameter must be greater than 0.
-+The timestamp parameter must be less than 18446744073709551616.
-+bool(true)
-+string(20) "18446744073709551616"
-+string(1) "0"
-+
-+==END==
-diff --git a/tests/bug_61533.phpt b/tests/bug_61533.phpt
-index ecb5213..f53c315 100644
---- a/tests/bug_61533.phpt
-+++ b/tests/bug_61533.phpt
-@@ -21,4 +21,4 @@ try {
-
- ?>
- --EXPECTF--
--%s: Argument 1 passed to AMQPQueue::__construct() must be an instance of AMQPChannel, instance of AMQPConnection given%s
-+%s AMQPChannel%s AMQPConnection%s
diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash
index bce8ac0c9a..159a157a49 100644
--- a/package/php-amqp/php-amqp.hash
+++ b/package/php-amqp/php-amqp.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2 amqp-1.10.2.tgz
+sha256 2de740da9a884ade2caf0e59e5521bbf80da16155fa6a6205630b473aed5e6dd amqp-2.0.0.tgz
sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE
diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk
index 981f8274a9..7e58234d1f 100644
--- a/package/php-amqp/php-amqp.mk
+++ b/package/php-amqp/php-amqp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_AMQP_VERSION = 1.10.2
+PHP_AMQP_VERSION = 2.0.0
PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
PHP_AMQP_SITE = https://pecl.php.net/get
PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 03/10] package/php-apcu: bump version to 5.1.22
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 04/10] package/php-gnupg: bump version to 1.5.1 Adam Duskett
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-apcu/php-apcu.hash | 2 +-
package/php-apcu/php-apcu.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-apcu/php-apcu.hash b/package/php-apcu/php-apcu.hash
index 3aae4120d2..4a5eadf803 100644
--- a/package/php-apcu/php-apcu.hash
+++ b/package/php-apcu/php-apcu.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 b99d40fafec06f4d132fcee53e7526ddbfc1d041ea6e04e17389dfad28f9c390 apcu-5.1.20.tgz
+sha256 010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e apcu-5.1.22.tgz
sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE
diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk
index d381c9054f..b8eeb9de7c 100644
--- a/package/php-apcu/php-apcu.mk
+++ b/package/php-apcu/php-apcu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_APCU_VERSION = 5.1.20
+PHP_APCU_VERSION = 5.1.22
PHP_APCU_SITE = http://pecl.php.net/get
PHP_APCU_SOURCE = apcu-$(PHP_APCU_VERSION).tgz
PHP_APCU_LICENSE = PHP-3.01
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 04/10] package/php-gnupg: bump version to 1.5.1
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 03/10] package/php-apcu: bump version to 5.1.22 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 05/10] package/php-memcached: bump version to 3.2.0 Adam Duskett
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Drop upstream patch
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
...0001-Remove-inlining-_phpc_res_close.patch | 33 -------------------
package/php-gnupg/php-gnupg.hash | 2 +-
package/php-gnupg/php-gnupg.mk | 2 +-
3 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch
diff --git a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch b/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch
deleted file mode 100644
index 9b94cb7e4f..0000000000
--- a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 887b0899d7e7423baec691255c2d8b56bb348ecd Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Sun, 14 Mar 2021 18:52:21 +0000
-Subject: [PATCH] Remove inlining _phpc_res_close
-
-[Retrieved from:
-https://github.com/bukka/phpc/commit/887b0899d7e7423baec691255c2d8b56bb348ecd]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- phpc.h | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/phpc/phpc.h b/phpc/phpc.h
-index dc5887e..9206105 100644
---- a/phpc/phpc.h
-+++ b/phpc/phpc.h
-@@ -945,16 +945,8 @@ typedef zend_resource * phpc_res_value_t;
- zend_fetch_resource2(Z_RES_P(_pz_res), _res_type_name, _res_type_1, _res_type_2)
- #define PHPC_RES_DELETE(_pz_res) \
- zend_list_delete(Z_RES_P(_pz_res))
--#if PHP_MAJOR_VERSION < 8
- #define PHPC_RES_CLOSE(_pz_res) \
- zend_list_close(Z_RES_P(_pz_res))
--#else
--inline int _phpc_res_close(zval *zres) {
-- zend_list_close(Z_RES_P(zres));
-- return SUCCESS;
--}
--#define PHPC_RES_CLOSE _phpc_res_close
--#endif
-
- /* resource to zval */
- #define PHPC_RES_PZVAL(_res, _pzv) \
diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash
index 99ffe87f46..084de7750a 100644
--- a/package/php-gnupg/php-gnupg.hash
+++ b/package/php-gnupg/php-gnupg.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 d4f5f79aa483908f3df08e5b343ea3593c6d725b9ed2103e30242627659e0a64 gnupg-1.5.0.tgz
+sha256 a9906f465ab2343cb2f3127ee209c72760238745c34878d9bbc1576486219252 gnupg-1.5.1.tgz
sha256 da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9 LICENSE
diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk
index a89f0978af..89054f5f7c 100644
--- a/package/php-gnupg/php-gnupg.mk
+++ b/package/php-gnupg/php-gnupg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_GNUPG_VERSION = 1.5.0
+PHP_GNUPG_VERSION = 1.5.1
PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz
PHP_GNUPG_SITE = https://pecl.php.net/get
# phpize does the autoconf magic
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 05/10] package/php-memcached: bump version to 3.2.0
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (2 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 04/10] package/php-gnupg: bump version to 1.5.1 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 06/10] package/php-pam: bump version to 2.2.4 Adam Duskett
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-memcached/php-memcached.hash | 2 +-
package/php-memcached/php-memcached.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-memcached/php-memcached.hash b/package/php-memcached/php-memcached.hash
index 7e918c17f6..162d25f795 100644
--- a/package/php-memcached/php-memcached.hash
+++ b/package/php-memcached/php-memcached.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd memcached-3.1.5.tgz
+sha256 2a41143a7b29f4a962a3805b77aa207a99e4566e2d314ce98a051cd24d6e9636 memcached-3.2.0.tgz
sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0 LICENSE
sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054 fastlz/LICENSE
sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82 g_fmt.h
diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk
index 068fbb786b..f92a8ddf4c 100644
--- a/package/php-memcached/php-memcached.mk
+++ b/package/php-memcached/php-memcached.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_MEMCACHED_VERSION = 3.1.5
+PHP_MEMCACHED_VERSION = 3.2.0
PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz
PHP_MEMCACHED_SITE = https://pecl.php.net/get
PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 06/10] package/php-pam: bump version to 2.2.4
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (3 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 05/10] package/php-memcached: bump version to 3.2.0 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 07/10] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941 Adam Duskett
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-pam/php-pam.hash | 2 +-
package/php-pam/php-pam.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-pam/php-pam.hash b/package/php-pam/php-pam.hash
index c3eb49fbe7..be15237f7d 100644
--- a/package/php-pam/php-pam.hash
+++ b/package/php-pam/php-pam.hash
@@ -1,3 +1,3 @@
# Locally calculated:
-sha256 fda3b5f719d51cb278351eedd3d7a96db75661324d81fdcf8072a4309121bc92 pam-2.2.3.tgz
+sha256 d5c818c73c9cde4d2118bb08322dec0b532f3be48c3ef7d3f23a05af5080eb24 pam-2.2.4.tgz
sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE
diff --git a/package/php-pam/php-pam.mk b/package/php-pam/php-pam.mk
index c35ad4f5d0..a348fb9d44 100644
--- a/package/php-pam/php-pam.mk
+++ b/package/php-pam/php-pam.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_PAM_VERSION = 2.2.3
+PHP_PAM_VERSION = 2.2.4
PHP_PAM_SITE = http://pecl.php.net/get
PHP_PAM_SOURCE = pam-$(PHP_PAM_VERSION).tgz
PHP_PAM_LICENSE = PHP-3.01
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 07/10] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (4 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 06/10] package/php-pam: bump version to 2.2.4 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 08/10] package/php-ssh2: bump version to 1.4 Adam Duskett
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Drop upstream patches.
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-pecl-dbus/0001-php8-compat.patch | 158 ------------------
...lity-with-php8-call_user_function_ex.patch | 32 ----
package/php-pecl-dbus/php-pecl-dbus.hash | 2 +-
package/php-pecl-dbus/php-pecl-dbus.mk | 2 +-
4 files changed, 2 insertions(+), 192 deletions(-)
delete mode 100644 package/php-pecl-dbus/0001-php8-compat.patch
delete mode 100644 package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch
diff --git a/package/php-pecl-dbus/0001-php8-compat.patch b/package/php-pecl-dbus/0001-php8-compat.patch
deleted file mode 100644
index acca6e1d49..0000000000
--- a/package/php-pecl-dbus/0001-php8-compat.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 7fde4dd4d26d2a4b7957a1010c6ea9e4b940fc62 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Mon, 18 Jan 2021 23:22:52 +0200
-Subject: [PATCH] php8 compat
-
-Upstream: https://github.com/derickr/pecl-dbus/pull/8
-Signed-off-by: Herve Codina <herve.codina@bootlin.com>
----
- dbus.c | 55 ++++++++++++++++++++++++++++++------------------------
- php_dbus.h | 10 ++++++++++
- 2 files changed, 41 insertions(+), 24 deletions(-)
-
-diff --git a/dbus.c b/dbus.c
-index 9fde647..a98e2ea 100644
---- a/dbus.c
-+++ b/dbus.c
-@@ -38,6 +38,9 @@
- #define Z_ADDREF_P(z) ((z)->refcount++)
- #endif
-
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
-+ZEND_END_ARG_INFO()
-+
- /* {{{ arginfo */
- ZEND_BEGIN_ARG_INFO_EX(arginfo_dbus_object___call, 0, 0, 2)
- ZEND_ARG_INFO(0, function_name)
-@@ -46,44 +49,44 @@ ZEND_END_ARG_INFO()
- /* }}} */
-
- const zend_function_entry dbus_funcs_dbus[] = {
-- PHP_ME(Dbus, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(Dbus, addWatch, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(Dbus, waitLoop, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(Dbus, requestName, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(Dbus, registerObject, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(Dbus, createProxy, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, addWatch, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, waitLoop, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, requestName, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, registerObject, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(Dbus, createProxy, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_object[] = {
-- PHP_ME(DbusObject, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PRIVATE)
-+ PHP_ME(DbusObject, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PRIVATE)
- PHP_ME(DbusObject, __call, arginfo_dbus_object___call, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_signal[] = {
-- PHP_ME(DbusSignal, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusSignal, matches, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(DbusSignal, getData, NULL, ZEND_ACC_PUBLIC)
-- PHP_ME(DbusSignal, send, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSignal, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSignal, matches, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSignal, getData, arginfo_void, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSignal, send, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_array[] = {
-- PHP_ME(DbusArray, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusArray, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusArray, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusArray, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_dict[] = {
-- PHP_ME(DbusDict, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusDict, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusDict, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusDict, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- #define PHP_DBUS_INT_WRAPPER_DEF(s,t) \
- const zend_function_entry dbus_funcs_dbus_##s[] = { \
-- PHP_ME(Dbus##t, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) \
-+ PHP_ME(Dbus##t, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) \
- PHP_FE_END \
- };
-
-@@ -98,26 +101,26 @@ PHP_DBUS_INT_WRAPPER_DEF(uint64,UInt64);
- PHP_DBUS_INT_WRAPPER_DEF(double, Double);
-
- const zend_function_entry dbus_funcs_dbus_variant[] = {
-- PHP_ME(DbusVariant, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusVariant, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusVariant, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusVariant, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_set[] = {
-- PHP_ME(DbusSet, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusSet, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSet, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusSet, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_struct[] = {
-- PHP_ME(DbusStruct, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusStruct, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusStruct, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusStruct, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
- const zend_function_entry dbus_funcs_dbus_object_path[] = {
-- PHP_ME(DbusObjectPath, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-- PHP_ME(DbusObjectPath, getData, NULL, ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusObjectPath, __construct, arginfo_void, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
-+ PHP_ME(DbusObjectPath, getData, arginfo_void, ZEND_ACC_PUBLIC)
- PHP_FE_END
- };
-
-@@ -405,7 +408,11 @@ static void dbus_register_classes(TSRMLS_D)
- dbus_ce_dbus = zend_register_internal_class_ex(&ce_dbus, NULL);
- memcpy(&dbus_object_handlers_dbus, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- dbus_object_handlers_dbus.clone_obj = dbus_object_clone_dbus;
-+#if PHP_VERSION_ID < 80000
- dbus_object_handlers_dbus.compare_objects = dbus_object_compare_dbus;
-+#else
-+ dbus_object_handlers_dbus.compare = dbus_object_compare_dbus;
-+#endif
-
- zend_declare_class_constant_long(dbus_ce_dbus, "BYTE", sizeof("BYTE")-1, DBUS_TYPE_BYTE TSRMLS_CC);
- zend_declare_class_constant_long(dbus_ce_dbus, "BOOLEAN", sizeof("BOOLEAN")-1, DBUS_TYPE_BOOLEAN TSRMLS_CC);
-diff --git a/php_dbus.h b/php_dbus.h
-index 8817544..1f0f551 100644
---- a/php_dbus.h
-+++ b/php_dbus.h
-@@ -25,6 +25,16 @@
- #include "config.h"
- #endif
-
-+#if PHP_VERSION_ID >= 80000
-+#ifndef TSRMLS_D
-+#define TSRMLS_D void
-+#define TSRMLS_DC
-+#define TSRMLS_C
-+#define TSRMLS_CC
-+#define TSRMLS_FETCH()
-+#endif
-+#endif /* PHP_VERSION_ID >= 80000 */
-+
- #include "Zend/zend_hash.h"
-
- #define PHP_DBUS_VERSION "0.2.0"
---
-2.31.1
-
diff --git a/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch b/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch
deleted file mode 100644
index 5babce94b4..0000000000
--- a/package/php-pecl-dbus/0002-Fix-compatibility-with-php8-call_user_function_ex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8cf66c4b5dd657ca14552b27a42901db0a5e9280 Mon Sep 17 00:00:00 2001
-From: Herve Codina <herve.codina@bootlin.com>
-Date: Mon, 4 Oct 2021 17:13:45 +0200
-Subject: [PATCH] Fix compatibility with php8 - call_user_function_ex
-
-This patch fixes compatibility with php8 replacing
-call_user_function_ex by call_user_function.
-
-Upstream: https://github.com/derickr/pecl-dbus/pull/8
-Signed-off-by: Herve Codina <herve.codina@bootlin.com>
----
- dbus.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dbus.c b/dbus.c
-index a98e2ea..6fa9897 100644
---- a/dbus.c
-+++ b/dbus.c
-@@ -1015,8 +1015,8 @@ php_dbus_do_method_call(php_dbus_obj *dbus,
- method_args = safe_emalloc(sizeof(zval *), num_elems, 0);
- }
-
-- if (call_user_function_ex(EG(function_table), object, &callback, &retval,
-- num_elems, method_args, 0, NULL) == SUCCESS) {
-+ if (call_user_function(EG(function_table), object, &callback, &retval,
-+ num_elems, method_args) == SUCCESS) {
- if (!Z_ISUNDEF(retval)) {
- reply = dbus_message_new_method_return(msg);
- php_dbus_append_parameters(reply, &retval, NULL,
---
-2.31.1
-
diff --git a/package/php-pecl-dbus/php-pecl-dbus.hash b/package/php-pecl-dbus/php-pecl-dbus.hash
index f43e2c8b51..122636913c 100644
--- a/package/php-pecl-dbus/php-pecl-dbus.hash
+++ b/package/php-pecl-dbus/php-pecl-dbus.hash
@@ -1,3 +1,3 @@
# Locally calculated:
-sha256 c48761c645c6fa42b57af0e65d893217dc69bcd8d879ace74d6abbf1c5f73a8f php-pecl-dbus-315d17558c7614d02e923d898231e51c86a25789.tar.gz
+sha256 652db988457479682ef1bbe00952d746b54150e77f06a4d75ffa3a696f5321ba php-pecl-dbus-b147624d480c3353e6c700e9a2d0c6f14d853941.tar.gz
sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE
diff --git a/package/php-pecl-dbus/php-pecl-dbus.mk b/package/php-pecl-dbus/php-pecl-dbus.mk
index a70a2e7ae1..84cc373bb7 100644
--- a/package/php-pecl-dbus/php-pecl-dbus.mk
+++ b/package/php-pecl-dbus/php-pecl-dbus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_PECL_DBUS_VERSION = 315d17558c7614d02e923d898231e51c86a25789
+PHP_PECL_DBUS_VERSION = b147624d480c3353e6c700e9a2d0c6f14d853941
PHP_PECL_DBUS_SITE = $(call github,derickr,pecl-dbus,$(PHP_PECL_DBUS_VERSION))
PHP_PECL_DBUS_LICENSE = PHP-3.01
PHP_PECL_DBUS_LICENSE_FILES = LICENSE
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 08/10] package/php-ssh2: bump version to 1.4
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (5 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 07/10] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 09/10] package/php-xdebug: bump version to 3.2.2 Adam Duskett
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-ssh2/php-ssh2.hash | 2 +-
package/php-ssh2/php-ssh2.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-ssh2/php-ssh2.hash b/package/php-ssh2/php-ssh2.hash
index 3fbb0b24c8..69e0b92071 100644
--- a/package/php-ssh2/php-ssh2.hash
+++ b/package/php-ssh2/php-ssh2.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 9093a1f8d24dc65836027b0e239c50de8d5eaebf8396bc3331fdd38c5d69afd9 ssh2-1.3.1.tgz
+sha256 988b52e0315bb5ed725050cb02de89b541034b7be6b94623dcb2baa33f811d87 ssh2-1.4.tgz
sha256 ac7c56f1e416ce6e60abcf26269395128bc9e5a2e4f3293e5dcc124aac606508 LICENSE
diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk
index b79ac04179..e7955a2c07 100644
--- a/package/php-ssh2/php-ssh2.mk
+++ b/package/php-ssh2/php-ssh2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_SSH2_VERSION = 1.3.1
+PHP_SSH2_VERSION = 1.4
PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz
PHP_SSH2_SITE = https://pecl.php.net/get
PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 09/10] package/php-xdebug: bump version to 3.2.2
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (6 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 08/10] package/php-ssh2: bump version to 1.4 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 10/10] package/php-yaml: bump version to 2.2.3 Adam Duskett
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-xdebug/php-xdebug.hash | 2 +-
package/php-xdebug/php-xdebug.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash
index fa92ee82ed..2509e6e2ee 100644
--- a/package/php-xdebug/php-xdebug.hash
+++ b/package/php-xdebug/php-xdebug.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz
+sha256 f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157 xdebug-3.2.2.tgz
sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE
diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk
index 9429d4afee..c5a1e10ebc 100644
--- a/package/php-xdebug/php-xdebug.mk
+++ b/package/php-xdebug/php-xdebug.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_XDEBUG_VERSION = 3.2.0
+PHP_XDEBUG_VERSION = 3.2.2
PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz
PHP_XDEBUG_SITE = https://xdebug.org/files
PHP_XDEBUG_INSTALL_STAGING = YES
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 10/10] package/php-yaml: bump version to 2.2.3
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (7 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 09/10] package/php-xdebug: bump version to 3.2.2 Adam Duskett
@ 2023-09-05 18:06 ` Adam Duskett
2023-09-08 20:02 ` [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Thomas Petazzoni via buildroot
2023-09-14 18:59 ` Peter Korsgaard
10 siblings, 0 replies; 12+ messages in thread
From: Adam Duskett @ 2023-09-05 18:06 UTC (permalink / raw)
To: buildroot; +Cc: Hervé Codina, Bernd Kuhls, Adam Duskett
From: Adam Duskett <aduskett@gmail.comm>
Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
package/php-yaml/php-yaml.hash | 2 +-
package/php-yaml/php-yaml.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash
index b4d14c5a30..4fa5dfbc16 100644
--- a/package/php-yaml/php-yaml.hash
+++ b/package/php-yaml/php-yaml.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 119052f0461d57d86f44c252f9c9b2dd743486c701c1a0aba0aebecdd0d8b82a yaml-2.2.2.tgz
+sha256 5937eb9722ddf6d64626799cfa024598ff2452ea157992e4e67331a253f90236 yaml-2.2.3.tgz
sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE
diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk
index 39a422e25d..e825e3146f 100644
--- a/package/php-yaml/php-yaml.mk
+++ b/package/php-yaml/php-yaml.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PHP_YAML_VERSION = 2.2.2
+PHP_YAML_VERSION = 2.2.3
PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
PHP_YAML_SITE = https://pecl.php.net/get
PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (8 preceding siblings ...)
2023-09-05 18:06 ` [Buildroot] [PATCH 10/10] package/php-yaml: bump version to 2.2.3 Adam Duskett
@ 2023-09-08 20:02 ` Thomas Petazzoni via buildroot
2023-09-14 18:59 ` Peter Korsgaard
10 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-09-08 20:02 UTC (permalink / raw)
To: Adam Duskett; +Cc: Bernd Kuhls, Hervé Codina, Adam Duskett, buildroot
On Tue, 5 Sep 2023 12:06:01 -0600
Adam Duskett <aduskett@gmail.com> wrote:
> From: Adam Duskett <aduskett@gmail.comm>
>
> Signed-off-by: Adam Duskett <aduskett@gmail.comm>
> ---
> package/php/0003-configure-disable-the-phar-tool.patch | 2 +-
> package/php/php.hash | 2 +-
> package/php/php.mk | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
Series applied to master, thanks! Note that you had forgotten to update
the .checkpackageignore file in two of the patches, so I fixed that up.
Also note that your patches were Cc: to Adam Duskett
<aduskett@gmail.comm>. Yes with .comm and not .com. Maybe something to
fix in your configuration?
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
` (9 preceding siblings ...)
2023-09-08 20:02 ` [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Thomas Petazzoni via buildroot
@ 2023-09-14 18:59 ` Peter Korsgaard
10 siblings, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2023-09-14 18:59 UTC (permalink / raw)
To: Adam Duskett; +Cc: Bernd Kuhls, Hervé Codina, Adam Duskett, buildroot
>>>>> "Adam" == Adam Duskett <aduskett@gmail.com> writes:
> From: Adam Duskett <aduskett@gmail.comm>
> Signed-off-by: Adam Duskett <aduskett@gmail.comm>
Committed to 2023.02.x, 2023.05.x and 2023.05.8, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-09-14 18:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 03/10] package/php-apcu: bump version to 5.1.22 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 04/10] package/php-gnupg: bump version to 1.5.1 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 05/10] package/php-memcached: bump version to 3.2.0 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 06/10] package/php-pam: bump version to 2.2.4 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 07/10] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 08/10] package/php-ssh2: bump version to 1.4 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 09/10] package/php-xdebug: bump version to 3.2.2 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 10/10] package/php-yaml: bump version to 2.2.3 Adam Duskett
2023-09-08 20:02 ` [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Thomas Petazzoni via buildroot
2023-09-14 18:59 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox