-#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpClientRequest, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpClientRequest, method, 0)
-#define PHP_HTTP_CLIENT_REQUEST_ME(method, visibility) PHP_ME(HttpClientRequest, method, PHP_HTTP_ARGS(HttpClientRequest, method), visibility)
-#define PHP_HTTP_CLIENT_REQUEST_ALIAS(method, func) PHP_HTTP_STATIC_ME_ALIAS(method, func, PHP_HTTP_ARGS(HttpClientRequest, method))
-#define PHP_HTTP_CLIENT_REQUEST_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpClientRequest_##al), PHP_HTTP_ARGS(HttpClientRequest, al), vis)
-
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
- PHP_HTTP_ARG_VAL(method, 0)
- PHP_HTTP_ARG_VAL(url, 0)
- PHP_HTTP_ARG_ARR(headers, 1, 0)
- PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getContentType);
-PHP_HTTP_BEGIN_ARGS(setContentType, 1)
- PHP_HTTP_ARG_VAL(content_type, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getQuery);
-PHP_HTTP_BEGIN_ARGS(setQuery, 0)
- PHP_HTTP_ARG_VAL(query_data, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(addQuery, 1)
- PHP_HTTP_ARG_VAL(query_data, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getOptions);
-PHP_HTTP_BEGIN_ARGS(setOptions, 0)
- PHP_HTTP_ARG_ARR(options, 1, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getSslOptions);
-PHP_HTTP_BEGIN_ARGS(setSslOptions, 0)
- PHP_HTTP_ARG_ARR(ssl_options, 1, 0)
-PHP_HTTP_END_ARGS;
+void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite);
+void php_http_client_options_set(zval *this_ptr, zval *opts);
+void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value);
+
+#define PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj) \
+ do { \
+ if (!obj->message) { \
+ obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL); \
+ } \
+ } while(0)
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest___construct, 0, 0, 0)
+ ZEND_ARG_INFO(0, method)
+ ZEND_ARG_INFO(0, url)
+ ZEND_ARG_ARRAY_INFO(0, headers, 1)
+ ZEND_ARG_OBJ_INFO(0, body, http\\Message\\Body, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClientRequest, __construct)
+{
+ char *meth_str = NULL;
+ size_t meth_len = 0;
+ zval *zheaders = NULL, *zbody = NULL, *zurl = NULL;
+ php_http_message_object_t *obj;