diff options
| author | Andrea Faulds <ajf@ajf.me> | 2015-03-31 16:10:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-03-31 17:55:27 +0200 |
| commit | db76b708cf14ed2794d26600c0e49df8aa36fbea (patch) | |
| tree | 043fe016f4319fea36c3208af06c227ceb7bb459 /Zend/zend_compile.c | |
| parent | d252c9f8324a1fac35aac01b7de7cc800ea76865 (diff) | |
| download | php-git-db76b708cf14ed2794d26600c0e49df8aa36fbea.tar.gz | |
Deprecate PHP 4 constructors
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2a76ff39e6..ad696857b4 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3171,7 +3171,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } /* }}} */ -zend_bool zend_is_constructor(zend_string *name) /* {{{ */ +static zend_bool zend_is_constructor(zend_string *name) /* {{{ */ { return zend_string_equals_literal_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME); } @@ -4409,10 +4409,6 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo ce->constructor = (zend_function *) op_array; } } else if (zend_string_equals_literal(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) { - if (CG(active_class_entry)->constructor) { - zend_error(E_STRICT, "Redefining already defined constructor for class %s", - ce->name->val); - } ce->constructor = (zend_function *) op_array; } else if (zend_string_equals_literal(lcname, ZEND_DESTRUCTOR_FUNC_NAME)) { ce->destructor = (zend_function *) op_array; |