Skip to content

Commit 1f29b78

Browse files
nikicnikic
committed
finfo test updates
1 parent 5d6e116 commit 1f29b78

File tree

8 files changed

+27
-89
lines changed

8 files changed

+27
-89
lines changed

‎ext/curl/tests/curl_setopt_error.phpt

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,17 @@ Paul Sohier
99
<?php
1010
echo "*** curl_setopt() call with incorrect parameters\n";
1111
$ch = curl_init();
12-
curl_setopt();
13-
curl_setopt(false);
1412

15-
curl_setopt($ch);
16-
curl_setopt($ch, false);
17-
curl_setopt($ch, -10);
18-
curl_setopt($ch, '');
19-
curl_setopt($ch, 1, false);
13+
try {
14+
curl_setopt($ch, '', false);
15+
} catch (TypeError $e) {
16+
echo $e->getMessage(), "\n";
17+
}
2018

21-
curl_setopt(false, false, false);
22-
curl_setopt($ch, '', false);
23-
curl_setopt($ch, 1, '');
2419
curl_setopt($ch, -10, 0);
2520
?>
2621
--EXPECTF--
2722
*** curl_setopt() call with incorrect parameters
28-
29-
Warning: curl_setopt() expects exactly 3 parameters, 0 given in %s on line %d
30-
31-
Warning: curl_setopt() expects exactly 3 parameters, 1 given in %s on line %d
32-
33-
Warning: curl_setopt() expects exactly 3 parameters, 1 given in %s on line %d
34-
35-
Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
36-
37-
Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
38-
39-
Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
40-
41-
Warning: curl_setopt() expects parameter 1 to be resource, bool given in %s on line %d
42-
43-
Warning: curl_setopt() expects parameter 2 to be int, string given in %s on line %d
23+
curl_setopt() expects parameter 2 to be int, string given
4424

4525
Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d

