Skip to content

Commit d65e59d

Browse files
villfavillfa
committed
Merge branch 'PHP-7.4'
2 parents 36afe4e + 92fd965 commit d65e59d

18 files changed

+34
-53
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 )
@@ -32,8 +34,6 @@ foreach( $filenames as $filename ) {
3234
var_dump( filegroup($filename) );
3335
clearstatcache();
3436
}
35-
36-
echo "\n*** Done ***";
3737
?>
3838
--CLEAN--
3939
<?php
@@ -60,5 +60,3 @@ bool(false)
6060

6161
Warning: filegroup(): stat failed for 0 in %s on line %d
6262
bool(false)
63-
64-
*** 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
/*
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
3335
var_dump( fileinode($filename) );
3436
clearstatcache();
3537
}
36-
37-
echo "\n*** Done ***";
3838
?>
3939
--CLEAN--
4040
<?php
@@ -61,5 +61,3 @@ bool(false)
6161

6262
Warning: fileinode(): stat failed for 0 in %s on line %d
6363
bool(false)
64-
65-
*** 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 )
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
3335
var_dump( fileowner($filename) );
3436
clearstatcache();
3537
}
36-
37-
echo "\n*** Done ***";
3838
?>
3939
--CLEAN--
4040
<?php
@@ -61,5 +61,3 @@ bool(false)
6161

6262
Warning: fileowner(): stat failed for 0 in %s on line %d
6363
bool(false)
64-
65-
*** 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 )
@@ -32,8 +34,6 @@ foreach( $filenames as $filename ) {
3234
var_dump( fileperms($filename) );
3335
clearstatcache();
3436
}
35-
36-
echo "\n*** Done ***";
3737
?>
3838
--CLEAN--
3939
<?php
@@ -60,5 +60,3 @@ bool(false)
6060

6161
Warning: fileperms(): stat failed for 0 in %s on line %d
6262
bool(false)
63-
64-
*** 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
/*
@@ -46,8 +48,6 @@ try {
4648
} catch (TypeError $e) {
4749
echo $e->getMessage(), "\n";
4850
}
49-
50-
echo "\n*** Done ***\n";
5151
?>
5252
--CLEAN--
5353
<?php
@@ -88,5 +88,3 @@ flock() expects parameter 2 to be int, string given
8888
--- Iteration 8 ---
8989
flock() expects parameter 2 to be int, string given
9090
flock(): supplied resource is not a valid stream resource
91-
92-
*** 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 );
@@ -27,8 +29,6 @@ $dirnames = array(
2729
foreach($dirnames as $dirname) {
2830
var_dump( is_dir($dirname) );
2931
}
30-
31-
echo "\n*** Done ***";
3232
?>
3333
--EXPECTF--
3434
*** Testing is_dir() with Invalid arguments: expected bool(false) ***
@@ -39,5 +39,3 @@ bool(false)
3939
bool(false)
4040
bool(false)
4141
bool(false)
42-
43-
*** 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 );
@@ -34,8 +36,6 @@ foreach( $misc_files as $misc_file ) {
3436
var_dump( is_writeable($misc_file) );
3537
clearstatcache();
3638
}
37-
38-
echo "Done\n";
3939
?>
4040
--EXPECTF--
4141
*** Testing is_writable(): usage variations ***
@@ -57,4 +57,3 @@ bool(false)
5757
bool(false)
5858
bool(false)
5959
bool(false)
60-
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 & 0 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]])

‎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 );
@@ -30,8 +32,6 @@ foreach( $filenames as $filename ) {
3032
var_dump( readlink($filename) );
3133
clearstatcache();
3234
}
33-
34-
echo "\n*** Done ***";
3535
?>
3636
--CLEAN--
3737
<?php
@@ -61,5 +61,3 @@ bool(false)
6161

6262
Warning: readlink(): %s in %s on line %d
6363
bool(false)
64-
65-
*** Done ***

‎ext/standard/tests/file/rename_variation13-win32.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 run only on Windows");
99
?>
10+
--CONFLICTS--
11+
obscure_filename
1012
--FILE--
1113
<?php
1214
/* Prototype : bool rename(string old_name, string new_name[, resource context])
@@ -63,7 +65,6 @@ for( $i=0; $i < count($names_arr); $i++ ) {
6365
}
6466

6567
rmdir($file_path);
66-
echo "\n*** Done ***\n";
6768
?>
6869
--EXPECTF--
6970
*** Testing rename() with obscure files ***
@@ -119,5 +120,3 @@ bool(false)
119120

120121
Warning: rename(php/php,%safile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line %d
121122
bool(false)
122-
123-
*** Done ***

‎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])
@@ -55,7 +57,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
5557
}
5658

5759
rmdir($file_path);
58-
echo "\n*** Done ***\n";
5960
?>
6061
--EXPECTF--
6162
*** Testing rename() with obscure files ***
@@ -109,5 +110,3 @@ bool(false)
109110

110111
Warning: rename(php/php,%s/renameVar13/afile.tmp): %s directory in %s on line %d
111112
bool(false)
112-
113-
*** 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 );
@@ -89,7 +91,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
8991
}
9092

9193
rmdir($file_path);
92-
echo "\n*** Done. ***\n";
9394
?>
9495
--EXPECTF--
9596
*** Testing tempnam() with obscure prefixes ***
@@ -116,5 +117,3 @@ tempnam() expects parameter 2 to be a valid path, array given
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 );
@@ -76,7 +78,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
7678
}
7779

7880
rmdir($file_path);
79-
echo "\n*** Done ***\n";
8081
?>
8182
--EXPECTF--
8283
*** Testing tempnam() with obscure prefixes ***
@@ -116,5 +117,3 @@ File created in => directory specified
116117
File name is => %s/php%s
117118
File permissions are => 100600
118119
File created in => directory specified
119-
120-
*** 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 );
@@ -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 ***
@@ -115,5 +115,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
115115
File name is => %s%et%s
116116
File permissions are => 100666
117117
File created in => temp dir
118-
119-
*** 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 );
@@ -69,8 +71,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
6971

7072
unlink($file_name);
7173
}
72-
73-
echo "\n*** Done ***\n";
7474
?>
7575
--EXPECTF--
7676
*** Testing tempnam() with invalid/non-existing directory names ***
@@ -120,5 +120,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
120120
File name is => %s/tempnam_variation3.tmp%s
121121
File permissions are => 100600
122122
File created in => temp dir
123-
124-
*** Done ***

0 commit comments

Comments
 (0)