Do not re-issue inheritance *warnings* at runtime

Fix bad error message

Author: morrisonlevi

Zend/zend_inheritance.c

@@ -1998,27 +1998,17 @@ ZEND_API void zend_do_link_class(zend_class_entry *ce, zend_class_entry *parent)
 
 static void _inheritance_runtime_error_msg(zend_function *child, zend_function *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
-	)) {
-		error_level = E_ERROR;
-		error_verb = "must";
-	} else if ((parent->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) &&
-						 !_check_inherited_return_type(child, child->common.arg_info - 1, parent, parent->common.arg_info - 1)) {
-		error_level = E_ERROR;
-		error_verb = "must";
-	} else {
-		error_level = E_WARNING;
-		error_verb = "should";
+	zend_function *proto = child->common.prototype;
+	if ((proto && (proto->common.fn_flags & ZEND_ACC_ABSTRACT))
+	    || ((parent->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)
+	        && !_check_inherited_return_type(child, child->common.arg_info - 1, parent, parent->common.arg_info - 1)))
+	{
+		zend_string *method_prototype = zend_get_function_declaration(parent);
+		zend_string *child_prototype = zend_get_function_declaration(child);
+		zend_error(E_ERROR, "Declaration of %s must be compatible with %s", ZSTR_VAL(child_prototype), ZSTR_VAL(method_prototype));
+		zend_string_efree(child_prototype);
+		zend_string_efree(method_prototype);
 	}
-	zend_error(error_level, "Declaration of %s %s be compatible with %s", ZSTR_VAL(child_prototype), error_verb, ZSTR_VAL(method_prototype));
-	zend_string_efree(child_prototype);
-	zend_string_efree(method_prototype);
 }
 
 ZEND_API void zend_verify_variance(zend_class_entry *ce) /* {{{ */
@@ -2093,7 +2083,9 @@ ZEND_API void zend_verify_variance(zend_class_entry *ce) /* {{{ */
 					parent, parent_arg_info);
 
 				if (check < 0) {
-					zend_error_noreturn(E_ERROR, "Bad arg!");
+					_inheritance_runtime_error_msg(child, parent);
+					// todo: what to do with errors, not warnings?
+					continue;
 				}
 			}