]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:14:32 +0000 (16:14 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:14:32 +0000 (16:14 -0700)
* PHP-5.6:
  __wakeup doesn't have to be final

1  2 
Zend/zend_exceptions.c

index 51ea2319bf1523594d32f4463a590e156139d69e,40248f7f5eb4f471913961520c0b2682ba751521..f03bc40e470d8c1f5f38dd304e11ee4a1c69e73b
@@@ -805,10 -752,10 +805,10 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exceptio
        ZEND_ARG_INFO(0, previous)
  ZEND_END_ARG_INFO()
  
 -const static zend_function_entry default_exception_functions[] = {
 +static const zend_function_entry default_exception_functions[] = {
        ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
        ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC)
-       ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+       ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC)
        ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)