From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jul 2012 15:35:06 +0000 (+0800)
Subject: Fix test failed due to new feature introduced in 45d596ea
X-Git-Tag: php-5.5.0alpha1~20^2~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8559194db82a231bbed547bd15f077e343914e4;p=php

Fix test failed due to new feature introduced in 45d596ea
---

diff --git a/ext/json/json.c b/ext/json/json.c
index dab423084c..e4bb8a5d4b 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 d130dd960c..547c8bef17 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===