Skip to content

Commit 08a6000

Browse files
kocsismatekocsismate
committed
Test fixes
1 parent 50e3147 commit 08a6000

File tree

9 files changed

+31
-63
lines changed

9 files changed

+31
-63
lines changed

‎ext/mbstring/tests/bug49354.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ var_dump(mb_strcut($crap, 1, 100, 'UTF-8'));
1010
var_dump(mb_strcut($crap, 2, 100, 'UTF-8'));
1111
var_dump(mb_strcut($crap, 3, 100, 'UTF-8'));
1212
var_dump(mb_strcut($crap, 12, 100, 'UTF-8'));
13-
14-
try {
15-
mb_strcut($crap, 13, 100, 'UTF-8');
16-
} catch (ValueError $exception) {
17-
echo $exception->getMessage() . "\n";
18-
}
13+
var_dump(mb_strcut($crap, 13, 100, 'UTF-8'));
1914

2015
?>
2116
--EXPECT--
@@ -24,4 +19,4 @@ string(11) "åBäCöDü"
2419
string(11) "åBäCöDü"
2520
string(9) "BäCöDü"
2621
string(0) ""
27-
mb_strcut(): Argument #3 ($length) must be contained in argument #1 ($str)
22+
string(0) ""

‎ext/mbstring/tests/mb_strcut.phpt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ print MBStringChars(mb_strcut($euc_jp, 6, 5,'EUC-JP'), 'EUC-JP') . "\n";
2828
print MBStringChars(mb_strcut($euc_jp, 5, 5,'EUC-JP'), 'EUC-JP') . "\n";
2929
print MBStringChars(mb_strcut($euc_jp, 0, 100,'EUC-JP'), 'EUC-JP') . "\n";
3030

31-
try {
32-
mb_strcut($euc_jp, 100, 10,'EUC-JP');
33-
} catch (ValueError $exception) {
34-
echo $exception->getMessage() . "\n";
35-
}
31+
$str = mb_strcut($euc_jp, 100, 10,'EUC-JP');
32+
($str === "") ? print "OK\n" : print "No good\n";
3633

3734
$str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
3835
($str !== "") ? print "OK\n" : print "No good\n";
@@ -63,7 +60,7 @@ print MBStringChars(mb_strcut($utf16le, 1, 4, 'UTF-16LE'), 'UTF-16LE') . "\n";
6360
[a4ce cab8]
6461
[a4b3 a4ce]
6562
[30 31 32 33 a4b3 a4ce cab8 bbfa cef3 a4cf c6fc cbdc b8ec a4c7 a4b9 a1a3 45 55 43 2d 4a 50 a4f2 bbc8 a4c3 a4c6 a4a4 a4de a4b9 a1a3 c6fc cbdc b8ec a4cf cccc c5dd bdad a4a4 a1a3]
66-
mb_strcut(): Argument #3 ($length) must be contained in argument #1 ($str)
63+
OK
6764
OK
6865
== UTF-8 ==
6966
[]

‎ext/standard/math.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base)
877877

878878
/* Don't try to convert +/- infinity */
879879
if (fvalue == ZEND_INFINITY || fvalue == -ZEND_INFINITY) {
880-
zend_value_error("An infinite value cannot be converted to base " ZEND_LONG_FMT, base);
880+
zend_value_error("An infinite value cannot be converted to base %d", base);
881881
return NULL;
882882
}
883883

‎ext/standard/tests/file/fnmatch_maxpathlen.phpt

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ if (!function_exists('fnmatch')) die('skip fnmatch() function is not available')
77
--FILE--
88
<?php
99
$longstring = str_pad('blah', PHP_MAXPATHLEN);
10-
11-
try {
12-
fnmatch('blah', $longstring);
13-
} catch (ValueError $exception) {
14-
echo $exception->getMessage() . "\n";
15-
}
16-
17-
try {
18-
fnmatch($longstring, 'blah');
19-
} catch (ValueError $exception) {
20-
echo $exception->getMessage() . "\n";
21-
}
22-
10+
var_dump(fnmatch('blah', $longstring));
11+
var_dump(fnmatch($longstring, 'blah'));
2312
?>
2413
--EXPECTF--
25-
fnmatch(): Argument #1 ($pattern) must have a length less than %d bytes
26-
fnmatch(): Argument #2 ($filename) must have a length less than %d bytes
14+
Warning: fnmatch(): Filename exceeds the maximum allowed length of %d characters in %s on line %d
15+
bool(false)
16+
17+
Warning: fnmatch(): Pattern exceeds the maximum allowed length of %d characters in %s on line %d
18+
bool(false)

