com php-src: Fixed build: Zend/zend_inheritance.c

From: Date: Wed, 06 Apr 2016 21:59:21 +0000
Subject: com php-src: Fixed build: Zend/zend_inheritance.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91621@lists.php.net to get a copy of this message
Commit: 088f55ae74d8cd316fd33f1828f28472409cfb21 Author: Dmitry Stogov <dmitry@zend.com> Thu, 7 Apr 2016 00:59:21 +0300 Parents: 6489edb9585112835f1dcbbd68140b2e9e3de1c5 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=088f55ae74d8cd316fd33f1828f28472409cfb21 Log: Fixed build Changed paths: M Zend/zend_inheritance.c Diff: diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index e672187..9042b2f 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -577,6 +577,8 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function * if (UNEXPECTED(!zend_do_perform_implementation_check(child, parent))) { int error_level; const char *error_verb; + zend_string *method_prototype = zend_get_function_declaration(parent); + zend_string *child_prototype = zend_get_function_declaration(child); if (child->common.prototype && ( child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT @@ -592,8 +594,6 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function * error_level = E_WARNING; error_verb = "should"; } - zend_string *method_prototype = zend_get_function_declaration(parent); - zend_string *child_prototype = zend_get_function_declaration(child); zend_error(error_level, "Declaration of %s %s be compatible with %s", ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype)); zend_string_free(child_prototype); zend_string_free(method_prototype);

« previous php.cvs (#91621) next »