Skip to content

Fix incorrect inheritance of private trait methods #14163

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 1 commit into from
May 7, 2024
Merged

Fix incorrect inheritance of private trait methods #14163

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
38 changes: 38 additions & 0 deletions Zend/tests/gh14009_005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
GH-14009: Traits inherit prototype
--FILE--
<?php

trait T {
private function test($s) {
echo $s . " -> ". __CLASS__ . "::" . __METHOD__ . "\n";
}
}

class A {
use T;
public function foo() {
$this->test(__METHOD__);
}
public function bar() {
$this->test(__METHOD__);
}
}

class B extends A {
use T;
public function foo() {
$this->test(__METHOD__);
}
}

(new A)->foo();
(new A)->bar();
(new B)->foo();
(new B)->bar();
?>
--EXPECT--
A::foo -> A::T::test
A::bar -> A::T::test
B::foo -> B::T::test
A::bar -> A::T::test
3 changes: 2 additions & 1 deletion Zend/zend_inheritance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,8 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
do_inheritance_check_on_method(
fn, fixup_trait_scope(fn, ce), existing_fn, fixup_trait_scope(existing_fn, ce),
ce, NULL,
ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY | ZEND_INHERITANCE_SET_CHILD_PROTO);
ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY |
ZEND_INHERITANCE_SET_CHILD_CHANGED| ZEND_INHERITANCE_SET_CHILD_PROTO);
}
}
/* }}} */
Expand Down
Loading