‎ext/standard/tests/mail/mail_basic7.phpt

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $to = 'user@example.com';
7474
$subject = 'Test Subject';
7575
$message = 'A Message';
7676
$additional_headers = array(
77-
'foo1' => array('foo1'=>'bar1'),
77+
'foo1' => array('foo2'=>'bar1'),
7878
'foo2' => array('foo2', array('foo3')),
7979
'foo3' => array(123),
8080
'foo4' => array(123.456),
@@ -153,26 +153,7 @@ TypeError: Header "orig-date" must be of type string, array given
153153

154154
************* TEST ******************
155155
-- All Mail Content Parameters --
156-
157-
Warning: mail(): Multiple header key must be numeric index (foo1) in %s on line %d
158-
159-
Warning: mail(): Multiple header values must be string (foo2) in %s on line %d
160-
161-
Warning: mail(): Multiple header values must be string (foo3) in %s on line %d
162-
163-
Warning: mail(): Multiple header values must be string (foo4) in %s on line %d
164-
165-
Warning: mail(): Multiple header values must be string (foo5) in %s on line %d
166-
167-
Warning: mail(): Multiple header values must be string (foo6) in %s on line %d
168-
169-
Warning: mail(): Multiple header values must be string (foo7) in %s on line %d
170-
bool(true)
171-
To: user@example.com
172-
Subject: Test Subject
173-
foo2: foo2
174-
175-
A Message
156+
TypeError: Header "foo1" must only contain numeric keys, "foo2" found
176157

177158

178159
************* TEST ******************

‎ext/standard/tests/misc/time_sleep_until_error1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ var_dump(time_sleep_until(time() -1));
1313

1414
?>
1515
--EXPECTF--
16-
Warning: time_sleep_until(): Argument #1 ($timestamp) must be a timestamp greater than or equal to the current time in %s on line %d
16+
Warning: time_sleep_until(): Argument #1 ($timestamp) must be greater than or equal to the current time in %s on line %d
1717
bool(false)

‎ext/standard/tests/streams/stream_get_contents_negative_length.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ stream_get_contents() with negative max length
66
$tmp = tmpfile();
77
fwrite($tmp, "abcd");
88
var_dump(stream_get_contents($tmp, 2, 1));
9-
var_dump(stream_get_contents($tmp, -2));
9+
10+
try {
11+
stream_get_contents($tmp, -2);
12+
} catch (ValueError $exception) {
13+
echo $exception->getMessage() . "\n";
14+
}
1015

1116
?>
1217
--EXPECTF--
1318
string(2) "bc"
14-
15-
Warning: stream_get_contents(): Argument #2 ($maxlength) must be greater than or equal to 0, or -1 in %s on line %d
16-
bool(false)
19+
stream_get_contents(): Argument #2 ($maxlength) must be greater than or equal to -1

‎ext/standard/tests/strings/bug44703.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100)));
2222

2323
?>
2424
--EXPECTF--
25-
Warning: htmlspecialchars(): Charset "1" is not supported, assuming utf-8 in %s on line %d
25+
Warning: htmlspecialchars(): Charset "1" is not supported, assuming UTF-8 in %s on line %d
2626
string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
2727

28-
Warning: htmlspecialchars(): Charset "12" is not supported, assuming utf-8 in %s on line %d
28+
Warning: htmlspecialchars(): Charset "12" is not supported, assuming UTF-8 in %s on line %d
2929
string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
3030

31-
Warning: htmlspecialchars(): Charset "125" is not supported, assuming utf-8 in %s on line %d
31+
Warning: htmlspecialchars(): Charset "125" is not supported, assuming UTF-8 in %s on line %d
3232
string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
3333
string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
3434

35-
Warning: htmlspecialchars(): Charset "12526" is not supported, assuming utf-8 in %s on line %d
35+
Warning: htmlspecialchars(): Charset "12526" is not supported, assuming UTF-8 in %s on line %d
3636
string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
3737
string(8) "&lt;&gt;"
3838

39-
Warning: htmlspecialchars(): Charset "8666" is not supported, assuming utf-8 in %s on line %d
39+
Warning: htmlspecialchars(): Charset "8666" is not supported, assuming UTF-8 in %s on line %d
4040
string(8) "&lt;&gt;"
4141
string(8) "&lt;&gt;"
4242
string(8) "&lt;&gt;"
4343
string(8) "&lt;&gt;"
4444

45-
Warning: htmlspecialchars(): Charset "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is not supported, assuming utf-8 in %s on line %d
45+
Warning: htmlspecialchars(): Charset "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is not supported, assuming UTF-8 in %s on line %d
4646
string(8) "&lt;&gt;"

‎ext/sysvshm/tests/001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ echo "Done\n";
3434
?>
3535
--EXPECTF--
3636
ftok(): Argument #1 ($pathname) cannot be empty
37-
ftok(): Argument #2 ($proj) must be 1 byte long
38-
ftok(): Argument #2 ($proj) must be 1 byte long
37+
ftok(): Argument #2 ($proj) must be a single character
38+
ftok(): Argument #2 ($proj) must be a single character
3939

4040
Warning: ftok(): ftok() failed - No such file or directory in %s on line %d
4141
int(-1)

0 commit comments

Comments
 (0)