use userland friendly namespaces

diff --git a/php_http_encoding.c b/php_http_encoding.c
index 2580738baba61ee2780727f1306c5fbb0042e08e..a418a21b1ef6069ade6823ebdbdb7c9436a1422d 100644 (file)
--- a/php_http_encoding.c
+++ b/php_http_encoding.c
@@ -1161,7 +1161,7 @@ PHP_METHOD(HttpDechunkStream, decode)
 
 PHP_MINIT_FUNCTION(http_encoding)
 {
 
 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;
        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);
 
        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);
 
        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);
 
        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;
 }
 
        return SUCCESS;
 }

diff --git a/php_http_env.c b/php_http_env.c
index 4b9ea88313c701fea0c765544dbc9c6f376ea0b6..042150517633508097f23bf11a63083bc11e02ed 100644 (file)
--- 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);
 
        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;
 }
 
        return SUCCESS;
 }

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 2f147554dc1d988e3d2b13deaaff2745dca024f7..e30cab955b9df80016b5d1f2f7a8b54ab1bdafd3 100644 (file)
--- 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_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);
 
        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 ad92a1747efe5dd5cfd6fe25a37bd1bf76445555..5e47a6a2c4134669e96f9cc4f52aabdb39508819 100644 (file)
--- 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_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;
        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 3262205c62c9024f58270d98f83dcba0c4c75a7c..44ccd2cdf1665c0d0405a0a0c79ae9e6dd61cd77 100644 (file)
--- 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_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;
        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 b0df03146b1e663eb9f19959df34f39faa51a92c..56d6033f5471410893363ca8caa64f08fa9f3656 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_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_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)
 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 dec1ffa251faa7c328f38a7459bff307f7d15112..d6cbaa7e1c13568deb52a2fdb00e52adce24f65e 100644 (file)
--- 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_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;
        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 1e61e5915138fba2bb2003d32f0b9b2f76e4c965..32574f9c896dc139a43ca3706a9885ec3f5ea8df 100644 (file)
--- 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);
 
 {
        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);
        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 3ca0b5548cc9813383b87d9bb6ebe36f38eb122d..43157c67cf76c3d441f4d5711c2618db037c9ffd 100644 (file)
--- 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_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);
 
 
        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 96a3a1a0190cad71aeac8922d413ea9a51113764..7e3e1b802942d80e7f7cf25bc83cef4f4e7a4928 100644 (file)
--- 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_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;
        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;