From 832b89d108cdb261ab582b57ae4fd0a9e052e608 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 19 Feb 2019 14:43:52 +0100
Subject: [PATCH] Avoid file conflicts in XmlWriter tests

---
 ext/xmlwriter/tests/001.phpt    | 2 +-
 ext/xmlwriter/tests/002.phpt    | 2 +-
 ext/xmlwriter/tests/003.phpt    | 2 +-
 ext/xmlwriter/tests/004.phpt    | 4 ++--
 ext/xmlwriter/tests/005-mb.phpt | 2 +-
 ext/xmlwriter/tests/005.phpt    | 4 ++--
 ext/xmlwriter/tests/006.phpt    | 4 ++--
 ext/xmlwriter/tests/OO_001.phpt | 4 ++--
 ext/xmlwriter/tests/OO_004.phpt | 4 ++--
 ext/xmlwriter/tests/OO_005.phpt | 4 ++--
 ext/xmlwriter/tests/OO_006.phpt | 4 ++--
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index e985cbf8a1..fd2e075e21 100644
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -15,7 +15,7 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index acb244683a..13c7da17bf 100644
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '002.xml';
 $xw = xmlwriter_open_memory($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 02d3c2a74f..f1463c7dfc 100644
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '003.xml';
 $xw = xmlwriter_open_memory($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index 686ea047cc..73c4642fb3 100644
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '004.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
@@ -22,7 +22,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 if ($md5_out != $md5_res) {
 	echo "failed: $md5_res != $md5_out\n";
 } else {
diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt
index ac9f6a3f84..41c86f857d 100644
--- a/ext/xmlwriter/tests/005-mb.phpt
+++ b/ext/xmlwriter/tests/005-mb.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '私はガラスを食べられます001.xml';
+$doc_dest = '私はガラスを食べられます005.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index a2d3d1766a..aca59e4b1f 100644
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '005.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
@@ -23,7 +23,7 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt
index 2f0d65e681..802dc81032 100644
--- a/ext/xmlwriter/tests/006.phpt
+++ b/ext/xmlwriter/tests/006.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '006.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_dtd($xw, 'foo', NULL, 'urn:bar');
 xmlwriter_end_dtd($xw);
@@ -19,7 +19,7 @@ xmlwriter_end_element($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 --EXPECT--
 <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>
diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index 7e30b33955..bd5edf08d8 100644
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_001.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8', 'standalonearg');
@@ -16,7 +16,7 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index 6b81855c1d..ecda7a1b03 100644
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_004.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 if ($md5_out != $md5_res) {
 	echo "failed: $md5_res != $md5_out\n";
 } else {
diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index e3250e70e2..7478ac71ed 100644
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_005.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt
index 4b8e0d9a15..4d4abe3fbd 100644
--- a/ext/xmlwriter/tests/OO_006.phpt
+++ b/ext/xmlwriter/tests/OO_006.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_006.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDtd('foo', NULL, 'urn:bar');
@@ -20,7 +20,7 @@ $xw->endElement();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 --EXPECT--
 <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>
-- 
2.49.0