diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-09 13:58:14 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-09 13:58:14 +0200 |
| commit | ee5b30fa197046973e813a80dd0b7c67827c0ae1 (patch) | |
| tree | 71e0c4f24afee1eac312b7dae97448cc871c0421 /Zend/zend_API.c | |
| parent | 43f1c94ddace679cac008b674ef983199a951542 (diff) | |
| download | php-git-ee5b30fa197046973e813a80dd0b7c67827c0ae1.tar.gz | |
Remove support for classes without class entries
get_class_entry must be non-NULL and return non-NULL.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index b965d20991..f5c60aacd0 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -198,12 +198,7 @@ ZEND_API char *zend_zval_type_name(const zval *arg) /* {{{ */ ZEND_API zend_class_entry *zend_get_class_entry(const zend_object *zobject TSRMLS_DC) /* {{{ */ { - if (zobject->handlers->get_class_entry) { - return zobject->handlers->get_class_entry(zobject TSRMLS_CC); - } else { - zend_error(E_ERROR, "Class entry requested for an object without PHP class"); - return NULL; - } + return zobject->handlers->get_class_entry(zobject TSRMLS_CC); } /* }}} */ @@ -3100,7 +3095,6 @@ get_function_via_handler: retval = 1; call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0; if (call_via_handler && !fcc->object && EG(current_execute_data) && Z_OBJ(EG(current_execute_data)->This) && - Z_OBJ_HT(EG(current_execute_data)->This)->get_class_entry && instanceof_function(Z_OBJCE(EG(current_execute_data)->This), fcc->calling_scope TSRMLS_CC)) { fcc->object = Z_OBJ(EG(current_execute_data)->This); } |