From 974324676b2436f159f42d9241c569f813471684 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 28 Jun 2012 20:09:47 +0200 Subject: Add json_last_error_msg() function This replaces json_last_error(true) and is consistent with other custom error handling functions. --- ext/json/json.c | 29 +++++++++++++++++++---------- ext/json/tests/003.phpt | 6 ++---- ext/json/tests/004.phpt | 6 ++---- ext/json/tests/007.phpt | 16 ++++++++++------ ext/json/tests/bug54058.phpt | 12 ++++-------- ext/json/tests/bug61537.phpt | 8 ++++---- ext/json/tests/inf_nan_error.phpt | 10 ++++++---- ext/json/tests/unsupported_type_error.phpt | 6 ++++-- 8 files changed, 51 insertions(+), 42 deletions(-) diff --git a/ext/json/json.c b/ext/json/json.c index 5e0351f3f1..4d29a66688 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -34,6 +34,7 @@ static PHP_MINFO_FUNCTION(json); static PHP_FUNCTION(json_encode); static PHP_FUNCTION(json_decode); static PHP_FUNCTION(json_last_error); +static PHP_FUNCTION(json_last_error_msg); static const char digits[] = "0123456789abcdef"; @@ -51,8 +52,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1) ZEND_ARG_INFO(0, depth) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_json_last_error, 0, 0, 0) - ZEND_ARG_INFO(0, as_string) +ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_json_last_error_msg, 0) ZEND_END_ARG_INFO() /* }}} */ @@ -61,6 +64,7 @@ static const function_entry json_functions[] = { PHP_FE(json_encode, arginfo_json_encode) PHP_FE(json_decode, arginfo_json_decode) PHP_FE(json_last_error, arginfo_json_last_error) + PHP_FE(json_last_error_msg, arginfo_json_last_error_msg) PHP_FE_END }; /* }}} */ @@ -607,21 +611,25 @@ static PHP_FUNCTION(json_decode) /* }}} */ /* {{{ proto int json_last_error() - Returns the error code of the last json_decode(). */ + Returns the error code of the last json_encode() or json_decode() call. */ static PHP_FUNCTION(json_last_error) { - zend_bool as_string = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &as_string) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { return; } - /* return error code (JSON_ERROR_* constants) */ - if (!as_string) { - RETURN_LONG(JSON_G(error_code)); + RETURN_LONG(JSON_G(error_code)); +} +/* }}} */ + +/* {{{ proto string json_last_error_msg() + Returns the error string of the last json_encode() or json_decode() call. */ +static PHP_FUNCTION(json_last_error_msg) +{ + if (zend_parse_parameters_none() == FAILURE) { + return; } - /* return error message (for debugging purposes) */ switch(JSON_G(error_code)) { case PHP_JSON_ERROR_NONE: RETURN_STRING("No error", 1); @@ -644,6 +652,7 @@ static PHP_FUNCTION(json_last_error) default: RETURN_STRING("Unknown error", 1); } + } /* }}} */ diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt index 71874525a7..4ce5b0fde9 100644 --- a/ext/json/tests/003.phpt +++ b/ext/json/tests/003.phpt @@ -13,14 +13,12 @@ var_dump($a); echo "\n"; var_dump(json_encode($a)); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); echo "\n"; var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR)); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); echo "Done\n"; ?> diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt index 49c543edca..70ef3ffd1b 100644 --- a/ext/json/tests/004.phpt +++ b/ext/json/tests/004.phpt @@ -13,14 +13,12 @@ var_dump($a); echo "\n"; var_dump(json_encode($a)); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); echo "\n"; var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR)); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); echo "Done\n"; ?> diff --git a/ext/json/tests/007.phpt b/ext/json/tests/007.phpt index 9ee190a24c..7557ac9ed7 100644 --- a/ext/json/tests/007.phpt +++ b/ext/json/tests/007.phpt @@ -5,15 +5,15 @@ json_last_error() tests --FILE-- foo = quoted_printable_decode('=B0'); json_encode($a); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); $b = new stdclass; $b->foo = $bad_utf8; $b->bar = 1; json_encode($b); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); $c = array( 'foo' => $bad_utf8, 'bar' => 1 ); json_encode($c); -var_dump(json_last_error()); -var_dump(json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); ?> --EXPECTF-- diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt index f6bb02bae4..80ed051c9a 100644 --- a/ext/json/tests/bug61537.phpt +++ b/ext/json/tests/bug61537.phpt @@ -7,20 +7,20 @@ Bug #61537 (json_encode() incorrectly truncates/discards information) $invalid_utf8 = "\x9f"; var_dump(json_encode($invalid_utf8)); -var_dump(json_last_error(), json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR)); -var_dump(json_last_error(), json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); echo "\n"; $invalid_utf8 = "an invalid sequen\xce in the middle of a string"; var_dump(json_encode($invalid_utf8)); -var_dump(json_last_error(), json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR)); -var_dump(json_last_error(), json_last_error(true)); +var_dump(json_last_error(), json_last_error_msg()); ?> --EXPECTF-- diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt index f12e902d9f..f9deecc469 100644 --- a/ext/json/tests/inf_nan_error.phpt +++ b/ext/json/tests/inf_nan_error.phpt @@ -1,5 +1,7 @@ --TEST-- An error is thrown when INF or NaN are encoded +--SKIPIF-- + --FILE-- --EXPECTF-- float(INF) diff --git a/ext/json/tests/unsupported_type_error.phpt b/ext/json/tests/unsupported_type_error.phpt index f36afb44a5..45a167a5ac 100644 --- a/ext/json/tests/unsupported_type_error.phpt +++ b/ext/json/tests/unsupported_type_error.phpt @@ -1,5 +1,7 @@ --TEST-- An error is thrown when an unsupported type is encoded +--SKIPIF-- + --FILE-- --EXPECTF-- -- cgit v1.2.1