Skip to content

Commit 568a35f

Browse files
committed
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: __wakeup doesn't have to be final
2 parents ed709d5 + f2f8ea9 commit 568a35f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Zend/zend_exceptions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ ZEND_END_ARG_INFO()
755755
const static zend_function_entry default_exception_functions[] = {
756756
ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
757757
ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC)
758-
ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
758+
ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC)
759759
ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
760760
ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
761761
ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

0 commit comments

Comments
 (0)