diff options
| -rw-r--r-- | 383.patch | 1268 | ||||
| -rw-r--r-- | 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch | 50 | ||||
| -rw-r--r-- | php-pecl-amqp.spec | 31 |
3 files changed, 1337 insertions, 12 deletions
diff --git a/383.patch b/383.patch new file mode 100644 index 0000000..1c1b130 --- /dev/null +++ b/383.patch @@ -0,0 +1,1268 @@ +From 795c90ab79d691ea4346fce2d968579c416ca0ba Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 31 Aug 2020 15:57:23 +0200 +Subject: [PATCH 1/2] more work for PHP 8 + +--- + 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/bug_61533.phpt | 2 +- + 14 files changed, 192 insertions(+), 172 deletions(-) + +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/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 + +From 8af9340ddc24e80f22ae117a729d2ee2fc78229f Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 31 Aug 2020 16:10:37 +0200 +Subject: [PATCH 2/2] split test + +--- + tests/amqptimestamp.phpt | 4 +-- + tests/amqptimestamp_php8.phpt | 60 +++++++++++++++++++++++++++++++++++ + 2 files changed, 62 insertions(+), 2 deletions(-) + create mode 100644 tests/amqptimestamp_php8.phpt + +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/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch b/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch new file mode 100644 index 0000000..6070e36 --- /dev/null +++ b/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch @@ -0,0 +1,50 @@ +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) + +--- + 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/php-pecl-amqp.spec b/php-pecl-amqp.spec index abcc142..a134c73 100644 --- a/php-pecl-amqp.spec +++ b/php-pecl-amqp.spec @@ -18,8 +18,9 @@ %scl_package php-pecl-amqp %endif +%bcond_with tests + %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global with_tests 0%{?_with_tests:1} %global pecl_name amqp %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini @@ -33,11 +34,14 @@ Summary: Communicate with any AMQP compliant server Name: %{?sub_prefix}php-pecl-amqp Version: 1.10.2 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/amqp Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: https://github.com/php-amqp/php-amqp/commit/96cd5cb5eddd3db2faaa3643dad2fe4677d7c438.patch +Patch1: https://patch-diff.githubusercontent.com/raw/php-amqp/php-amqp/pull/383.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.6 BuildRequires: %{?scl_prefix}php-pear @@ -49,7 +53,7 @@ Requires: librabbitmq%{?_isa} >= %{buildver} BuildRequires: librabbitmq-last-devel >= 0.8.0 Requires: librabbitmq-last%{?_isa} >= %{buildver} %endif -%if %{with_tests} +%if %{with tests} BuildRequires: rabbitmq-server %endif @@ -66,33 +70,29 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{re Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.0" Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif @@ -123,6 +123,9 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS +%patch0 -p1 -b .up +%patch1 -p1 -b .pr383 + sed -e 's/CFLAGS="-I/CFLAGS="-fPIC -I/' -i config.m4 # Upstream often forget to change this @@ -241,7 +244,7 @@ done -m | grep %{pecl_name} %endif -%if %{with_tests} +%if %{with tests} mkdir log run base : Launch the RabbitMQ service export RABBITMQ_PID_FILE=$PWD/run/pid @@ -316,6 +319,10 @@ fi %changelog +* Fri Sep 4 2020 Remi Collet <remi@remirepo.net> - 1.10.2-2 +- add patches for PHP 8 from upstream and + https://github.com/php-amqp/php-amqp/pull/383 + * Mon Apr 6 2020 Remi Collet <remi@remirepo.net> - 1.10.2-1 - update to 1.10.2 |