diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
| commit | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (patch) | |
| tree | 54defb44e55c1ebc0afa15aa60758d87a4b9ce3b /Zend/zend_interfaces.c | |
| parent | dfb18b1188492efa48ade07029172c5535f65f93 (diff) | |
| parent | 0ea0b591d79ae0ee18d33533a5c701330836ff6b (diff) | |
| download | php-git-bb66f385d09e7e55390e9f57fcbca08f6b43ff91.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (37 commits)
NEWS
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
Fixed compilation warnings
Removed unnecessary checks
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
Merged PR #911.
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
Updated NEWS
Updated NEWS
Updated NEWS
Fix bug #68532: convert.base64-encode omits padding bytes
Updated NEWS
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Updated NEWS
Updated NEWS
Fix MySQLi tests
Fixed gd test
...
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rw-r--r-- | Zend/zend_interfaces.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index f076289201..16ae8ea3c5 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -499,7 +499,7 @@ static int zend_implement_serializable(zend_class_entry *interface, zend_class_e /* {{{ function tables */ const zend_function_entry zend_funcs_aggregate[] = { ZEND_ABSTRACT_ME(iterator, getIterator, NULL) - {NULL, NULL, NULL} + ZEND_FE_END }; const zend_function_entry zend_funcs_iterator[] = { @@ -508,7 +508,7 @@ const zend_function_entry zend_funcs_iterator[] = { ZEND_ABSTRACT_ME(iterator, key, NULL) ZEND_ABSTRACT_ME(iterator, valid, NULL) ZEND_ABSTRACT_ME(iterator, rewind, NULL) - {NULL, NULL, NULL} + ZEND_FE_END }; const zend_function_entry *zend_funcs_traversable = NULL; @@ -531,7 +531,7 @@ const zend_function_entry zend_funcs_arrayaccess[] = { ZEND_ABSTRACT_ME(arrayaccess, offsetGet, arginfo_arrayaccess_offset_get) ZEND_ABSTRACT_ME(arrayaccess, offsetSet, arginfo_arrayaccess_offset_value) ZEND_ABSTRACT_ME(arrayaccess, offsetUnset, arginfo_arrayaccess_offset) - {NULL, NULL, NULL} + ZEND_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0) @@ -541,7 +541,7 @@ ZEND_END_ARG_INFO() const zend_function_entry zend_funcs_serializable[] = { ZEND_ABSTRACT_ME(serializable, serialize, NULL) ZEND_FENTRY(unserialize, NULL, arginfo_serializable_serialize, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT|ZEND_ACC_CTOR) - {NULL, NULL, NULL} + ZEND_FE_END }; /* }}} */ |