Patch bug55719.diff for Unknown/Other Function Bug #55719

Patch version 2011-09-18 15:15 UTC

Developer: laruence@php.net

Line 147 (now 147), was 16 lines, now 14 lines

  +
   static void do_inheritance_check_on_method(zend_function *child, zend_function *parent TSRMLS_DC)
   {
   	zend_uint child_flags;
 @@ -3069,11 +3208,15 @@
 @@ -3069,11 +3208,13 @@
   
   	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
   		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
  -			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype), child->common.prototype->common.function_name);
 +			char *method_prototype = zend_get_function_declaration(child->common.prototype TSRMLS_CC);
 +			zend_error(E_ERROR, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
 +			efree(method_prototype);
 +			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
   		}
   	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
   		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
  -			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(parent), parent->common.function_name);