Skip to content

Commit c041da5

Browse files
committed
Address some comments
1 parent 8a2825a commit c041da5

11 files changed

+130
-31
lines changed

Zend/tests/zend_ini_parse_quantity_error.phpt renamed to Zend/tests/zend_ini/zend_ini_parse_quantity_error.phpt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ $tests = [
1313
'1X', # Unknown multiplier.
1414
'1.0K', # Non integral digits.
1515

16+
'0X', # Valid prefix with no value
17+
'0Z', # Invalid prefix
18+
'0XK', # Valid prefix with no value and multiplier
19+
1620
# Null bytes
1721
" 123\x00K",
1822
"\x00 123K",
@@ -48,6 +52,21 @@ int(1)
4852
Warning: Invalid quantity "1.0K", interpreting as "1K" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
4953
int(1024)
5054

55+
# "0X"
56+
57+
Warning: Invalid quantity: no digits after base prefix, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
58+
int(0)
59+
60+
# "0Z"
61+
62+
Warning: Invalid prefix "0Z", interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
63+
int(0)
64+
65+
# "0XK"
66+
67+
Warning: Invalid quantity "0XK": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
68+
int(0)
69+
5170
# " 123\000K"
5271

5372
Warning: Invalid quantity " 123\x00K", interpreting as " 123K" for backwards compatibility in %s on line %d
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
--TEST--
2+
Test parsing of valid 0 quantities
3+
--EXTENSIONS--
4+
zend_test
5+
--FILE--
6+
<?php
7+
8+
$tests = [
9+
'0',
10+
'0K',
11+
'0k',
12+
'0M',
13+
'0m',
14+
'0G',
15+
'0g',
16+
'-0',
17+
'-0K',
18+
'-0k',
19+
'-0M',
20+
'-0m',
21+
'-0G',
22+
'-0g',
23+
];
24+
25+
foreach ($tests as $setting) {
26+
printf("# \"%s\"\n", addcslashes($setting, "\0..\37!@\177..\377"));
27+
var_dump(zend_test_zend_ini_parse_quantity($setting));
28+
print "\n";
29+
}
30+
--EXPECT--
31+
# "0"
32+
int(0)
33+
34+
# "0K"
35+
int(0)
36+
37+
# "0k"
38+
int(0)
39+
40+
# "0M"
41+
int(0)
42+
43+
# "0m"
44+
int(0)
45+
46+
# "0G"
47+
int(0)
48+
49+
# "0g"
50+
int(0)
51+
52+
# "-0"
53+
int(0)
54+
55+
# "-0K"
56+
int(0)
57+
58+
# "-0k"
59+
int(0)
60+
61+
# "-0M"
62+
int(0)
63+
64+
# "-0m"
65+
int(0)
66+
67+
# "-0G"
68+
int(0)
69+
70+
# "-0g"
71+
int(0)

0 commit comments

Comments
 (0)