From a0d58abb79b5f2c91e30a5ae6a0e835ed3ed3026 Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Fri, 1 Nov 2019 12:33:36 +0100
Subject: [PATCH] Fix conflicts between tests with obscure filenames

For non-windows tests
---
 .../file/file_get_contents_variation8.phpt    |   2 ++
 .../file/file_put_contents_variation8.phpt    | Bin 2473 -> 2504 bytes
 2 files changed, 2 insertions(+)

diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index 97a3495d54..06fd1b3a5f 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 f0161dca5745062a41e7664fc9cccaac100cd2f3..497c68b2bb759b18270c036d78419e6986d6febc 100644
GIT binary patch
delta 39
vcmZ1}d_s7_H5q4rKQ|vw=a67sU9SA3;^fkz)cCZ_oYcI;+|-SiuW<kX94`+T

delta 10
ScmX>hyi$0=wT)jda{vGxF$I4B

-- 
2.50.0