‎ext/fileinfo/tests/bug71527-mb.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ USE_ZEND_ALLOC=0
99
--FILE--
1010
<?php
1111
$finfo = finfo_open(FILEINFO_NONE, dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug71527私はガラスを食べられます.magic");
12-
$info = finfo_file($finfo, __FILE__);
13-
var_dump($info);
12+
var_dump($finfo);
1413
?>
1514
--EXPECTF--
1615
Warning: finfo_open(): Failed to load magic database at '%sbug71527私はガラスを食べられます.magic'. in %sbug71527-mb.php on line %d
17-
18-
Warning: finfo_file() expects parameter 1 to be resource, bool given in %sbug71527-mb.php on line %d
1916
bool(false)

‎ext/fileinfo/tests/bug71527.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ USE_ZEND_ALLOC=0
99
--FILE--
1010
<?php
1111
$finfo = finfo_open(FILEINFO_NONE, dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug71527.magic");
12-
$info = finfo_file($finfo, __FILE__);
13-
var_dump($info);
12+
var_dump($finfo);
1413
?>
1514
--EXPECTF--
1615
Warning: finfo_open(): Failed to load magic database at '%sbug71527.magic'. in %sbug71527.php on line %d
17-
18-
Warning: finfo_file() expects parameter 1 to be resource, bool given in %sbug71527.php on line %d
1916
bool(false)

‎ext/fileinfo/tests/finfo_close_error.phpt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,15 @@ Test finfo_close() function : error conditions
1212

1313
echo "*** Testing finfo_close() : error conditions ***\n";
1414

15-
$magicFile = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'magic';
16-
$finfo = finfo_open( FILEINFO_MIME, $magicFile );
17-
$fp = fopen( __FILE__, 'r' );
18-
19-
echo "\n-- Testing finfo_close() function with Zero arguments --\n";
20-
var_dump( finfo_close() );
21-
22-
echo "\n-- Testing finfo_close() function with more than expected no. of arguments --\n";
23-
var_dump( finfo_close( $finfo, '10') );
24-
2515
echo "\n-- Testing finfo_close() function with wrong resource type --\n";
16+
$fp = fopen( __FILE__, 'r' );
2617
var_dump( finfo_close( $fp ) );
2718

2819
?>
2920
===DONE===
3021
--EXPECTF--
3122
*** Testing finfo_close() : error conditions ***
3223

33-
-- Testing finfo_close() function with Zero arguments --
34-
35-
Warning: finfo_close() expects exactly 1 parameter, 0 given in %s on line %d
36-
bool(false)
37-
38-
-- Testing finfo_close() function with more than expected no. of arguments --
39-
40-
Warning: finfo_close() expects exactly 1 parameter, 2 given in %s on line %d
41-
bool(false)
42-
4324
-- Testing finfo_close() function with wrong resource type --
4425

4526
Warning: finfo_close(): supplied resource is not a valid file_info resource in %s on line %d

‎ext/fileinfo/tests/finfo_open_001.phpt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ finfo_open(): Testing magic_file names
55
--FILE--
66
<?php
77

8-
var_dump(finfo_open(FILEINFO_MIME, "\0"));
8+
try {
9+
var_dump(finfo_open(FILEINFO_MIME, "\0"));
10+
} catch (TypeError $e) {
11+
echo $e->getMessage(), "\n";
12+
}
13+
914
var_dump(finfo_open(FILEINFO_MIME, NULL));
1015
var_dump(finfo_open(FILEINFO_MIME, ''));
1116
var_dump(finfo_open(FILEINFO_MIME, 123));
@@ -14,8 +19,7 @@ var_dump(finfo_open(FILEINFO_MIME, '/foo/bar/inexistent'));
1419

1520
?>
1621
--EXPECTF--
17-
Warning: finfo_open() expects parameter 2 to be a valid path, string given in %s on line %d
18-
bool(false)
22+
finfo_open() expects parameter 2 to be a valid path, string given
1923
resource(%d) of type (file_info)
2024
resource(%d) of type (file_info)
2125

‎ext/fileinfo/tests/finfo_open_error.phpt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
1515
echo "*** Testing finfo_open() : error functionality ***\n";
1616

1717
var_dump( finfo_open( FILEINFO_MIME, 'foobarfile' ) );
18-
var_dump( finfo_open( array(), $magicFile ) );
19-
var_dump( finfo_open( FILEINFO_MIME, $magicFile, 'extraArg' ) );
2018
var_dump( finfo_open( PHP_INT_MAX - 1, $magicFile ) );
21-
var_dump( finfo_open( 'foobar' ) );
19+
20+
try {
21+
var_dump( finfo_open( 'foobar' ) );
22+
} catch (TypeError $e) {
23+
echo $e->getMessage(), "\n";
24+
}
2225

2326
try {
2427
var_dump( new finfo('foobar') );
@@ -31,23 +34,15 @@ try {
3134
--EXPECTF--
3235
*** Testing finfo_open() : error functionality ***
3336

34-
Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line 12
37+
Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
3538

36-
Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line 12
39+
Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d
3740

38-
Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line 12
41+
Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line %d
3942
bool(false)
4043

41-
Warning: finfo_open() expects parameter 1 to be int, array given in %sfinfo_open_error.php on line 13
42-
bool(false)
43-
44-
Warning: finfo_open() expects at most 2 parameters, 3 given in %sfinfo_open_error.php on line 14
45-
bool(false)
46-
47-
Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_open_error.php on line 15
44+
Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_open_error.php on line %d
4845
resource(6) of type (file_info)
49-
50-
Warning: finfo_open() expects parameter 1 to be int, string given in %sfinfo_open_error.php on line 16
51-
bool(false)
46+
finfo_open() expects parameter 1 to be int, string given
5247
finfo::__construct() expects parameter 1 to be int, string given
5348
===DONE===

‎ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,18 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
1717

1818
var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
1919
var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
20-
var_dump( finfo_set_flags() );
2120

2221
finfo_close( $finfo );
2322

2423
// OO way
2524
$finfo = new finfo( FILEINFO_NONE, $magicFile );
2625
var_dump( $finfo->set_flags( FILEINFO_MIME ) );
27-
var_dump( $finfo->set_flags() );
2826

2927
?>
3028
===DONE===
3129
--EXPECTF--
3230
*** Testing finfo_set_flags() : basic functionality ***
3331
bool(true)
3432
bool(true)
35-
36-
Warning: finfo_set_flags() expects exactly 2 parameters, 0 given in %s on line %d
37-
bool(false)
3833
bool(true)
39-
40-
Warning: finfo::set_flags() expects exactly 1 parameter, 0 given in %s on line %d
41-
bool(false)
4234
===DONE===

‎ext/fileinfo/tests/finfo_set_flags_basic.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,18 @@ echo "*** Testing finfo_set_flags() : basic functionality ***\n";
1717

1818
var_dump( finfo_set_flags( $finfo, FILEINFO_NONE ) );
1919
var_dump( finfo_set_flags( $finfo, FILEINFO_SYMLINK ) );
20-
var_dump( finfo_set_flags() );
2120

2221
finfo_close( $finfo );
2322

2423
// OO way
2524
$finfo = new finfo( FILEINFO_NONE, $magicFile );
2625
var_dump( $finfo->set_flags( FILEINFO_MIME ) );
27-
var_dump( $finfo->set_flags() );
2826

2927
?>
3028
===DONE===
3129
--EXPECTF--
3230
*** Testing finfo_set_flags() : basic functionality ***
3331
bool(true)
3432
bool(true)
35-
36-
Warning: finfo_set_flags() expects exactly 2 parameters, 0 given in %s on line %d
37-
bool(false)
3833
bool(true)
39-
40-
Warning: finfo::set_flags() expects exactly 1 parameter, 0 given in %s on line %d
41-
bool(false)
4234
===DONE===

0 commit comments

Comments
 (0)