summaryrefslogtreecommitdiff
path: root/ext/standard/tests
diff options
context:
space:
mode:
authorFabien Villepinte <fabien.villepinte@gmail.com>2019-11-01 12:38:32 +0100
committerFabien Villepinte <fabien.villepinte@gmail.com>2019-11-01 12:38:32 +0100
commit8ea2be387e2867b6fc7e15ad2bc5f54902c2a6d7 (patch)
tree84339d146d96855fa9a3f9b7fb4c38da65a8b064 /ext/standard/tests
parent59552117107e2cf068adb4b7e759dcb327a5a724 (diff)
parenta0d58abb79b5f2c91e30a5ae6a0e835ed3ed3026 (diff)
downloadphp-git-8ea2be387e2867b6fc7e15ad2bc5f54902c2a6d7.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/standard/tests')
-rw-r--r--ext/standard/tests/file/file_get_contents_variation8.phpt2
-rw-r--r--ext/standard/tests/file/file_put_contents_variation8.phpt2
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index f826ad60c2..9a7087c821 100644
--- a/ext/standard/tests/file/file_get_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8.phpt
@@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip.. Not valid for Windows');
}
?>
+--CONFLICTS--
+obscure_filename
--FILE--
<?php
/* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index 8d2c148598..be20782c4e 100644
--- a/ext/standard/tests/file/file_put_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8.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 : int file_put_contents(string file, mixed data [, int flags [, resource context]])