Skip to content

Commit 04f6fe4

Browse files
committed
Ammend DBA error message to use standard messaging
1 parent 60189aa commit 04f6fe4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ext/dba/dba.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,12 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
502502
}
503503
// TODO Check Value for permission
504504
if (map_size < 0) {
505-
zend_argument_value_error(5, "must be greater or equal than 0");
505+
zend_argument_value_error(5, "must be greater than or equal to 0");
506506
RETURN_THROWS();
507507
}
508508

509509
if (!is_flags_null && driver_flags < 0) {
510-
zend_argument_value_error(6, "must be greater or equal than 0");
510+
zend_argument_value_error(6, "must be greater than or equal to 0");
511511
RETURN_THROWS();
512512
}
513513

ext/dba/tests/dba011.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ dba_open(): Argument #2 ($mode) first character must be one of "r", "w", "c", or
125125
dba_open(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
126126
dba_open(): Argument #2 ($mode) third character must be "t"
127127
dba_open(): Argument #2 ($mode) cannot combine mode "-" (no lock) and "t" (test lock)
128-
dba_open(): Argument #5 ($map_size) must be greater or equal than 0
128+
dba_open(): Argument #5 ($map_size) must be greater than or equal to 0
129129
=== Invalid arguments dba_popen() ===
130130

131131
Warning: dba_popen(): Handler "bogus" is not available in %sdba011.php on line %d
@@ -137,4 +137,4 @@ dba_popen(): Argument #2 ($mode) first character must be one of "r", "w", "c", o
137137
dba_popen(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
138138
dba_popen(): Argument #2 ($mode) third character must be "t"
139139
dba_popen(): Argument #2 ($mode) cannot combine mode "-" (no lock) and "t" (test lock)
140-
dba_popen(): Argument #5 ($map_size) must be greater or equal than 0
140+
dba_popen(): Argument #5 ($map_size) must be greater than or equal to 0

ext/dba/tests/dba_flags_arg.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111
}
1212
?>
1313
--EXPECT--
14-
dba_open(): Argument #6 ($flags) must be greater or equal than 0
14+
dba_open(): Argument #6 ($flags) must be greater than or equal to 0

0 commit comments

Comments
 (0)