clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename JSON_Serializable to JsonSerializable per ML discussion

Browse Source
This commit is contained in:
Sara Golemon 2010-05-12 16:42:48 +00:00
parent 214d3bc248
commit 1fd85e29de
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -30,7 +30,7 @@
- Added command line option --rz to CLI. (Johannes)
- Added closure $this support back. (Stas)
- Added SplObjectStorage::getHash() hook. (Etienne)
- Added JSON_Serializable interface (Sara)
- Added JsonSerializable interface (Sara)
- Added support for storing upload progress feedback in session data. (Arnaud)
- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)

7
ext/json/json.c
View File

@ -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);

2
ext/json/tests/serialize.phpt
View File

@ -15,7 +15,7 @@ class NonSerializingTest
}
}
class SerializingTest extends NonSerializingTest implements JSON_Serializable
class SerializingTest extends NonSerializingTest implements JsonSerializable
{
public function jsonSerialize()
{