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

# 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.

diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
new file mode 100644 (file)
index 0000000..1b9d98d
--- /dev/null
+++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
@@ -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
\ No newline at end of file

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 89d790e7e1af28983e24373f9873e8f3f3d7dc06..17f861d092059d26ba85e34260f643868cecaa44 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -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 */