Fixed Bug #69467 (Wrong checked for the interface by using Trait)

diff --git a/NEWS b/NEWS
index 10a598a8aacb5904e154f9f74b8914048bf28eda..a094c5a4e3ac40806aa04561e7ebfb991004cb70 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2015, PHP 5.5.25
 
 - Core:
+  . Fixed bug #69467 (Wrong checked for the interface by using Trait). 
+    (Laruence)
   . Fixed bug #69420 (Invalid read in zend_std_get_method). (Laruence)
   . Fixed bug #60022 ("use statement [...] has no effect" depends on leading
     backslash). (Nikita)

diff --git a/Zend/tests/bug69467.phpt b/Zend/tests/bug69467.phpt
new file mode 100644 (file)
index 0000000..2228300
--- /dev/null
+++ b/Zend/tests/bug69467.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #69467 (Wrong checked for the interface by using Trait)
+--FILE--
+<?php
+interface Baz {
+    public function bad();
+}
+
+trait Bar{
+    protected function bad(){}
+}
+
+class Foo implements Baz{
+    use Bar;
+}
+
+$test = new Foo();
+var_dump($test instanceof Baz);
+?>
+--EXPECTF--
+Fatal error: Access level to Bar::bad() must be public (as in class Baz) in %sbug69467.php on line %d

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4e61f5fd222453ed6a373543dcb6ffa7ebff6b7e..719f6e7de2fa9d646995c0fd4febbc563330e590 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3912,14 +3912,15 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
                        }
                        zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
                        return;
-               } else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+               } else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
+                               (existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
                        /* Make sure the trait method is compatible with previosly declared abstract method */
                        if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
                                zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
                                        zend_get_function_declaration(fn TSRMLS_CC),
                                        zend_get_function_declaration(existing_fn TSRMLS_CC));
                        }
-               } else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+               } else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) { 
                        /* Make sure the abstract declaration is compatible with previous declaration */
                        if (!zend_traits_method_compatibility_check(existing_fn, fn TSRMLS_CC)) {
                                zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",