Commit f91f80c

authored

Zend: Return anonymous closure names in zend_get_callable_name_ex() (#19011)

This returns the usual `{closure:FILE_NAME/FUNCTION:LINE_NO}` for anonymous functions rather than `Closure::__invoke` this is visible for `is_callable()` and any Engine call that uses `zend_fcall_info_init()` to get the name of the callable. Related to GH-18063.

1 parent 4492a42 commit f91f80cCopy full SHA for f91f80c

File tree

3 files changed

-11

lines changed

Zend
- tests/closures
  - closure_016.phpt
- zend_API.c
tests/output
- ob_013.phpt

3 files changed

-11

lines changed

`‎Zend/tests/closures/closure_016.phpt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ Foo::__invoke`
`42`	`42`	`bool(true)`
`43`	`43`	`Foo::__invoke`
`44`	`44`	`bool(true)`
`45`		`-Closure::__invoke`
	`45`	`+{closure:foo():9}`
`46`	`46`	`bool(true)`
`47`		`-Closure::__invoke`
	`47`	`+{closure:foo():9}`
`48`	`48`	`bool(true)`
`49`	`49`	`Closure::__invoke`
`50`	`50`	`bool(true)`

`‎Zend/zend_API.c‎`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4160,13 +4160,10 @@ ZEND_API zend_string zend_get_callable_name_ex(zval callable, zend_object *obj`
`4160`	`4160`	`if (ce == zend_ce_closure) {`
`4161`	`4161`	`const zend_function *fn = zend_get_closure_method_def(Z_OBJ_P(callable));`
`4162`	`4162`
`4163`		`- if (fn->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) {`
`4164`		`- if (fn->common.scope) {`
`4165`		`- return zend_create_member_string(fn->common.scope->name, fn->common.function_name);`
`4166`		`- } else {`
`4167`		`- return zend_string_copy(fn->common.function_name);`
`4168`		`- }`
	`4163`	`+ if ((fn->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) && fn->common.scope) {`
	`4164`	`+ return zend_create_member_string(fn->common.scope->name, fn->common.function_name);`
`4169`	`4165`	`}`
	`4166`	`+ return zend_string_copy(fn->common.function_name);`
`4170`	`4167`	`}`
`4171`	`4168`
`4172`	`4169`	`return zend_string_concat2(`

`‎tests/output/ob_013.phpt‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ Array`
`57`	`57`	`[5] => E::f`
`58`	`58`	`[6] => E::g`
`59`	`59`	`[7] => E::__invoke`
`60`		`- [8] => Closure::__invoke`
	`60`	`+ [8] => {closure:%s:%d}`
`61`	`61`	`)`
`62`	`62`	`Array`
`63`	`63`	`(`
`64`		`- [name] => Closure::__invoke`
	`64`	`+ [name] => {closure:%s:%d}`
`65`	`65`	`[type] => 1`
`66`	`66`	`[flags] => 20593`
`67`	`67`	`[level] => 8`
`@@ -161,7 +161,7 @@ Array`
`161`	`161`
`162`	`162`	`[8] => Array`
`163`	`163`	`(`
`164`		`- [name] => Closure::__invoke`
	`164`	`+ [name] => {closure:%s:%d}`
`165`	`165`	`[type] => 1`
`166`	`166`	`[flags] => 20593`
`167`	`167`	`[level] => 8`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f91f80c

File tree

3 files changed

3 files changed

`‎Zend/tests/closures/closure_016.phpt‎`

`‎Zend/zend_API.c‎`

`‎tests/output/ob_013.phpt‎`

0 commit comments