Skip to content

Commit 8a477d3

Browse files
jorgsowajorgsowa
committed
Zend: drop redundant () from function/method name suggestions
"(did you mean strlen()?)" reads oddly since the () is already part of the call syntax right before it. Use "(did you mean strlen?)" instead, matching the class suggestion format which never had parens.
1 parent 96bd85d commit 8a477d3

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎Zend/tests/bug69315.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ try {
4343
bool(false)
4444
bool(false)
4545
Call to undefined function strlen()
46-
Call to undefined function defined() (did you mean define()?)
46+
Call to undefined function defined() (did you mean define?)
4747
Call to undefined function constant()
4848
Call to undefined function call_user_func()
4949
Call to undefined function is_string()

‎Zend/tests/first_class_callable/constexpr/error_unknown_function_suggestion.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var_dump(Closure);
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Uncaught Error: Call to undefined function strlenn() (did you mean strlen()?) in %s:%d
12+
Fatal error: Uncaught Error: Call to undefined function strlenn() (did you mean strlen?) in %s:%d
1313
Stack trace:
1414
#0 {main}
1515
thrown in %s on line %d

‎Zend/tests/first_class_callable/constexpr/error_unknown_function_suggestion_default_arg.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ try {
1515

1616
?>
1717
--EXPECT--
18-
Call to undefined function array_pussh() (did you mean array_push()?)
18+
Call to undefined function array_pussh() (did you mean array_push?)

‎Zend/tests/levenshtein_suggest_function.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ $f = "strlenx";
1919
try { $f("x"); } catch (Error $e) { echo $e->getMessage(), "\n"; }
2020
?>
2121
--EXPECT--
22-
Call to undefined function strlenn() (did you mean strlen()?)
23-
Call to undefined function array_pussh() (did you mean array_push()?)
24-
Call to undefined function arry_pussh() (did you mean array_push()?)
22+
Call to undefined function strlenn() (did you mean strlen?)
23+
Call to undefined function array_pussh() (did you mean array_push?)
24+
Call to undefined function arry_pussh() (did you mean array_push?)
2525
Call to undefined function nonexistentfunc()
26-
Call to undefined function strlenx() (did you mean strlen()?)
26+
Call to undefined function strlenx() (did you mean strlen?)

‎Zend/tests/levenshtein_suggest_method.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ try { $calc->nonexistent(); } catch (Error $e) { echo $e->getMessage(), "\n"; }
2323
try { Calculator::addd(1, 2); } catch (Error $e) { echo $e->getMessage(), "\n"; }
2424
?>
2525
--EXPECT--
26-
Call to undefined method Calculator::addd() (did you mean add()?)
27-
Call to undefined method Calculator::subtarct() (did you mean subtract()?)
26+
Call to undefined method Calculator::addd() (did you mean add?)
27+
Call to undefined method Calculator::subtarct() (did you mean subtract?)
2828
Call to undefined method Calculator::nonexistent()
29-
Call to undefined method Calculator::addd() (did you mean add()?)
29+
Call to undefined method Calculator::addd() (did you mean add?)

‎Zend/tests/nullsafe_operator/003.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ string(3) "bar"
4848
Warning: Undefined property: Foo::$baz in %s.php on line 20
4949
NULL
5050
string(3) "qux"
51-
string(58) "Call to undefined method Foo::quux() (did you mean qux()?)"
51+
string(56) "Call to undefined method Foo::quux() (did you mean qux?)"
5252
string(3) "bar"
5353

5454
Warning: Undefined property: Foo::$baz in %s.php on line 29
5555
NULL
5656
string(3) "qux"
57-
string(58) "Call to undefined method Foo::quux() (did you mean qux()?)"
57+
string(56) "Call to undefined method Foo::quux() (did you mean qux?)"

‎Zend/tests/nullsafe_operator/033.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ string(3) "bar"
4848
Warning: Undefined property: Foo::$baz in %s.php on line 20
4949
string(0) ""
5050
string(3) "qux"
51-
string(58) "Call to undefined method Foo::quux() (did you mean qux()?)"
51+
string(56) "Call to undefined method Foo::quux() (did you mean qux?)"
5252
string(3) "bar"
5353

5454
Warning: Undefined property: Foo::$baz in %s.php on line 29

‎Zend/zend_ast.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
12561256
zend_string *lc_name = zend_string_tolower(function_name);
12571257
zend_string *suggestion = zend_find_similar_function(ZSTR_VAL(lc_name), ZSTR_LEN(lc_name));
12581258
if (suggestion) {
1259-
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s()?)", ZSTR_VAL(function_name), ZSTR_VAL(suggestion));
1259+
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s?)", ZSTR_VAL(function_name), ZSTR_VAL(suggestion));
12601260
} else {
12611261
zend_throw_error(NULL, "Call to undefined function %s()", ZSTR_VAL(function_name));
12621262
}

‎Zend/zend_execute.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,7 @@ ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(co
26082608
{
26092609
zend_string *suggestion = zend_find_similar_method(ce, method);
26102610
if (suggestion) {
2611-
zend_throw_error(NULL, "Call to undefined method %s::%s() (did you mean %s()?)", ZSTR_VAL(ce->name), ZSTR_VAL(method), ZSTR_VAL(suggestion));
2611+
zend_throw_error(NULL, "Call to undefined method %s::%s() (did you mean %s?)", ZSTR_VAL(ce->name), ZSTR_VAL(method), ZSTR_VAL(suggestion));
26122612
} else {
26132613
zend_throw_error(NULL, "Call to undefined method %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(method));
26142614
}
@@ -2621,7 +2621,7 @@ ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_function_
26212621
zend_string *lc_key = Z_STR_P(function_name + 1);
26222622
zend_string *suggestion = zend_find_similar_function(ZSTR_VAL(lc_key), ZSTR_LEN(lc_key));
26232623
if (suggestion) {
2624-
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s()?)", Z_STRVAL_P(function_name), ZSTR_VAL(suggestion));
2624+
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s?)", Z_STRVAL_P(function_name), ZSTR_VAL(suggestion));
26252625
} else {
26262626
zend_throw_error(NULL, "Call to undefined function %s()", Z_STRVAL_P(function_name));
26272627
}
@@ -5233,7 +5233,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_string(zend_s
52335233
if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) {
52345234
zend_string *suggestion = zend_find_similar_function(ZSTR_VAL(lcname), ZSTR_LEN(lcname));
52355235
if (suggestion) {
5236-
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s()?)", ZSTR_VAL(function), ZSTR_VAL(suggestion));
5236+
zend_throw_error(NULL, "Call to undefined function %s() (did you mean %s?)", ZSTR_VAL(function), ZSTR_VAL(suggestion));
52375237
} else {
52385238
zend_throw_error(NULL, "Call to undefined function %s()", ZSTR_VAL(function));
52395239
}

‎ext/opcache/tests/bug76796.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ try {
1818

1919
?>
2020
--EXPECT--
21-
Call to undefined function strpos() (did you mean stripos()?)
21+
Call to undefined function strpos() (did you mean stripos?)

0 commit comments

Comments
 (0)