remove FluentlyCallable interface

[m6w6/ext-http] / php_http_request.c

diff --git a/php_http_request.c b/php_http_request.c
index 08128282a2f30b98d81616fe9fa522d8fd347e3c..d3ac782c793202830bdd8c7e7caec7c0aae08054 100644 (file)
--- a/php_http_request.c
+++ b/php_http_request.c
@@ -188,11 +188,11 @@ PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(getBody);
 PHP_HTTP_BEGIN_ARGS(setBody, 0)
-       PHP_HTTP_ARG_OBJ(http\\message\\Body, body, 0)
+       PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(addBody, 1)
-       PHP_HTTP_ARG_OBJ(http\\message\\Body, body, 0)
+       PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(getResponseCookies, 0)
@@ -978,7 +978,7 @@ PHP_METHOD(HttpRequest, setQueryData)
                        char *query_data_str = NULL;
                        size_t query_data_len;
 
-                       if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), 0, NULL, 0, &query_data_str, &query_data_len TSRMLS_CC)) {
+                       if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), NULL, 0, &query_data_str, &query_data_len TSRMLS_CC)) {
                                zend_update_property_stringl(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), query_data_str, query_data_len TSRMLS_CC);
                                efree(query_data_str);
                        }
@@ -1009,7 +1009,7 @@ PHP_METHOD(HttpRequest, addQueryData)
                size_t query_data_len = 0;
                zval *old_qdata = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), 0 TSRMLS_CC);
 
-               if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data_str, &query_data_len TSRMLS_CC)) {
+               if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data_str, &query_data_len TSRMLS_CC)) {
                        zend_update_property_stringl(php_http_request_class_entry, getThis(), ZEND_STRL("queryData"), query_data_str, query_data_len TSRMLS_CC);
                        efree(query_data_str);
                }
@@ -1289,7 +1289,7 @@ PHP_MINIT_FUNCTION(http_request)
        memcpy(&php_http_request_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        php_http_request_object_handlers.clone_obj = php_http_request_object_clone;
 
-       zend_class_implements(php_http_request_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_fluently_callable_class_entry);
+       zend_class_implements(php_http_request_class_entry TSRMLS_CC, 1, spl_ce_SplSubject);
 
        zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC);
        zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PRIVATE TSRMLS_CC);