Skip to content

Commit 92fd965

Browse files
villfavillfa
committed
Add more CONFLICTS tags
Closes GH-4908.
1 parent 49fcbb4 commit 92fd965

18 files changed

+32
-52
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Test filegroup() function: usage variations - invalid filenames
33
--CREDITS--
44
Dave Kelsey <d_kelsey@uk.ibm.com>
5+
--CONFLICTS--
6+
obscure_filename
57
--FILE--
68
<?php
79
/* Prototype: int filegroup ( string $filename )
@@ -35,8 +37,6 @@ foreach( $filenames as $filename ) {
3537
clearstatcache();
3638
}
3739
fclose($file_handle);
38-
39-
echo "\n*** Done ***";
4040
?>
4141
--CLEAN--
4242
<?php
@@ -66,5 +66,3 @@ bool(false)
6666

6767
Warning: filegroup(): stat failed for 0 in %s on line %d
6868
bool(false)
69-
70-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Test fileinode() function: usage variations - invalid filenames
33
--CREDITS--
44
Dave Kelsey <d_kelsey@uk.ibm.com>
5+
--CONFLICTS--
6+
obscure_filename
57
--FILE--
68
<?php
79
/*
@@ -36,8 +38,6 @@ foreach( $filenames as $filename ) {
3638
clearstatcache();
3739
}
3840
fclose($file_handle);
39-
40-
echo "\n*** Done ***";
4141
?>
4242
--CLEAN--
4343
<?php
@@ -67,5 +67,3 @@ bool(false)
6767

6868
Warning: fileinode(): stat failed for 0 in %s on line %d
6969
bool(false)
70-
71-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Test fileowner() function: usage variations - invalid filenames
33
--CREDITS--
44
Dave Kelsey <d_kelsey@uk.ibm.com>
5+
--CONFLICTS--
6+
obscure_filename
57
--FILE--
68
<?php
79
/* Prototype: int fileowner ( string $filename )
@@ -36,8 +38,6 @@ foreach( $filenames as $filename ) {
3638
clearstatcache();
3739
}
3840
fclose($file_handle);
39-
40-
echo "\n*** Done ***";
4141
?>
4242
--CLEAN--
4343
<?php
@@ -67,5 +67,3 @@ bool(false)
6767

6868
Warning: fileowner(): stat failed for 0 in %s on line %d
6969
bool(false)
70-
71-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Test fileperms() function: usage variations - invalid filenames
33
--CREDITS--
44
Dave Kelsey <d_kelsey@uk.ibm.com>
5+
--CONFLICTS--
6+
obscure_filename
57
--FILE--
68
<?php
79
/* Prototype: int fileperms ( string $filename )
@@ -35,8 +37,6 @@ foreach( $filenames as $filename ) {
3537
clearstatcache();
3638
}
3739
fclose($file_handle);
38-
39-
echo "\n*** Done ***";
4040
?>
4141
--CLEAN--
4242
<?php
@@ -66,5 +66,3 @@ bool(false)
6666

6767
Warning: fileperms(): stat failed for 0 in %s on line %d
6868
bool(false)
69-
70-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test flock() function: Error conditions
3+
--CONFLICTS--
4+
obscure_filename
35
--FILE--
46
<?php
57
/*
@@ -47,8 +49,6 @@ var_dump(flock($fp));
4749

4850
/* No.of args greater than expected */
4951
var_dump(flock($fp, "", $var, ""));
50-
51-
echo "\n*** Done ***\n";
5252
?>
5353
--CLEAN--
5454
<?php
@@ -108,5 +108,3 @@ NULL
108108

