diff options
| author | Sara Golemon <pollita@php.net> | 2010-05-12 16:42:48 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2010-05-12 16:42:48 +0000 |
| commit | 1fd85e29de59ca787dd12394f596ab45878f14ea (patch) | |
| tree | 82ae3b337ae39861cf6e006fdf2098685052e035 /ext/json/json.c | |
| parent | 214d3bc24804adc26238565298b68f4571c3790b (diff) | |
| download | php-git-1fd85e29de59ca787dd12394f596ab45878f14ea.tar.gz | |
Rename JSON_Serializable to JsonSerializable per ML discussion
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index f40d15d1a1..069ad3d21a 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -76,13 +76,13 @@ static const zend_function_entry json_functions[] = { }; /* }}} */ -/* {{{ JSON_Serializable methods */ +/* {{{ JsonSerializable methods */ ZEND_BEGIN_ARG_INFO(json_serialize_arginfo, 0) /* No arguments */ ZEND_END_ARG_INFO(); static const zend_function_entry json_serializable_interface[] = { - PHP_ABSTRACT_ME(JSON_Serializable, jsonSerialize, json_serialize_arginfo) + PHP_ABSTRACT_ME(JsonSerializable, jsonSerialize, json_serialize_arginfo) { NULL, NULL, NULL } }; @@ -91,9 +91,8 @@ static PHP_MINIT_FUNCTION(json) { zend_class_entry ce; - INIT_CLASS_ENTRY(ce, "JSON_Serializable", json_serializable_interface); + INIT_CLASS_ENTRY(ce, "JsonSerializable", json_serializable_interface); php_json_serializable_ce = zend_register_internal_interface(&ce TSRMLS_CC); - /* Note: Consider adding: interface JSON\Serializable extends JSON_Serializable {} for futureproofing... */ REGISTER_LONG_CONSTANT("JSON_HEX_TAG", PHP_JSON_HEX_TAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_HEX_AMP", PHP_JSON_HEX_AMP, CONST_CS | CONST_PERSISTENT); |