php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in the handling of conflicting property initializers for traits.

Browse Source 
# Bug was uncovered by discussion in http://news.php.net/php.internals/54129
# Forgot to check the actual value of the initializer comparison, only checked
# whether comparison was successful which is not enough.
This commit is contained in:
Stefan Marr
2011-07-23 13:48:07 +00:00
parent 52b81b8566
commit 9f66085649
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
+23
View File
@@ -0,0 +1,23 @@
--TEST--
Properties are considered incompatible if they are different in any of their
defined characteristics. Thus, initialization values have to be equal, too.
--FILE--
<?php
error_reporting(E_ALL);
trait foo
{
public $zoo = 'foo::zoo';
}
class baz
{
use foo;
public $zoo = 'baz::zoo';
}
$obj = new baz();
echo $obj->zoo, "\n";
?>
--EXPECTF--
Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
Zend/zend_compile.c
+8 -6
View File
@@ -3919,13 +3919,15 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
if ((coliding_prop->flags & ZEND_ACC_PPP_MASK) == (property_info->flags & ZEND_ACC_PPP_MASK)) {
/* flags are identical, now the value needs to be checked */
if (property_info->flags & ZEND_ACC_STATIC) {
not_compatible = compare_function(&compare_result,
ce->default_static_members_table[coliding_prop->offset],
ce->traits[i]->default_static_members_table[property_info->offset] TSRMLS_CC) == FAILURE;
not_compatible = (FAILURE == compare_function(&compare_result,
ce->default_static_members_table[coliding_prop->offset],
ce->traits[i]->default_static_members_table[property_info->offset] TSRMLS_CC))
|| (Z_LVAL(compare_result) != 0);
} else {
not_compatible = compare_function(&compare_result,
ce->default_properties_table[coliding_prop->offset],
ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC) == FAILURE;
not_compatible = (FAILURE == compare_function(&compare_result,
ce->default_properties_table[coliding_prop->offset],
ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC))
|| (Z_LVAL(compare_result) != 0);
}
} else {
/* the flags are not identical, thus, we assume properties are not compatible */