From: Nikita Popov <nikic@php.net>
Date: Sun, 22 Mar 2015 08:17:42 +0000 (+0100)
Subject: Revert "Use E_ERROR | E_EXCEPTION in FAST_ZPP mode too"
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~553
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccfd53886f3f9aefc72c18c9a40b8e2b3015955b;p=php

Revert "Use E_ERROR | E_EXCEPTION in FAST_ZPP mode too"

This reverts commit d4da7c20d2d642a6f0f81bde836576b9970969af.

The argument passed to this function refers to the weak mode
severity, strict mode will get an exception in any case.
---

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d97b3760de..bd90e953fe 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -757,7 +757,7 @@ ZEND_API void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, cha
 		if (UNEXPECTED(error_code != ZPP_ERROR_OK)) { \
 			if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
 				if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
-					zend_wrong_callback_error(E_ERROR | E_EXCEPTION, _i, _error); \
+					zend_wrong_callback_error(E_WARNING, _i, _error); \
 				} else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
 					zend_wrong_paramer_class_error(_i, _error, _arg); \
 				} else if (error_code == ZPP_ERROR_WRONG_ARG) { \