From: Aaron Piotrowski <aaron@trowski.com>
Date: Mon, 6 Jul 2015 20:03:35 +0000 (-0500)
Subject: Throw TypeError for invalid callback
X-Git-Tag: php-7.0.0beta1~12^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1adf3df;p=php

Throw TypeError for invalid callback

Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 55d325c8fa..8b57457af2 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -245,7 +245,7 @@ ZEND_API void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, cha
 		zend_internal_type_error(ZEND_ARG_USES_STRICT_TYPES(), "%s%s%s() expects parameter %d to be a valid callback, %s",
 			class_name, space, get_active_function_name(), num, error);
 	} else if (severity == E_ERROR) {
-		zend_throw_error(zend_ce_error, "%s%s%s() expects parameter %d to be a valid callback, %s",
+		zend_throw_error(zend_ce_type_error, "%s%s%s() expects parameter %d to be a valid callback, %s",
 			class_name, space, get_active_function_name(), num, error);
 	} else {
 		zend_error(severity, "%s%s%s() expects parameter %d to be a valid callback, %s",