diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
| commit | fb7206e452008f72f8bf185ca658a9c306de23b6 (patch) | |
| tree | b454c6bb6439dbb605b15c11825df2e47966b5ef /sapi/cli | |
| parent | 0eba6f597aecf5febcdf8468fb80550d05643b4b (diff) | |
| parent | 440481fb3e15d78d0d92432c3adba9067989f43a (diff) | |
| download | php-git-fb7206e452008f72f8bf185ca658a9c306de23b6.tar.gz | |
Merge branch 'master' into throwable-interface
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/tests/008.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/php_cli_server_015.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index e70f57bfc9..5037e1cfd4 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -36,7 +36,7 @@ echo "Done\n"; --EXPECTF-- string(%d) " -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property test::$pri' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property test::$pri in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt index e50e5c1b5c..0b13a195d5 100644 --- a/sapi/cli/tests/php_cli_server_015.phpt +++ b/sapi/cli/tests/php_cli_server_015.phpt @@ -46,7 +46,7 @@ X-Powered-By: PHP/%s Content-type: text/html; charset=UTF-8 <br /> -<b>Fatal error</b>: Uncaught exception 'Error' with message 'Call to undefined function non_exists_function()' in %ssyntax_error.php:%d +<b>Fatal error</b>: Uncaught EngineException: Call to undefined function non_exists_function() in %ssyntax_error.php:%d Stack trace: #0 %sindex.php(%d): require() #1 {main} |