From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Wed, 13 Nov 2019 19:59:23 +0000 (+0100)
Subject: Add more CONFLICTS tags
X-Git-Tag: php-7.4.7RC1~504
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92fd96531cdc04bb59f216aef22360e3ab96ae37;p=php

Add more CONFLICTS tags

Closes GH-4908.
---

diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt
index 71def66e29..030f97a0f8 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 )
@@ -35,8 +37,6 @@ foreach( $filenames as $filename ) {
   clearstatcache();
 }
 fclose($file_handle);
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -66,5 +66,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 3ccfc76476..71cdc395a6 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
 /*
@@ -36,8 +38,6 @@ foreach( $filenames as $filename ) {
   clearstatcache();
 }
 fclose($file_handle);
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -67,5 +67,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 8a943e549e..4be8f58682 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 )
@@ -36,8 +38,6 @@ foreach( $filenames as $filename ) {
   clearstatcache();
 }
 fclose($file_handle);
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -67,5 +67,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 c8d62fd5bd..d45da017cc 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 )
@@ -35,8 +37,6 @@ foreach( $filenames as $filename ) {
   clearstatcache();
 }
 fclose($file_handle);
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -66,5 +66,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 26a8b3d01f..d6f1b3f59b 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
 /*
@@ -47,8 +49,6 @@ var_dump(flock($fp));
 
 /* No.of args greater than expected */
 var_dump(flock($fp, "", $var, ""));
-
-echo "\n*** Done ***\n";
 ?>
 --CLEAN--
 <?php
@@ -108,5 +108,3 @@ NULL
 
 Warning: flock() expects at most 3 parameters, 4 given in %s on line %d
 NULL
-
-*** Done ***
diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index 86c40da0eb..3f9d196e64 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 );
@@ -31,8 +33,6 @@ foreach($dirnames as $dirname) {
   var_dump( is_dir($dirname) );
 }
 closedir($dir_handle);
-
-echo "\n*** Done ***";
 ?>
 --EXPECTF--
 *** 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
 NULL
 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 0a06ad5015..d18bef52f1 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 305bebef8f..e49270bcf4 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 );
@@ -35,8 +37,6 @@ foreach( $misc_files as $misc_file ) {
   var_dump( is_writeable($misc_file) );
   clearstatcache();
 }
-
-echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing is_writable(): usage variations ***
@@ -64,4 +64,3 @@ Warning: is_writeable() expects parameter 1 to be a valid path, array given in %
 NULL
 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 a240a826b9..5824a8fe15 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]])
@@ -41,7 +43,6 @@ foreach($names_arr as $key => $value) {
 };
 
 ?>
-===Done===
 --EXPECTF--
 *** Testing readfile() : variation ***
 
@@ -84,4 +85,3 @@ Warning: readfile(/no/such/file/dir): failed to open stream: No such file or dir
 -- Filename: php/php --
 
 Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
-===Done===
diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt
index 59b92ad365..e9655377a3 100644
Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ
diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt
index a54a246dc3..d641f20f26 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 );
@@ -33,8 +35,6 @@ foreach( $filenames as $filename ) {
   clearstatcache();
 }
 fclose($file_handle);
-
-echo "\n*** Done ***";
 ?>
 --CLEAN--
 <?php
@@ -67,5 +67,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 d8db734e38..965a0dac25 100644
Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ
diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt
index 1cadd8a438..70ec37c7a6 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])
@@ -57,7 +59,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing rename() with obscure files ***
@@ -129,5 +130,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 c79aabfb62..bade05ac87 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 );
@@ -84,7 +86,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 @@ OK
 OK
 -- Iteration 9 --
 OK
-
-*** Done. ***
diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt
index 856667fa49..55db89cc72 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 );
@@ -71,7 +73,6 @@ for( $i=0; $i<count($names_arr); $i++ ) {
 }
 
 rmdir($file_path);
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing tempnam() with obscure prefixes ***
@@ -119,5 +120,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 5bacb5e876..9ad75f8ed5 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 );
@@ -59,8 +61,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 ***
@@ -118,5 +118,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 9ed84f974a..289fe82375 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 );
@@ -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 ***
@@ -123,5 +123,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 ***