diff options
author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-15 11:27:29 +0100 |
---|---|---|
committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-17 14:52:46 +0100 |
commit | d1764ca33018f1f2e4a05926c879c67ad4aa8da5 (patch) | |
tree | 443cab099d2d5989a93a8102f599b51d36acc64e /Zend | |
parent | 117b18d22d14fb6a597b3cd6d52e75cef2d088bb (diff) | |
download | php-git-d1764ca33018f1f2e4a05926c879c67ad4aa8da5.tar.gz |
Make error messages more consistent by fixing capitalization
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/tests/bug30998.phpt | 4 | ||||
-rw-r--r-- | Zend/tests/bug60909_1.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/bug64960.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/debug_backtrace_with_include_and_this.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/include_stat_is_quiet.phpt | 2 | ||||
-rw-r--r-- | Zend/zend_exceptions.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt index 310c08d75f..9d84351216 100644 --- a/Zend/tests/bug30998.phpt +++ b/Zend/tests/bug30998.phpt @@ -14,6 +14,6 @@ set_error_handler('my_error'); $f = fopen("/tmp/blah", "r"); ?> --EXPECTF-- -fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d +fopen(/tmp/blah): Failed to open stream: %s (2) in %s:%d -Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d +Warning: fopen(/tmp/blah): Failed to open stream: %s in %s on line %d diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/bug60909_1.phpt index 51b2dcae4c..e709a55c7f 100644 --- a/Zend/tests/bug60909_1.phpt +++ b/Zend/tests/bug60909_1.phpt @@ -10,7 +10,7 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){ require 'notfound.php'; --EXPECTF-- -error(require(notfound.php): failed to open stream: %s) +error(require(notfound.php): Failed to open stream: %s) Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5 Stack trace: #0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8) diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt index 59fbed0d82..3c1d38ad9e 100644 --- a/Zend/tests/bug64960.phpt +++ b/Zend/tests/bug64960.phpt @@ -29,7 +29,7 @@ set_error_handler(function() $a['waa']; ?> --EXPECTF-- -Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3 +Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3 Fatal error: Uncaught Exception in %sbug64960.php:19 Stack trace: diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 5d58279eb5..3ee3a7312f 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -28,7 +28,7 @@ try { echo $e."\n"; } --EXPECTF-- -ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include +ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s diff --git a/Zend/tests/include_stat_is_quiet.phpt b/Zend/tests/include_stat_is_quiet.phpt index 006fad50bd..932885bd66 100644 --- a/Zend/tests/include_stat_is_quiet.phpt +++ b/Zend/tests/include_stat_is_quiet.phpt @@ -25,6 +25,6 @@ try { ?> --EXPECTF-- -Warning: require_once(doesnt_exist.php): failed to open stream: No such file or directory in %s on line %d +Warning: require_once(doesnt_exist.php): Failed to open stream: No such file or directory in %s on line %d Fatal error: require_once(): Failed opening required 'doesnt_exist.php' (include_path='test://foo:test://bar') in %s on line %d diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 5ed25431ab..f3846d326b 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -627,7 +627,7 @@ ZEND_METHOD(exception, getTraceAsString) trace = zend_read_property_ex(base_ce, object, ZSTR_KNOWN(ZEND_STR_TRACE), 1, &rv); if (Z_TYPE_P(trace) != IS_ARRAY) { - zend_type_error("trace is not an array"); + zend_type_error("Trace is not an array"); return; } ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) { |