pollita Wed, 12 May 2010 16:42:48 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299298
Log:
Rename JSON_Serializable to JsonSerializable per ML discussion
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/json/json.c
U php/php-src/trunk/ext/json/tests/serialize.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-05-12 16:38:05 UTC (rev 299297)
+++ php/php-src/trunk/NEWS 2010-05-12 16:42:48 UTC (rev 299298)
@@ -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)
Modified: php/php-src/trunk/ext/json/json.c
===================================================================
--- php/php-src/trunk/ext/json/json.c 2010-05-12 16:38:05 UTC (rev 299297)
+++ php/php-src/trunk/ext/json/json.c 2010-05-12 16:42:48 UTC (rev 299298)
@@ -76,13 +76,13 @@
};
/* }}} */
-/* {{{ 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 @@
{
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);
Modified: php/php-src/trunk/ext/json/tests/serialize.phpt
===================================================================
--- php/php-src/trunk/ext/json/tests/serialize.phpt 2010-05-12 16:38:05 UTC
(rev 299297)
+++ php/php-src/trunk/ext/json/tests/serialize.phpt 2010-05-12 16:42:48 UTC
(rev 299298)
@@ -15,7 +15,7 @@
}
}
-class SerializingTest extends NonSerializingTest implements JSON_Serializable
+class SerializingTest extends NonSerializingTest implements JsonSerializable
{
public function jsonSerialize()
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
