From: Michael Wallner Date: Wed, 27 Jul 2011 13:54:56 +0000 (+0000) Subject: use userland friendly namespaces X-Git-Tag: DEV_2-before-client~101 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=50546d76a9bf44bba6237df7c8101be125bc929a;p=m6w6%2Fext-http use userland friendly namespaces --- diff --git a/php_http_encoding.c b/php_http_encoding.c index 2580738..a418a21 100644 --- a/php_http_encoding.c +++ b/php_http_encoding.c @@ -1161,7 +1161,7 @@ PHP_METHOD(HttpDechunkStream, decode) PHP_MINIT_FUNCTION(http_encoding) { - PHP_HTTP_REGISTER_CLASS(http\\encoding, Stream, http_encoding_stream, php_http_object_class_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + PHP_HTTP_REGISTER_CLASS(http\\Encoding, Stream, http_encoding_stream, php_http_object_class_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); php_http_encoding_stream_class_entry->create_object = php_http_encoding_stream_object_new; memcpy(&php_http_encoding_stream_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_encoding_stream_object_handlers.clone_obj = php_http_encoding_stream_object_clone; @@ -1170,7 +1170,7 @@ PHP_MINIT_FUNCTION(http_encoding) zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC); zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_FULL"), PHP_HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC); - PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Deflate, http_deflate_stream, php_http_encoding_stream_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Deflate, http_deflate_stream, php_http_encoding_stream_class_entry, 0); zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_GZIP"), PHP_HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC); zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_ZLIB"), PHP_HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC); @@ -1184,8 +1184,8 @@ PHP_MINIT_FUNCTION(http_encoding) zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_RLE"), PHP_HTTP_DEFLATE_STRATEGY_RLE TSRMLS_CC); zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FIXED"), PHP_HTTP_DEFLATE_STRATEGY_FIXED TSRMLS_CC); - PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Inflate, http_inflate_stream, php_http_encoding_stream_class_entry, 0); - PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Dechunk, http_dechunk_stream, php_http_encoding_stream_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Inflate, http_inflate_stream, php_http_encoding_stream_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Dechunk, http_dechunk_stream, php_http_encoding_stream_class_entry, 0); return SUCCESS; } diff --git a/php_http_env.c b/php_http_env.c index 4b9ea88..0421505 100644 --- a/php_http_env.c +++ b/php_http_env.c @@ -928,7 +928,7 @@ PHP_MINIT_FUNCTION(http_env) zend_declare_class_constant_long(php_http_env_class_entry, ZEND_STRL("PARAMS_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC); zend_declare_class_constant_long(php_http_env_class_entry, ZEND_STRL("PARAMS_COLON_SEPARATOR"), PHP_HTTP_PARAMS_COLON_SEPARATOR TSRMLS_CC); - PHP_HTTP_REGISTER_CLASS(http\\env, Request, http_env_request, php_http_message_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_class_entry, 0); return SUCCESS; } diff --git a/php_http_env_response.c b/php_http_env_response.c index 2f14755..e30cab9 100644 --- a/php_http_env_response.c +++ b/php_http_env_response.c @@ -893,7 +893,7 @@ PHP_METHOD(HttpEnvResponse, send) PHP_MINIT_FUNCTION(http_env_response) { - PHP_HTTP_REGISTER_CLASS(http\\env, Response, http_env_response, php_http_message_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Env, Response, http_env_response, php_http_message_class_entry, 0); zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_NONE"), PHP_HTTP_CONTENT_DISPOSITION_NONE TSRMLS_CC); zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_INLINE"), PHP_HTTP_CONTENT_DISPOSITION_INLINE TSRMLS_CC); diff --git a/php_http_message_body.c b/php_http_message_body.c index ad92a17..5e47a6a 100644 --- a/php_http_message_body.c +++ b/php_http_message_body.c @@ -435,7 +435,7 @@ static zend_object_handlers php_http_message_body_object_handlers; PHP_MINIT_FUNCTION(http_message_body) { - PHP_HTTP_REGISTER_CLASS(http\\message, Body, http_message_body, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Message, Body, http_message_body, php_http_object_class_entry, 0); php_http_message_body_class_entry->create_object = php_http_message_body_object_new; memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; diff --git a/php_http_property_proxy.c b/php_http_property_proxy.c index 3262205..44ccd2c 100644 --- a/php_http_property_proxy.c +++ b/php_http_property_proxy.c @@ -175,7 +175,7 @@ PHP_METHOD(HttpPropertyProxy, __construct) PHP_MINIT_FUNCTION(http_property_proxy) { - PHP_HTTP_REGISTER_CLASS(http\\object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL); + PHP_HTTP_REGISTER_CLASS(http\\Object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL); php_http_property_proxy_class_entry->create_object = php_http_property_proxy_object_new; memcpy(&php_http_property_proxy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_property_proxy_object_handlers.set = php_http_property_proxy_object_set; diff --git a/php_http_request.c b/php_http_request.c index b0df031..56d6033 100644 --- 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) diff --git a/php_http_request_datashare.c b/php_http_request_datashare.c index dec1ffa..d6cbaa7 100644 --- a/php_http_request_datashare.c +++ b/php_http_request_datashare.c @@ -346,7 +346,7 @@ PHP_METHOD(HttpRequestDataShare, reset) PHP_MINIT_FUNCTION(http_request_datashare) { - PHP_HTTP_REGISTER_CLASS(http\\request, DataShare, http_request_datashare, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, DataShare, http_request_datashare, php_http_object_class_entry, 0); php_http_request_datashare_class_entry->create_object = php_http_request_datashare_object_new; memcpy(&php_http_request_datashare_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_datashare_object_handlers.clone_obj = NULL; diff --git a/php_http_request_factory.c b/php_http_request_factory.c index 1e61e59..32574f9 100644 --- a/php_http_request_factory.c +++ b/php_http_request_factory.c @@ -382,7 +382,7 @@ PHP_MINIT_FUNCTION(http_request_factory) { zend_hash_init(&php_http_request_factory_drivers, 0, NULL, NULL, 1); - PHP_HTTP_REGISTER_CLASS(http\\request, Factory, http_request_factory, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, Factory, http_request_factory, php_http_object_class_entry, 0); php_http_request_factory_class_entry->create_object = php_http_request_factory_new; zend_declare_property_stringl(php_http_request_factory_class_entry, ZEND_STRL("driver"), ZEND_STRL("curl"), ZEND_ACC_PROTECTED TSRMLS_CC); diff --git a/php_http_request_method.c b/php_http_request_method.c index 3ca0b55..43157c6 100644 --- a/php_http_request_method.c +++ b/php_http_request_method.c @@ -204,7 +204,7 @@ PHP_MINIT_FUNCTION(http_request_method) { php_http_strlist_iterator_t std; - PHP_HTTP_REGISTER_CLASS(http\\request, Method, http_request_method, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, Method, http_request_method, php_http_object_class_entry, 0); zend_declare_property_null(php_http_request_method_class_entry, ZEND_STRL("name"), ZEND_ACC_PROTECTED TSRMLS_CC); diff --git a/php_http_request_pool.c b/php_http_request_pool.c index 96a3a1a..7e3e1b8 100644 --- a/php_http_request_pool.c +++ b/php_http_request_pool.c @@ -554,7 +554,7 @@ PHP_METHOD(HttpRequestPool, enableEvents) PHP_MINIT_FUNCTION(http_request_pool) { - PHP_HTTP_REGISTER_CLASS(http\\request, Pool, http_request_pool, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, Pool, http_request_pool, php_http_object_class_entry, 0); php_http_request_pool_class_entry->create_object = php_http_request_pool_object_new; memcpy(&php_http_request_pool_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_pool_object_handlers.clone_obj = NULL;