Merge branch 'PHP-7.4'

18 files changed, 34 insertions, 53 deletions

diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt
index ee232e4214..6c8b1826c3 100644
--- a/ext/standard/tests/file/filegroup_variation2.phpt
+++ b/ext/standard/tests/file/filegroup_variation2.phpt
@@ -2,6 +2,8 @@
 Test filegroup() function: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: int filegroup ( string $filename )
@@ -32,8 +34,6 @@ foreach( $filenames as $filename ) {
   var_dump( filegroup($filename) );
   clearstatcache();
 }
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -60,5 +60,3 @@ bool(false)
 
 Warning: filegroup(): stat failed for 0 in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt
index f86a0b89a6..07b76bb62c 100644
--- a/ext/standard/tests/file/fileinode_variation2.phpt
+++ b/ext/standard/tests/file/fileinode_variation2.phpt
@@ -2,6 +2,8 @@
 Test fileinode() function: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /*
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
   var_dump( fileinode($filename) );
   clearstatcache();
 }
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -61,5 +61,3 @@ bool(false)
 
 Warning: fileinode(): stat failed for 0 in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt
index b6d5afaee8..8de42cb494 100644
--- a/ext/standard/tests/file/fileowner_variation2.phpt
+++ b/ext/standard/tests/file/fileowner_variation2.phpt
@@ -2,6 +2,8 @@
 Test fileowner() function: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: int fileowner ( string $filename )
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
   var_dump( fileowner($filename) );
   clearstatcache();
 }
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -61,5 +61,3 @@ bool(false)
 
 Warning: fileowner(): stat failed for 0 in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt
index e626eab361..4eee45d869 100644
--- a/ext/standard/tests/file/fileperms_variation2.phpt
+++ b/ext/standard/tests/file/fileperms_variation2.phpt
@@ -2,6 +2,8 @@
 Test fileperms() function: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: int fileperms ( string $filename )
@@ -32,8 +34,6 @@ foreach( $filenames as $filename ) {
   var_dump( fileperms($filename) );
   clearstatcache();
 }
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -60,5 +60,3 @@ bool(false)
 
 Warning: fileperms(): stat failed for 0 in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 470c6a536f..4069dd2aa0 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test flock() function: Error conditions
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /*
@@ -46,8 +48,6 @@ try {
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
-
-echo "\n*** Done ***\n";
 ?>
 --CLEAN--
 <?php
@@ -88,5 +88,3 @@ flock() expects parameter 2 to be int, string given
 --- Iteration 8 ---
 flock() expects parameter 2 to be int, string given
 flock(): supplied resource is not a valid stream resource
-
-*** Done ***
diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index 060739ff3d..e82d9ae034 100644
--- a/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test is_dir() function: usage variations - invalid arguments
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: bool is_dir ( string $dirname );
@@ -27,8 +29,6 @@ $dirnames = array(
 foreach($dirnames as $dirname) {
   var_dump( is_dir($dirname) );
 }
-
-echo "\n*** Done ***";
 ?>
 --EXPECTF--
 *** Testing is_dir() with Invalid arguments: expected bool(false) ***
@@ -39,5 +39,3 @@ bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index 884f292b26..d33b01dfb3 100644
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test is_file() function: usage variations - invalid filenames
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: bool is_file ( string $filename );
diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt
index b55a193fce..c5843a5abf 100644
--- a/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@ -4,6 +4,8 @@ Test is_writable() and its alias is_writeable() function: usage variations - inv
 <?php
 require __DIR__ . '/../skipif_root.inc';
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: bool is_writable ( string $filename );
@@ -34,8 +36,6 @@ foreach( $misc_files as $misc_file ) {
   var_dump( is_writeable($misc_file) );
   clearstatcache();
 }
-
-echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing is_writable(): usage variations ***
@@ -57,4 +57,3 @@ bool(false)
 bool(false)
 bool(false)
 bool(false)
-Done
diff --git a/ext/standard/tests/file/lstat_stat_variation22.phpt b/ext/standard/tests/file/lstat_stat_variation22.phpt
index f9d9047188..3558397131 100644
--- a/ext/standard/tests/file/lstat_stat_variation22.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation22.phpt
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip ... not for Windows');
 }
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: array lstat ( string $filename );
@@ -28,7 +30,6 @@ var_dump(lstat(false));
 var_dump(lstat(''));
 var_dump(lstat(' '));
 var_dump(lstat('|'));
-echo "Done";
 ?>
 --EXPECTF--
 *** testing stat ***
@@ -51,4 +52,3 @@ bool(false)
 
 Warning: lstat(): Lstat failed for | in %s on line %d
 bool(false)
-Done
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
index 14c73ba179..88349e18d9 100644
--- a/ext/standard/tests/file/readfile_variation10-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip run only on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt
index 5a0070c04f..351b03d565 100644
--- a/ext/standard/tests/file/readfile_variation10.phpt
+++ b/ext/standard/tests/file/readfile_variation10.phpt
diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt
index 2971c1e146..276f894432 100644
--- a/ext/standard/tests/file/readlink_variation1.phpt
+++ b/ext/standard/tests/file/readlink_variation1.phpt
@@ -2,6 +2,8 @@
 Test readlink() function: usage variations - invalid filenames
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: string readlink ( string $path );
@@ -30,8 +32,6 @@ foreach( $filenames as $filename ) {
   var_dump( readlink($filename) );
   clearstatcache();
 }
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -61,5 +61,3 @@ bool(false)
 
 Warning: readlink(): %s in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
index c0299c27ab..83a4a88b29 100644
--- a/ext/standard/tests/file/rename_variation13-win32.phpt
+++ b/ext/standard/tests/file/rename_variation13-win32.phpt
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip run only on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
@@ -63,7 +65,6 @@ for( $i=0; $i < count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing rename() with obscure files ***
@@ -119,5 +120,3 @@ bool(false)
 
 Warning: rename(php/php,%safile.tmp): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt
index 209c950170..3e35f179a8 100644
--- a/ext/standard/tests/file/rename_variation13.phpt
+++ b/ext/standard/tests/file/rename_variation13.phpt
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip. Not for Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
@@ -55,7 +57,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing rename() with obscure files ***
@@ -109,5 +110,3 @@ bool(false)
 
 Warning: rename(php/php,%s/renameVar13/afile.tmp): %s directory in %s on line %d
 bool(false)
-
-*** Done ***
diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
index ac22017a65..33965b4f26 100644
--- a/ext/standard/tests/file/tempnam_variation3-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - obscure prefixes
 if(substr(PHP_OS, 0, 3) != "WIN")
 	die("skip run only on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -89,7 +91,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done. ***\n";
 ?>
 --EXPECTF--
 *** Testing tempnam() with obscure prefixes ***
@@ -116,5 +117,3 @@ tempnam() expects parameter 2 to be a valid path, array given
 OK
 -- Iteration 9 --
 OK
-
-*** Done. ***
diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt
index 0a267c509e..78ef3bbaca 100644
--- a/ext/standard/tests/file/tempnam_variation3.phpt
+++ b/ext/standard/tests/file/tempnam_variation3.phpt
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - obscure prefixes
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip Do not run on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -76,7 +78,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing tempnam() with obscure prefixes ***
@@ -116,5 +117,3 @@ File created in => directory specified
 File name is => %s/php%s
 File permissions are => 100600
 File created in => directory specified
-
-*** Done ***
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
index f4b3cf016c..bfc23a9541 100644
--- a/ext/standard/tests/file/tempnam_variation7-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - invalid/non-existing dir
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Only run on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -64,8 +66,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 
 	unlink($file_name);
 }
-
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing tempnam() with invalid/non-existing directory names ***
@@ -115,5 +115,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
 File name is => %s%et%s
 File permissions are => 100666
 File created in => temp dir
-
-*** Done ***
diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index 680e207718..a385fe43b6 100644
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -5,6 +5,8 @@ Test tempnam() function: usage variations - invalid/non-existing dir
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip Do not run on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -69,8 +71,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 
   unlink($file_name);
 }
-
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing tempnam() with invalid/non-existing directory names ***
@@ -120,5 +120,3 @@ Notice: tempnam(): file created in the system's temporary directory in %stempnam
 File name is => %s/tempnam_variation3.tmp%s
 File permissions are => 100600
 File created in => temp dir
-
-*** Done ***