X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=e43750949746d7bfe0bc92e0adc3f5435a5c6ae5;hp=c26a2f196a3c595d8e238ad9b8dd3e826871ca67;hb=020d5b055921392c0dfb25043962a40867d8b033;hpb=4f8c51464143f79fd4367c386e5108361ce83a42

diff --git a/http_message_object.c b/http_message_object.c
index c26a2f1..e437509 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -19,16 +19,69 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
 
+#ifdef ZEND_ENGINE_2
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_message_object.h"
 
 #include "phpstr/phpstr.h"
 
-#ifdef ZEND_ENGINE_2
+#define HTTP_BEGIN_ARGS(method, req_args) 		HTTP_BEGIN_ARGS_EX(HttpMessage, method, ZEND_RETURN_REFERENCE_AGNOSTIC, req_args)
+#define HTTP_EMPTY_ARGS(method, ret_ref)		HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref)
+#define HTTP_MESSAGE_ME(method, visibility)		PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility)
+
+HTTP_BEGIN_ARGS(__construct, 0)
+	HTTP_ARG_VAL(message, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(fromString, 1)
+	HTTP_ARG_VAL(message, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getBody, 0);
+HTTP_EMPTY_ARGS(getHeaders, 0);
+HTTP_BEGIN_ARGS(setHeaders, 1)
+	HTTP_ARG_VAL(headers, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addHeaders, 1)
+	HTTP_ARG_VAL(headers, 0)
+	HTTP_ARG_VAL(append, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getType, 0);
+HTTP_BEGIN_ARGS(setType, 1)
+	HTTP_ARG_VAL(type, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseCode, 0);
+HTTP_BEGIN_ARGS(setResponseCode, 1)
+	HTTP_ARG_VAL(response_code, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getRequestMethod, 0);
+HTTP_BEGIN_ARGS(setRequestMethod, 1)
+	HTTP_ARG_VAL(request_method, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getRequestUri, 0);
+HTTP_BEGIN_ARGS(setRequestUri, 1)
+	HTTP_ARG_VAL(uri, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getHttpVersion, 0);
+HTTP_BEGIN_ARGS(setHttpVersion, 1)
+	HTTP_ARG_VAL(http_version, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getParentMessage, 1);
+HTTP_EMPTY_ARGS(send, 0);
+HTTP_BEGIN_ARGS(toString, 0)
+	HTTP_ARG_VAL(include_parent, 0)
+HTTP_END_ARGS;
 
 #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C)
 static inline void _http_message_object_declare_default_properties(TSRMLS_D);
@@ -43,28 +96,28 @@ static inline zend_object_value _http_message_object_clone_obj(zval *object TSRM
 
 zend_class_entry *http_message_object_ce;
 zend_function_entry http_message_object_fe[] = {
-	PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setHeaders, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, addHeaders, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getType, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setType, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getResponseCode, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setResponseCode, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getRequestMethod, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setRequestMethod, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getRequestUri, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setRequestUri, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getHttpVersion, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, setHttpVersion, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, getParentMessage, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, send, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC)
-
-	ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HttpMessage, fromString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getType, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getRequestUri, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setRequestUri, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
+
+	ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
+
+	HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	{NULL, NULL, NULL}
 };
 static zend_object_handlers http_message_object_handlers;