Skip to content

Commit d1764ca

Browse files
committed
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.
1 parent 117b18d commit d1764ca

File tree

432 files changed

+1525
-1525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

432 files changed

+1525
-1525
lines changed

Zend/tests/bug30998.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ set_error_handler('my_error');
1414
$f = fopen("/tmp/blah", "r");
1515
?>
1616
--EXPECTF--
17-
fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
17+
fopen(/tmp/blah): Failed to open stream: %s (2) in %s:%d
1818

19-
Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
19+
Warning: fopen(/tmp/blah): Failed to open stream: %s in %s on line %d

Zend/tests/bug60909_1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){
1010

1111
require 'notfound.php';
1212
--EXPECTF--
13-
error(require(notfound.php): failed to open stream: %s)
13+
error(require(notfound.php): Failed to open stream: %s)
1414
Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5
1515
Stack trace:
1616
#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8)

Zend/tests/bug64960.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set_error_handler(function()
2929
$a['waa'];
3030
?>
3131
--EXPECTF--
32-
Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
32+
Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
3333

3434
Fatal error: Uncaught Exception in %sbug64960.php:19
3535
Stack trace:

Zend/tests/debug_backtrace_with_include_and_this.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ try {
2828
echo $e."\n";
2929
}
3030
--EXPECTF--
31-
ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
31+
ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include
3232
ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
3333

3434
Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s

Zend/tests/include_stat_is_quiet.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ try {
2525

2626
?>
2727
--EXPECTF--
28-
Warning: require_once(doesnt_exist.php): failed to open stream: No such file or directory in %s on line %d
28+
Warning: require_once(doesnt_exist.php): Failed to open stream: No such file or directory in %s on line %d
2929

3030
Fatal error: require_once(): Failed opening required 'doesnt_exist.php' (include_path='test://foo:test://bar') in %s on line %d

Zend/zend_exceptions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ ZEND_METHOD(exception, getTraceAsString)
627627

628628
trace = zend_read_property_ex(base_ce, object, ZSTR_KNOWN(ZEND_STR_TRACE), 1, &rv);
629629
if (Z_TYPE_P(trace) != IS_ARRAY) {
630-
zend_type_error("trace is not an array");
630+
zend_type_error("Trace is not an array");
631631
return;
632632
}
633633
ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) {

ext/bcmath/libbcmath/src/raise.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale)
5454

5555
/* Check the exponent for scale digits and convert to a long. */
5656
if (num2->n_scale != 0)
57-
php_error_docref (NULL, E_WARNING, "non-zero scale in exponent");
57+
php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent");
5858
exponent = bc_num2long (num2);
5959
if (exponent == 0 && (num2->n_len > 1 || num2->n_value[0] != 0))
60-
php_error_docref (NULL, E_WARNING, "exponent too large");
60+
php_error_docref (NULL, E_WARNING, "Exponent too large");
6161

6262
/* Special case if exponent is a zero. */
6363
if (exponent == 0)

ext/bcmath/libbcmath/src/raisemod.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,21 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
7979
/* Check the base for scale digits. */
8080
if (power->n_scale != 0)
8181
{
82-
php_error_docref (NULL, E_WARNING, "non-zero scale in base");
82+
php_error_docref (NULL, E_WARNING, "Non-zero scale in base");
8383
_bc_truncate (&power);
8484
}
8585

8686
/* Check the exponent for scale digits. */
8787
if (exponent->n_scale != 0)
8888
{
89-
php_error_docref (NULL, E_WARNING, "non-zero scale in exponent");
89+
php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent");
9090
_bc_truncate (&exponent);
9191
}
9292

9393
/* Check the modulus for scale digits. */
9494
if (modulus->n_scale != 0)
9595
{
96-
php_error_docref (NULL, E_WARNING, "non-zero scale in modulus");
96+
php_error_docref (NULL, E_WARNING, "Non-zero scale in modulus");
9797
_bc_truncate (&modulus);
9898
}
9999

ext/bcmath/tests/bcpow_error1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
99
var_dump(bcpow('1', '1.1', 2));
1010
?>
1111
--EXPECTF--
12-
Warning: bcpow(): non-zero scale in exponent in %s on line %d
12+
Warning: bcpow(): Non-zero scale in exponent in %s on line %d
1313
string(4) "1.00"

ext/bcmath/tests/bcpow_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
99
var_dump(bcpow('0', '9223372036854775808', 2));
1010
?>
1111
--EXPECTF--
12-
Warning: bcpow(): exponent too large in %s on line %d
12+
Warning: bcpow(): Exponent too large in %s on line %d
1313
string(4) "1.00"

0 commit comments

Comments
 (0)