Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 314afbc

Browse files
pinepainpinepain
committed
Refactor AMQPEnvelope - moving to plain old zend object with props and getters
 * added `AMQPEnvelope::hasHeader(string $name)` method to check whether header exists
1 parent 1f0db56 commit 314afbc

10 files changed

+651
-791
lines changed

‎amqp.c

Lines changed: 3 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@
5858
# include <unistd.h>
5959
#endif
6060

61+
#include "amqp_envelope.h"
62+
6163
/* True global resources - no need for thread safety here */
6264
zend_class_entry *amqp_connection_class_entry;
6365
zend_class_entry *amqp_channel_class_entry;
6466
zend_class_entry *amqp_queue_class_entry;
6567
zend_class_entry *amqp_exchange_class_entry;
66-
zend_class_entry *amqp_envelope_class_entry;
6768

6869
zend_class_entry *amqp_exception_class_entry,
6970
*amqp_connection_exception_class_entry,
@@ -390,66 +391,6 @@ ZEND_END_ARG_INFO()
390391
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
391392
ZEND_END_ARG_INFO()
392393

393-
/* amqp_envelope_class ARG_INFO definition */
394-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
395-
ZEND_END_ARG_INFO()
396-
397-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getBody, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
398-
ZEND_END_ARG_INFO()
399-
400-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getRoutingKey, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
401-
ZEND_END_ARG_INFO()
402-
403-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryTag, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
404-
ZEND_END_ARG_INFO()
405-
406-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryMode, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
407-
ZEND_END_ARG_INFO()
408-
409-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExchangeName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
410-
ZEND_END_ARG_INFO()
411-
412-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_isRedelivery, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
413-
ZEND_END_ARG_INFO()
414-
415-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
416-
ZEND_END_ARG_INFO()
417-
418-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentEncoding, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
419-
ZEND_END_ARG_INFO()
420-
421-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
422-
ZEND_END_ARG_INFO()
423-
424-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
425-
ZEND_END_ARG_INFO()
426-
427-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getPriority, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
428-
ZEND_END_ARG_INFO()
429-
430-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExpiration, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
431-
ZEND_END_ARG_INFO()
432-
433-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getUserId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
434-
ZEND_END_ARG_INFO()
435-
436-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getAppId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
437-
ZEND_END_ARG_INFO()
438-
439-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getMessageId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
440-
ZEND_END_ARG_INFO()
441-
442-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getReplyTo, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
443-
ZEND_END_ARG_INFO()
444-
445-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getCorrelationId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
446-
ZEND_END_ARG_INFO()
447-
448-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeaders, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
449-
ZEND_END_ARG_INFO()
450-
451-
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeader, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
452-
ZEND_END_ARG_INFO()
453394

454395

455396
/* {{{ amqp_functions[]
@@ -592,30 +533,6 @@ zend_function_entry amqp_exchange_class_functions[] = {
592533
{NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
593534
};
594535

595-
zend_function_entry amqp_envelope_class_functions[] = {
596-
PHP_ME(amqp_envelope_class, __construct, arginfo_amqp_envelope_class__construct, ZEND_ACC_PUBLIC)
597-
PHP_ME(amqp_envelope_class, getBody, arginfo_amqp_envelope_class_getBody, ZEND_ACC_PUBLIC)
598-
PHP_ME(amqp_envelope_class, getRoutingKey, arginfo_amqp_envelope_class_getRoutingKey, ZEND_ACC_PUBLIC)
599-
PHP_ME(amqp_envelope_class, getDeliveryTag, arginfo_amqp_envelope_class_getDeliveryTag, ZEND_ACC_PUBLIC)
600-
PHP_ME(amqp_envelope_class, getDeliveryMode, arginfo_amqp_envelope_class_getDeliveryMode, ZEND_ACC_PUBLIC)
601-
PHP_ME(amqp_envelope_class, getExchangeName, arginfo_amqp_envelope_class_getExchangeName, ZEND_ACC_PUBLIC)
602-
PHP_ME(amqp_envelope_class, isRedelivery, arginfo_amqp_envelope_class_isRedelivery, ZEND_ACC_PUBLIC)
603-
PHP_ME(amqp_envelope_class, getContentType, arginfo_amqp_envelope_class_getContentType, ZEND_ACC_PUBLIC)
604-
PHP_ME(amqp_envelope_class, getContentEncoding, arginfo_amqp_envelope_class_getContentEncoding, ZEND_ACC_PUBLIC)
605-
PHP_ME(amqp_envelope_class, getType, arginfo_amqp_envelope_class_getType, ZEND_ACC_PUBLIC)
606-
PHP_ME(amqp_envelope_class, getTimestamp, arginfo_amqp_envelope_class_getTimestamp, ZEND_ACC_PUBLIC)
607-
PHP_ME(amqp_envelope_class, getPriority, arginfo_amqp_envelope_class_getPriority, ZEND_ACC_PUBLIC)
608-
PHP_ME(amqp_envelope_class, getExpiration, arginfo_amqp_envelope_class_getExpiration, ZEND_ACC_PUBLIC)
609-
PHP_ME(amqp_envelope_class, getUserId, arginfo_amqp_envelope_class_getUserId, ZEND_ACC_PUBLIC)
610-
PHP_ME(amqp_envelope_class, getAppId, arginfo_amqp_envelope_class_getAppId, ZEND_ACC_PUBLIC)
611-
PHP_ME(amqp_envelope_class, getMessageId, arginfo_amqp_envelope_class_getMessageId, ZEND_ACC_PUBLIC)
612-
PHP_ME(amqp_envelope_class, getReplyTo, arginfo_amqp_envelope_class_getReplyTo, ZEND_ACC_PUBLIC)
613-
PHP_ME(amqp_envelope_class, getCorrelationId, arginfo_amqp_envelope_class_getCorrelationId, ZEND_ACC_PUBLIC)
614-
PHP_ME(amqp_envelope_class, getHeaders, arginfo_amqp_envelope_class_getHeaders, ZEND_ACC_PUBLIC)
615-
PHP_ME(amqp_envelope_class, getHeader, arginfo_amqp_envelope_class_getHeader, ZEND_ACC_PUBLIC)
616-
617-
{NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
618-
};
619536

620537
zend_function_entry amqp_functions[] = {
621538
{NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
@@ -966,9 +883,7 @@ PHP_MINIT_FUNCTION(amqp)
966883
ce.create_object = amqp_exchange_ctor;
967884
amqp_exchange_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
968885

969-
INIT_CLASS_ENTRY(ce, "AMQPEnvelope", amqp_envelope_class_functions);
970-
ce.create_object = amqp_envelope_ctor;
971-
amqp_envelope_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
886+
PHP_MINIT(amqp_envelope)(INIT_FUNC_ARGS_PASSTHRU);
972887

973888
/* Class Exceptions */
974889
INIT_CLASS_ENTRY(ce, "AMQPException", NULL);

0 commit comments

Comments
 (0)