From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 17 Jun 2019 13:08:52 +0000 (+0200)
Subject: Fix file conflicts in SplFileObject fputcsv tests
X-Git-Tag: php-7.4.0alpha2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e9a65447f748d634f1777287e2dbc65c8a71e05;p=php

Fix file conflicts in SplFileObject fputcsv tests
---

diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
index 9edaf571fe..a4c2451021 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
@@ -8,7 +8,7 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch
 
 echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n";
 
-$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w');
+$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation13.csv', 'w');
 
 var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '"'));
 
@@ -18,7 +18,7 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-$file = __DIR__ . '/SplFileObject_fputcsv.csv';
+$file = __DIR__ . '/SplFileObject_fputcsv_variation13.csv';
 unlink($file);
 ?>
 --EXPECTF--
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
index f8cda0e96f..a659da92af 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
@@ -8,7 +8,7 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars
 
 echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n";
 
-$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w');
+$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation14.csv', 'w');
 
 var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '""'));
 
@@ -18,7 +18,7 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-$file = __DIR__ . '/SplFileObject_fputcsv.csv';
+$file = __DIR__ . '/SplFileObject_fputcsv_variation14.csv';
 unlink($file);
 ?>
 --EXPECTF--