Merge branch 'PHP-7.1' into PHP-7.2

diff --cc Zend/zend_API.c
index 6ec350ebf2cef77cc4e14109697dbdf6e09d7ffe,1070dcecbd80562603ef796c771880c6004c46f2..516753fdf7e0448cd627fecaa9b25aaa60cdcf75
--- 1/Zend/zend_API.c
--- 2/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;
                }

diff --cc Zend/zend_closures.c
Simple merge