From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 13 Dec 2017 20:25:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=652d30acdcaa8f6779edc39c648dc89cb1827fd7;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

652d30acdcaa8f6779edc39c648dc89cb1827fd7
diff --cc Zend/zend_API.c
index 6ec350ebf2,1070dcecbd..516753fdf7
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -2413,8 -2349,9 +2413,8 @@@ ZEND_API int zend_register_functions(ze
  			dtor->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
  		}
  		if (clone) {
 -			clone->common.fn_flags |= ZEND_ACC_CLONE;
  			if (clone->common.fn_flags & ZEND_ACC_STATIC) {
- 				zend_error(error_type, "Constructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name));
+ 				zend_error(error_type, "%s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name));
  			}
  			clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
  		}