Skip to content

Commit a6bc811

Browse files
committed
Address review comments
1 parent 7be77a9 commit a6bc811

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Zend/zend_builtin_functions.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,12 +1621,13 @@ ZEND_FUNCTION(get_defined_functions)
16211621
ZEND_FUNCTION(get_defined_vars)
16221622
{
16231623
zend_array *symbol_table;
1624+
1625+
ZEND_PARSE_PARAMETERS_NONE();
1626+
16241627
if (zend_forbid_dynamic_call("get_defined_vars()") == FAILURE) {
16251628
return;
16261629
}
16271630

1628-
ZEND_PARSE_PARAMETERS_NONE();
1629-
16301631
symbol_table = zend_rebuild_symbol_table();
16311632
if (UNEXPECTED(symbol_table == NULL)) {
16321633
return;

ext/mysqli/tests/mysqli_report.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,6 @@ require_once('skipifconnectfailure.inc');
267267
!mysqli_query($link, 'DELETE FROM test WHERE id > 50', MYSQLI_USE_RESULT))
268268
printf("[033] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
269269

270-
try {
271-
mysqli_thread_safe($link);
272-
} catch (ArgumentCountError $exception) {
273-
print($exception->getMessage() . "\n");
274-
}
275-
276270
$tmp = mysqli_thread_id($link);
277271

278272
mysqli_close($link);
@@ -298,5 +292,4 @@ Warning: mysqli_kill(): processid should have positive value in %s on line %d
298292
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
299293
[013] Access denied for user '%s'@'%s' (using password: YES)
300294
[016] Access denied for user '%s'@'%s' (using password: YES)
301-
mysqli_thread_safe() expects exactly 0 parameters, 1 given
302295
done!

0 commit comments

Comments
 (0)