- Rename stream_register_filter() to stream_filter_register(),

  stream_register_wrapper() to stream_wrapper_register() and added an alias for
  the latter change.

diff --git a/NEWS b/NEWS
index 0f605ea73cbbc7a8a93ef26587cacf40763dcb6c..d01c6962967f7c4ee465a0b28808623ffc35bc52 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ? ? ??? 200?, Version 5.0.0
 - Moved extensions to PECL (http://pear.php.net/): (James, Tal)
   . ext/fribidi
+- Renamed stream_register_wrapper() to stream_wrapper_register(). (Derick)
 - Fixed dirname() and strip_tags() to be binary-safe. (Moriyoshi)
 - Fixed bug #22386 (Using browscap causes segfault). (Jay)
 - Fixed bug #22895 (PHP cli outputs errors in text AND html). (Marcus)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b658f4f98faaa90eb10887fffc6a2e6ed5cb594d..ed069b04a2b2b7b23a6fc178fdc7e388b567971b 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -699,7 +699,8 @@ function_entry basic_functions[] = {
 
        PHP_FE(stream_get_meta_data,                                                                                    NULL)
        PHP_FE(stream_get_line,                                                                                         NULL)
-       PHP_FE(stream_register_wrapper,                                                                                 NULL)
+       PHP_FE(stream_wrapper_register,                                                                                 NULL)
+       PHP_FALIAS(stream_register_wrapper, stream_wrapper_register,                    NULL)
        PHP_FE(stream_get_wrappers,                                                                                             NULL)
        PHP_FE(stream_get_transports,                                                                                   NULL)
        PHP_FE(get_headers,                                                                                                     NULL)
@@ -897,7 +898,7 @@ function_entry basic_functions[] = {
 
        PHP_FE(str_rot13, NULL)
        PHP_FE(stream_get_filters, NULL)
-       PHP_FE(stream_register_filter, NULL)
+       PHP_FE(stream_filter_register, NULL)
        PHP_FE(stream_bucket_make_writeable,            NULL)
        PHP_FE(stream_bucket_prepend,                           NULL)
        PHP_FE(stream_bucket_append,                            NULL)

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 037420c703a97f3467598e4f393edd1ce2b376ed..1413171635ebc685e4efa3e7bf8e9b088abc2e81 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -108,7 +108,7 @@ PHP_FUNCTION(parse_ini_file);
 
 PHP_FUNCTION(str_rot13);
 PHP_FUNCTION(stream_get_filters);
-PHP_FUNCTION(stream_register_filter);
+PHP_FUNCTION(stream_filter_register);
 PHP_FUNCTION(stream_bucket_make_writeable);
 PHP_FUNCTION(stream_bucket_prepend);
 PHP_FUNCTION(stream_bucket_append);

diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h
index 95c1271d973e72ea363cc03459fbd4c60b4906b8..dd759f373aa89c26e2704a85ea528e0c2ebfa226 100644 (file)
--- a/ext/standard/streamsfuncs.h
+++ b/ext/standard/streamsfuncs.h
@@ -38,7 +38,7 @@ PHP_FUNCTION(stream_get_transports);
 PHP_FUNCTION(stream_get_wrappers);
 PHP_FUNCTION(stream_get_line);
 PHP_FUNCTION(stream_get_meta_data);
-PHP_FUNCTION(stream_register_wrapper);
+PHP_FUNCTION(stream_wrapper_register);
 PHP_FUNCTION(stream_context_create);
 PHP_FUNCTION(stream_context_set_params);
 PHP_FUNCTION(stream_context_set_option);

diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt
index 4043f85f8985afe3d155bd53f20309bdf4b76a94..89886559d1000c75e7c564684dc5234e0a25472d 100644 (file)
--- a/ext/standard/tests/file/fopencookie.phpt
+++ b/ext/standard/tests/file/fopencookie.phpt
@@ -77,7 +77,7 @@ class userstream {
 
 }
 
-stream_register_wrapper("cookietest", "userstream");
+stream_wrapper_register("cookietest", "userstream");
 
 include("cookietest://foo");
 

diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt
index 72930ee65a468c31e9c9d78114b93ab3ca2f4d17..dfa8376fffc682bf24b8bdc38c4ff4fd784f529d 100644 (file)
--- a/ext/standard/tests/file/userfilters.phpt
+++ b/ext/standard/tests/file/userfilters.phpt
@@ -18,7 +18,7 @@ class testfilter extends php_user_filter {
   }
 }
 
-stream_register_filter('testfilter','testfilter');
+stream_filter_register('testfilter','testfilter');
 
 $text = "Hello There!";
 

diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index efc2880f9a68e8e66cbb9d2b922eb744e5738d0e..1606d89f068b2d66df3fa90d729eefecb12c1161 100644 (file)
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -157,17 +157,17 @@ class mystream
 
 }
 
-if (@stream_register_wrapper("bogus", "class_not_exist")) {
+if (@stream_wrapper_register("bogus", "class_not_exist")) {
        die("Registered a non-existant class!!!???");
 }
 echo "Not Registered\n";
 
-if (!stream_register_wrapper("test", "mystream")) {
+if (!stream_wrapper_register("test", "mystream")) {
        die("test wrapper registration failed");
 }
 echo "Registered\n";
 
-if (!stream_register_wrapper("bogon", "uselessstream")) {
+if (!stream_wrapper_register("bogon", "uselessstream")) {
        die("bogon wrapper registration failed");
 }
 echo "Registered\n";

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 55b7da551e9c04e08de80446c7990b505df84093..262721d407576f1c0f5874572245e2dd14a1cbf4 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -469,9 +469,9 @@ PHP_FUNCTION(stream_get_filters)
 }
 /* }}} */      
 
-/* {{{ proto bool stream_register_filter(string filtername, string classname)
+/* {{{ proto bool stream_filter_register(string filtername, string classname)
    Registers a custom filter handler class */
-PHP_FUNCTION(stream_register_filter)
+PHP_FUNCTION(stream_filter_register)
 {
        char *filtername, *classname;
        int filtername_len, classname_len;

diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 564f30d20b9a23aa7d66447727b776acf7407240..fadd9f34f596c4c7e7423911e450c81dad2958bf 100644 (file)
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -342,9 +342,9 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, char *filen
 }
 
 
-/* {{{ proto bool stream_register_wrapper(string protocol, string classname)
+/* {{{ proto bool stream_wrapper_register(string protocol, string classname)
    Registers a custom URL protocol handler class */
-PHP_FUNCTION(stream_register_wrapper)
+PHP_FUNCTION(stream_wrapper_register)
 {
        char *protocol, *classname;
        int protocol_len, classname_len;