Skip to content

Commit 9f8e518

Browse files
Ayeshcmb69
authored andcommitted
INI parser: Fix typo /multipler/multiplier
Closes GH-8987.
1 parent 56804e3 commit 9f8e518

6 files changed

+9
-9
lines changed

Zend/tests/zend_ini_parse_quantity_error.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int(1048576)
4040

4141
# "1X"
4242

43-
Warning: Invalid quantity "1X": unknown multipler "X", interpreting as "1" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
43+
Warning: Invalid quantity "1X": unknown multiplier "X", interpreting as "1" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
4444
int(1)
4545

4646
# "1.0K"
@@ -70,10 +70,10 @@ int(125952)
7070

7171
# " 123K\000"
7272

73-
Warning: Invalid quantity " 123K\x00": unknown multipler "\x00", interpreting as " 123" for backwards compatibility in %s on line %d
73+
Warning: Invalid quantity " 123K\x00": unknown multiplier "\x00", interpreting as " 123" for backwards compatibility in %s on line %d
7474
int(123)
7575

7676
# " 123\000"
7777

78-
Warning: Invalid quantity " 123\x00": unknown multipler "\x00", interpreting as " 123" for backwards compatibility in %s on line %d
78+
Warning: Invalid quantity " 123\x00": unknown multiplier "\x00", interpreting as " 123" for backwards compatibility in %s on line %d
7979
int(123)

Zend/tests/zend_ini_parse_quantity_ini_set_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ zend_test
88
var_dump(ini_set("zend_test.quantity_value", "1MB"));
99
var_dump(ini_get("zend_test.quantity_value"));
1010
--EXPECTF--
11-
Warning: Invalid "zend_test.quantity_value" setting. Invalid quantity "1MB": unknown multipler "B", interpreting as "1" for backwards compatibility in %s on line %d
11+
Warning: Invalid "zend_test.quantity_value" setting. Invalid quantity "1MB": unknown multiplier "B", interpreting as "1" for backwards compatibility in %s on line %d
1212
string(1) "0"
1313
string(3) "1MB"

Zend/tests/zend_ini_parse_quantity_ini_setting_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ zend_test.quantity_value=1MB
99

1010
var_dump(ini_get("zend_test.quantity_value"));
1111
--EXPECTF--
12-
Warning: Invalid "zend_test.quantity_value" setting. Invalid quantity "1MB": unknown multipler "B", interpreting as "1" for backwards compatibility in %s on line %d
12+
Warning: Invalid "zend_test.quantity_value" setting. Invalid quantity "1MB": unknown multiplier "B", interpreting as "1" for backwards compatibility in %s on line %d
1313
string(3) "1MB"

Zend/zend_ini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ static zend_ulong zend_ini_parse_quantity_internal(zend_string *value, zend_ini_
635635
smart_str_append_escaped(&chr, str_end-1, 1);
636636
smart_str_0(&chr);
637637

638-
*errstr = zend_strpprintf(0, "Invalid quantity \"%s\": unknown multipler \"%s\", interpreting as \"%s\" for backwards compatibility",
638+
*errstr = zend_strpprintf(0, "Invalid quantity \"%s\": unknown multiplier \"%s\", interpreting as \"%s\" for backwards compatibility",
639639
ZSTR_VAL(invalid.s), ZSTR_VAL(chr.s), ZSTR_VAL(interpreted.s));
640640

641641
smart_str_free(&invalid);

Zend/zend_ini.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ ZEND_API bool zend_ini_parse_bool(zend_string *str);
9595
*
9696
* The value parameter must be a string in the form
9797
*
98-
* sign? digits ws* multipler?
98+
* sign? digits ws* multiplier?
9999
*
100100
* with
101101
*
102102
* sign: [+-]
103103
* digit: [0-9]
104104
* digits: digit+
105105
* ws: [ \t\n\r\v\f]
106-
* multipler: [KMG]
106+
* multiplier: [KMG]
107107
*
108108
* Leading and trailing whitespaces are ignored.
109109
*

tests/basic/ini_parse_quantity_warnings.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ ini_parse_quantity('1mb');
99
ini_parse_quantity('256 then skip a few then g')
1010
?>
1111
--EXPECTF--
12-
Warning: Invalid quantity "1mb": unknown multipler "b", interpreting as "1" for backwards compatibility in %sini_parse_quantity_warnings.php on line 3
12+
Warning: Invalid quantity "1mb": unknown multiplier "b", interpreting as "1" for backwards compatibility in %sini_parse_quantity_warnings.php on line 3
1313

1414
Warning: Invalid quantity "256 then skip a few then g", interpreting as "256 g" for backwards compatibility in %sini_parse_quantity_warnings.php on line 4

0 commit comments

Comments
 (0)