Skip to content

Implemented FR #45235 implement error_clear_last() function #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2015
Merged

Implemented FR #45235 implement error_clear_last() function #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
908542c
Implemented FR #45235 A way to clear or reset the results for error_g…
reeze Mar 3, 2015
c6cebca
Use zend_parse_parameters_none()
reeze Mar 3, 2015
916709c
Return void like other functions
reeze Mar 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,9 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_get_last, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_error_clear_last, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func, 0, 0, 1)
ZEND_ARG_INFO(0, function_name)
ZEND_ARG_VARIADIC_INFO(0, parameters)
Expand Down Expand Up @@ -2942,6 +2945,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */

PHP_FE(error_log, arginfo_error_log)
PHP_FE(error_get_last, arginfo_error_get_last)
PHP_FE(error_clear_last, arginfo_error_clear_last)
PHP_FE(call_user_func, arginfo_call_user_func)
PHP_FE(call_user_func_array, arginfo_call_user_func_array)
PHP_FE(forward_static_call, arginfo_forward_static_call)
Expand Down Expand Up @@ -4686,7 +4690,7 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha
Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet. */
PHP_FUNCTION(error_get_last)
{
if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
if (zend_parse_parameters_none() == FAILURE) {
return;
}

Expand All @@ -4700,6 +4704,29 @@ PHP_FUNCTION(error_get_last)
}
/* }}} */

/* {{{ proto void error_clear_last(void)
Clear the last occurred error. */
PHP_FUNCTION(error_clear_last)
{
if (zend_parse_parameters_none() == FAILURE) {
return;
}

if (PG(last_error_message)) {
PG(last_error_type) = 0;
PG(last_error_lineno) = 0;

free(PG(last_error_message));
PG(last_error_message) = NULL;

if (PG(last_error_file)) {
free(PG(last_error_file));
PG(last_error_file) = NULL;
}
}
}
/* }}} */

/* {{{ proto mixed call_user_func(mixed function_name [, mixed parmeter] [, mixed ...])
Call a user function which is the first parameter
Warning: This function is special-cased by zend_compile.c and so is usually bypassed */
Expand Down
1 change: 1 addition & 0 deletions ext/standard/basic_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ PHP_FUNCTION(get_magic_quotes_gpc);

PHP_FUNCTION(error_log);
PHP_FUNCTION(error_get_last);
PHP_FUNCTION(error_clear_last);

PHP_FUNCTION(call_user_func);
PHP_FUNCTION(call_user_func_array);
Expand Down
32 changes: 32 additions & 0 deletions ext/standard/tests/general_functions/error_clear_last.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
error_clear_last() tests
--FILE--
<?php

var_dump(error_get_last());
error_clear_last();
var_dump(error_get_last());

@$a = $b;

var_dump(error_get_last());
error_clear_last();
var_dump(error_get_last());

echo "Done\n";
?>
--EXPECTF--
NULL
NULL
array(4) {
["type"]=>
int(8)
["message"]=>
string(21) "Undefined variable: b"
["file"]=>
string(%d) "%s"
["line"]=>
int(%d)
}
NULL
Done