mirror of
https://github.com/php/php-src.git
synced 2026-04-15 03:51:07 +02:00
Fix #76700 - Methods with altered visibility need to be added again
This commit is contained in:
31
Zend/tests/traits/bug76700.phpt
Normal file
31
Zend/tests/traits/bug76700.phpt
Normal file
@@ -0,0 +1,31 @@
|
||||
--TEST--
|
||||
Bug #76700 (false-positive "Error: Call to protected method" when using trait aliases)
|
||||
--FILE--
|
||||
<?php
|
||||
trait T1
|
||||
{
|
||||
protected function aa() { echo 123; }
|
||||
}
|
||||
|
||||
trait T2
|
||||
{
|
||||
use T1 {
|
||||
aa as public;
|
||||
}
|
||||
}
|
||||
|
||||
class A
|
||||
{
|
||||
use T1;
|
||||
}
|
||||
|
||||
class B extends A
|
||||
{
|
||||
use T2;
|
||||
}
|
||||
|
||||
$b = new B();
|
||||
$b->aa();
|
||||
|
||||
--EXPECT--
|
||||
123
|
||||
@@ -1178,8 +1178,10 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
|
||||
zend_function *new_fn;
|
||||
|
||||
if ((existing_fn = zend_hash_find_ptr(&ce->function_table, key)) != NULL) {
|
||||
/* if it is the same function regardless of where it is coming from, there is no conflict and we do not need to add it again */
|
||||
if (existing_fn->op_array.opcodes == fn->op_array.opcodes) {
|
||||
/* if it is the same function with the same visibility regardless of where it is coming from */
|
||||
/* there is no conflict and we do not need to add it again */
|
||||
if (existing_fn->op_array.opcodes == fn->op_array.opcodes &&
|
||||
(existing_fn->common.fn_flags & ZEND_ACC_PPP_MASK) == (fn->common.fn_flags & ZEND_ACC_PPP_MASK)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user