Commit: f8559194db82a231bbed547bd15f077e343914e4 Author: Xinchen Hui <larue...@php.net> Sun, 29 Jul 2012 23:35:06 +0800 Parents: 9c73c8d58d9948e6a38f8053c4a6da1dcbd2ac94 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8559194db82a231bbed547bd15f077e343914e4 Log: Fix test failed due to new feature introduced in 45d596ea Changed paths: M ext/json/json.c M ext/json/tests/json_encode_error.phpt Diff: diff --git a/ext/json/json.c b/ext/json/json.c index dab4230..e4bb8a5 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -700,7 +700,7 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len, /* }}} */ -/* {{{ proto string json_encode(mixed data [, int options]) +/* {{{ proto string json_encode(mixed data [, int options[, int depth]]) Returns the JSON representation of a value */ static PHP_FUNCTION(json_encode) { diff --git a/ext/json/tests/json_encode_error.phpt b/ext/json/tests/json_encode_error.phpt index d130dd9..547c8be 100644 --- a/ext/json/tests/json_encode_error.phpt +++ b/ext/json/tests/json_encode_error.phpt @@ -34,7 +34,5 @@ Warning: json_encode() expects at least 1 parameter, 0 given in %s on line %d NULL -- Testing json_encode() function with more than expected no. of arguments -- - -Warning: json_encode() expects at most 2 parameters, 3 given in %s on line %d -NULL +string(5) ""abc"" ===Done=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
