Skip to content

zend_inheritance: Improve placement of return-by-ref & in zend_get_function_declaration() #20104

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

zend_inheritance: Improve placement of return-by-ref & in zend_get_function_declaration() #20104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Zend/tests/inheritance/argument_restriction_001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ class Sub extends Base {
}
?>
--EXPECTF--
Fatal error: Declaration of & Sub::test() must be compatible with & Base::test($foo, array $bar, $option = null, $extra = 'llllllllll...') in %s on line %d
Fatal error: Declaration of &Sub::test() must be compatible with &Base::test($foo, array $bar, $option = null, $extra = 'llllllllll...') in %s on line %d
2 changes: 1 addition & 1 deletion Zend/tests/objects/objects_005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ class test3 extends test {

?>
--EXPECTF--
Fatal error: Declaration of test3::foo() must be compatible with & test::foo() in %s on line %d
Fatal error: Declaration of test3::foo() must be compatible with &test::foo() in %s on line %d
2 changes: 1 addition & 1 deletion Zend/tests/property_hooks/get_by_ref_implemented_by_val.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ class A implements I {

?>
--EXPECTF--
Fatal error: Declaration of A::$prop::get() must be compatible with & I::$prop::get() in %s on line %d
Fatal error: Declaration of A::$prop::get() must be compatible with &I::$prop::get() in %s on line %d
2 changes: 1 addition & 1 deletion Zend/zend_inheritance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ static ZEND_COLD zend_string *zend_get_function_declaration(
smart_str str = {0};

if (fptr->op_array.fn_flags & ZEND_ACC_RETURN_REFERENCE) {
smart_str_appends(&str, "& ");
smart_str_appendc(&str, '&');
}

if (fptr->common.scope) {
Expand Down