- Fixed bug #55326 (Trait method copying misindentifies serialization callbacks)

  patch by: Gustavo Lopes (cataphract@php)

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 035a9b1a4f91c49b76042640f702d6dcd2045c1f..e8f9a04ff13b1adb6e08af1d623ef7cebb826acb 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3476,8 +3476,6 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
        else if (!IS_EQUAL(mname, mname_len, "__isset"))                (ce)->__isset           = (fe); \
        else if (!IS_EQUAL(mname, mname_len, "__callstatic"))(ce)->__callstatic = (fe); \
        else if (!IS_EQUAL(mname, mname_len, "__tostring"))     (ce)->__tostring        = (fe); \
-       else if (!IS_EQUAL(mname, mname_len, "serialize_func")) (ce)->serialize_func    = (fe); \
-       else if (!IS_EQUAL(mname, mname_len, "unserialize_func"))(ce)->unserialize_func = (fe); \
 }
 
 /* {{{ Originates from php_runkit_function_copy_ctor