109109
Warning: flock() expects at most 3 parameters, 4 given in %s on line %d
110110
NULL
111-
112-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test is_dir() function: usage variations - invalid arguments
3+
--CONFLICTS--
4+
obscure_filename
35
--FILE--
46
<?php
57
/* Prototype: bool is_dir ( string $dirname );
@@ -31,8 +33,6 @@ foreach($dirnames as $dirname) {
3133
var_dump( is_dir($dirname) );
3234
}
3335
closedir($dir_handle);
34-
35-
echo "\n*** Done ***";
3636
?>
3737
--EXPECTF--
3838
*** Testing is_dir() with Invalid arguments: expected bool(false) ***
@@ -46,5 +46,3 @@ Warning: is_dir() expects parameter 1 to be a valid path, resource given in %s o
4646
NULL
4747
bool(false)
4848
bool(false)
49-
50-
*** Done ***

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test is_file() function: usage variations - invalid filenames
3+
--CONFLICTS--
4+
obscure_filename
35
--FILE--
46
<?php
57
/* Prototype: bool is_file ( string $filename );

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Test is_writable() and its alias is_writeable() function: usage variations - inv
44
<?php
55
require __DIR__ . '/../skipif_root.inc';
66
?>
7+
--CONFLICTS--
8+
obscure_filename
79
--FILE--
810
<?php
911
/* Prototype: bool is_writable ( string $filename );
@@ -35,8 +37,6 @@ foreach( $misc_files as $misc_file ) {
3537
var_dump( is_writeable($misc_file) );
3638
clearstatcache();
3739
}
38-
39-
echo "Done\n";
4040
?>
4141
--EXPECTF--
4242
*** Testing is_writable(): usage variations ***
@@ -64,4 +64,3 @@ Warning: is_writeable() expects parameter 1 to be a valid path, array given in %
6464
NULL
6565
bool(false)
6666
bool(false)
67-
Done

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
77
if (substr(PHP_OS, 0, 3) == 'WIN') {
88
die('skip ... not for Windows');
99
}
10+
--CONFLICTS--
11+
obscure_filename
1012
--FILE--
1113
<?php
1214
/* Prototype: array lstat ( string $filename );
@@ -28,7 +30,6 @@ var_dump(lstat(false));
2830
var_dump(lstat(''));
2931
var_dump(lstat(' '));
3032
var_dump(lstat('|'));
31-
echo "Done";
3233
?>
3334
--EXPECTF--
3435
*** testing stat ***
@@ -51,4 +52,3 @@ bool(false)
5152

5253
Warning: lstat(): Lstat failed for | in %s on line %d
5354
bool(false)
54-
Done

‎ext/standard/tests/file/readfile_variation10-win32.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
77
if(substr(PHP_OS, 0, 3) != "WIN")
88
die("skip run only on Windows");
99
?>
10+
--CONFLICTS--
11+
obscure_filename
1012
--FILE--
1113
<?php
1214
/* Prototype : int readfile(string filename [, bool use_include_path[, resource context]])
@@ -41,7 +43,6 @@ foreach($names_arr as $key => $value) {
4143
};
4244

4345
?>
44-
===Done===
4546
--EXPECTF--
4647
*** Testing readfile() : variation ***
4748

@@ -84,4 +85,3 @@ Warning: readfile(/no/such/file/dir): failed to open stream: No such file or dir
8485
-- Filename: php/php --
8586

8687
Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
87-
===Done===

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

-9 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Test readlink() function: usage variations - invalid filenames
33
--CREDITS--
44
Dave Kelsey <d_kelsey@uk.ibm.com>
5+
--CONFLICTS--
6+
obscure_filename
57
--FILE--
68
<?php
79
/* Prototype: string readlink ( string $path );
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
3335
clearstatcache();
3436
}
3537
fclose($file_handle);
36-
37-
echo "\n*** Done ***";
3838
?>
3939
--CLEAN--
4040
<?php
@@ -67,5 +67,3 @@ bool(false)
6767

6868
Warning: readlink(): %s in %s on line %d
6969
bool(false)
70-
71-
*** Done ***

‎ext/standard/tests/file/rename_variation13-win32.phpt

-8 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
77
if(substr(PHP_OS, 0, 3) == "WIN")
88
die("skip. Not for Windows");
99
?>
10+
--CONFLICTS--
11+
obscure_filename
1012
--FILE--
1113
<?php
1214
/* Prototype : bool rename(string old_name, string new_name[, resource context])
@@ -57,7 +59,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
5759
}
5860

5961
rmdir($file_path);
60-
echo "\n*** Done ***\n";
6162
?>
6263
--EXPECTF--
6364
*** Testing rename() with obscure files ***
@@ -129,5 +130,3 @@ bool(false)
129130

130131
Warning: rename(php/php,%s/renameVar13/afile.tmp): %s directory in %s on line %d
131132
bool(false)
132-
133-
*** Done ***

‎ext/standard/tests/file/tempnam_variation3-win32.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - obscure prefixes
55
if(substr(PHP_OS, 0, 3) != "WIN")
66
die("skip run only on Windows");
77
?>
8+
--CONFLICTS--
9+
obscure_filename
810
--FILE--
911
<?php
1012
/* Prototype: string tempnam ( string $dir, string $prefix );
@@ -84,7 +86,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
8486
}
8587

8688
rmdir($file_path);
87-
echo "\n*** Done. ***\n";
8889
?>
8990
--EXPECTF--
9091
*** Testing tempnam() with obscure prefixes ***
@@ -116,5 +117,3 @@ OK
116117
OK
117118
-- Iteration 9 --
118119
OK
119-
120-
*** Done. ***

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - obscure prefixes
55
if(substr(PHP_OS, 0, 3) == "WIN")
66
die("skip Do not run on Windows");
77
?>
8+
--CONFLICTS--
9+
obscure_filename
810
--FILE--
911
<?php
1012
/* Prototype: string tempnam ( string $dir, string $prefix );
@@ -71,7 +73,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
7173
}
7274

7375
rmdir($file_path);
74-
echo "\n*** Done ***\n";
7576
?>
7677
--EXPECTF--
7778
*** Testing tempnam() with obscure prefixes ***
@@ -119,5 +120,3 @@ File created in => directory specified
119120
File name is => %s/php%s
120121
File permissions are => 100600
121122
File created in => directory specified
122-
123-
*** Done ***

‎ext/standard/tests/file/tempnam_variation7-win32.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - invalid/non-existing dir
55
if(substr(PHP_OS, 0, 3) != "WIN")
66
die("skip Only run on Windows");
77
?>
8+
--CONFLICTS--
9+
obscure_filename
810
--FILE--
911
<?php
1012
/* Prototype: string tempnam ( string $dir, string $prefix );
@@ -59,8 +61,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
5961

6062
unlink($file_name);
6163
}
62-
63-
echo "\n*** Done ***\n";
6464
?>
6565
--EXPECTF--
6666
*** Testing tempnam() with invalid/non-existing directory names ***
@@ -118,5 +118,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
118118
File name is => %s%et%s
119119
File permissions are => 100666
120120
File created in => temp dir
121-
122-
*** Done ***

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - invalid/non-existing dir
55
if(substr(PHP_OS, 0, 3) == "WIN")
66
die("skip Do not run on Windows");
77
?>
8+
--CONFLICTS--
9+
obscure_filename
810
--FILE--
911
<?php
1012
/* Prototype: string tempnam ( string $dir, string $prefix );
@@ -64,8 +66,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
6466

6567
unlink($file_name);
6668
}
67-
68-
echo "\n*** Done ***\n";
6969
?>
7070
--EXPECTF--
7171
*** Testing tempnam() with invalid/non-existing directory names ***
@@ -123,5 +123,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
123123
File name is => %s/tempnam_variation3.tmp%s
124124
File permissions are => 100600
125125
File created in => temp dir
126-
127-
*** Done ***

0 commit comments

Comments
 (0)