Merge branch 'PHP-7.4'

* PHP-7.4:
  Use separate output files in xmlreader tests

5 files changed, 10 insertions, 10 deletions

diff --git a/ext/xmlreader/tests/003-get-errors.phpt b/ext/xmlreader/tests/003-get-errors.phpt
index 614b3501e6..9e5aa7e38f 100644
--- a/ext/xmlreader/tests/003-get-errors.phpt
+++ b/ext/xmlreader/tests/003-get-errors.phpt
@@ -9,7 +9,7 @@ Mark Baker mark@lange.demon.co.uk at the PHPNW2017 Conference for PHP Testfest 2
 // Set up test data in a new file
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
-$filename = __DIR__ . '/_014.xml';
+$filename = __DIR__ . '/003-get-errors.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
@@ -60,7 +60,7 @@ $reader->close();
 ===DONE===
 --CLEAN--
 <?php
-unlink(__DIR__.'/_014.xml');
+unlink(__DIR__.'/003-get-errors.xml');
 ?>
 --EXPECTF--
 book
diff --git a/ext/xmlreader/tests/003-move-errors.phpt b/ext/xmlreader/tests/003-move-errors.phpt
index fdaf3b747a..0f21a2747b 100644
--- a/ext/xmlreader/tests/003-move-errors.phpt
+++ b/ext/xmlreader/tests/003-move-errors.phpt
@@ -9,7 +9,7 @@ Mark Baker mark@lange.demon.co.uk at the PHPNW2017 Conference for PHP Testfest 2
 // Set up test data in a new file
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
-$filename = __DIR__ . '/_014.xml';
+$filename = __DIR__ . '/003-move-errors.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
@@ -59,7 +59,7 @@ $reader->close();
 ===DONE===
 --CLEAN--
 <?php
-unlink(__DIR__.'/_014.xml');
+unlink(__DIR__.'/003-move-errors.xml');
 ?>
 --EXPECTF--
 book
diff --git a/ext/xmlreader/tests/015-get-errors.phpt b/ext/xmlreader/tests/015-get-errors.phpt
index 7db7585eef..06f7eef53b 100644
--- a/ext/xmlreader/tests/015-get-errors.phpt
+++ b/ext/xmlreader/tests/015-get-errors.phpt
@@ -9,7 +9,7 @@ Mark Baker mark@lange.demon.co.uk at the PHPNW2017 Conference for PHP Testfest 2
 // Set up test data in a new file
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books xmlns:ns1="http://www.ns1.namespace.org/" xmlns:ns2="http://www.ns2.namespace.org/"><book ns1:num="1" ns2:idx="2" ns1:idx="3" ns2:isbn="4">book1</book></books>';
-$filename = __DIR__ . '/_014.xml';
+$filename = __DIR__ . '/015-get-errors.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
@@ -40,7 +40,7 @@ $reader->close();
 ===DONE===
 --CLEAN--
 <?php
-unlink(__DIR__.'/_014.xml');
+unlink(__DIR__.'/015-get-errors.xml');
 ?>
 --EXPECTF--
 Warning: XMLReader::getAttributeNs(): Attribute Name and Namespace URI cannot be empty in %s on line %d
diff --git a/ext/xmlreader/tests/015-move-errors.phpt b/ext/xmlreader/tests/015-move-errors.phpt
index c5d3b543c1..ab2472258f 100644
--- a/ext/xmlreader/tests/015-move-errors.phpt
+++ b/ext/xmlreader/tests/015-move-errors.phpt
@@ -9,7 +9,7 @@ Mark Baker mark@lange.demon.co.uk at the PHPNW2017 Conference for PHP Testfest 2
 // Set up test data in a new file
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books xmlns:ns1="http://www.ns1.namespace.org/" xmlns:ns2="http://www.ns2.namespace.org/"><book ns1:num="1" ns2:idx="2" ns1:idx="3" ns2:isbn="4">book1</book></books>';
-$filename = __DIR__ . '/_014.xml';
+$filename = __DIR__ . '/015-move-errors.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
@@ -35,7 +35,7 @@ $reader->close();
 ===DONE===
 --CLEAN--
 <?php
-unlink(__DIR__.'/_014.xml');
+unlink(__DIR__.'/015-move-errors.xml');
 ?>
 --EXPECTF--
 Warning: XMLReader::moveToAttributeNs(): Attribute Name and Namespace URI cannot be empty in %s on line %d
diff --git a/ext/xmlreader/tests/015.phpt b/ext/xmlreader/tests/015.phpt
index 8a67f3c81e..b60d1395c8 100644
--- a/ext/xmlreader/tests/015.phpt
+++ b/ext/xmlreader/tests/015.phpt
@@ -9,7 +9,7 @@ Mark Baker mark@lange.demon.co.uk at the PHPNW2017 Conference for PHP Testfest 2
 // Set up test data in a new file
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books xmlns:ns1="http://www.ns1.namespace.org/" xmlns:ns2="http://www.ns2.namespace.org/"><book ns1:num="1" ns2:idx="2" ns1:idx="3" ns2:isbn="4">book1</book></books>';
-$filename = __DIR__ . '/_014.xml';
+$filename = __DIR__ . '/015.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
@@ -55,7 +55,7 @@ $reader->close();
 ===DONE===
 --CLEAN--
 <?php
-unlink(__DIR__.'/_014.xml');
+unlink(__DIR__.'/015.xml');
 ?>
 --EXPECT--
 ns1:idx: 3