summaryrefslogtreecommitdiff
path: root/ext/opcache
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-06-17 21:55:03 +0200
committerAnatol Belski <ab@php.net>2015-06-17 21:55:03 +0200
commit269acaa363cab7de8705b060ba9b1e32322fb0f4 (patch)
tree66efcef9cde9f20638c82e6db33f1d281e9f3eff /ext/opcache
parent7db113fad106559a1335fea48d622d12d0e32f55 (diff)
parentc5eb924e9e43c59b564549e149b59ad9a4bee74a (diff)
downloadphp-git-269acaa363cab7de8705b060ba9b1e32322fb0f4.tar.gz
Merge branch 'pull-request/1284'
* pull-request/1284: Rename interface macros Fix typo in UPGRADING Move definition of Throwable to zend_exceptions.h/c Check for zend_ce_throwable instead Fix some missed tests Add Throwable tests Fix previous exception type check Updated UPGRADING with RFC link Changed AssertionException to AssertionError Update exception error messages Throwable method signatures. Update exception names in tests after formatting changes. Merge exception formatting changes. Make zend_get_exception_base static. Fix a few missed tests. Fix handler double copy. Updated tests to reflect exception class changes. Remodel exceptions based on Throwable interface
Diffstat (limited to 'ext/opcache')
-rw-r--r--ext/opcache/tests/optimize_func_calls.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/tests/optimize_func_calls.phpt b/ext/opcache/tests/optimize_func_calls.phpt
index 3f795f5fc6..eee21b557c 100644
--- a/ext/opcache/tests/optimize_func_calls.phpt
+++ b/ext/opcache/tests/optimize_func_calls.phpt
@@ -127,7 +127,7 @@ Array
string(7) "changed"
string(7) "changed"
-Fatal error: Uncaught EngineException: Cannot pass parameter 1 by reference in %soptimize_func_calls.php:%d
+Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %soptimize_func_calls.php:%d
Stack trace:
#0 {main}
thrown in %soptimize_func_calls.php on line %d