clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing consistency check for abstract methods required by one trait and implemented by another.

Browse Source
This commit is contained in:
Stefan Marr 2011-11-01 13:42:53 +00:00
parent ceac9dc490
commit 9b0d73af1d
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Zend/tests/traits/bugs/abstract-methods05.phpt Normal file
View File

@ -0,0 +1,25 @@
--TEST--
The compatibility with the signature of abstract methods should be checked.
--FILE--
<?php
error_reporting(E_ALL);
trait THelloB {
public function hello() {
echo 'Hello';
}
}
trait THelloA {
public abstract function hello($a);
}
class TraitsTest1 {
use THelloB;
use THelloA;
}
?>
--EXPECTF--
Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d

26
Zend/tests/traits/bugs/abstract-methods06.phpt Normal file
View File

@ -0,0 +1,26 @@
--TEST--
The compatibility with the signature of abstract methods should be checked. (also checking the second possible implementation branch)
--FILE--
<?php
error_reporting(E_ALL);
trait THelloB {
public function hello() {
echo 'Hello';
}
}
trait THelloA {
public abstract function hello($a);
}
class TraitsTest1 {
use THelloA;
use THelloB;
}
?>
--EXPECTF--
Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d

6
Zend/zend_compile.c
View File

@ -3616,6 +3616,9 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
if (zend_hash_quick_find(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **)&other_trait_fn) == SUCCESS) {
/* if it is an abstract method, there is no collision */
if (other_trait_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure they are compatible */
do_inheritance_check_on_method(fn, other_trait_fn TSRMLS_CC);
/* we can savely free and remove it from other table */
zend_function_dtor(other_trait_fn);
zend_hash_quick_del(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h);
@ -3623,6 +3626,9 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
/* if it is not an abstract method, there is still no collision */
/* if fn is an abstract method */
if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure they are compatible */
do_inheritance_check_on_method(other_trait_fn, fn TSRMLS_CC);
/* just mark as solved, will be added if its own trait is processed */
abstract_solved = 1;
} else {