From 26dfce7f36d1c6f737ac241df1315a1b42b932c7 Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Fri, 15 Mar 2019 22:55:30 +0100
Subject: Replace dirname(__FILE__) by __DIR__ in tests

---
 ext/xmlreader/tests/002.phpt             | 2 +-
 ext/xmlreader/tests/003-get-errors.phpt  | 2 +-
 ext/xmlreader/tests/003-mb.phpt          | 2 +-
 ext/xmlreader/tests/003-move-errors.phpt | 2 +-
 ext/xmlreader/tests/003.phpt             | 2 +-
 ext/xmlreader/tests/004.phpt             | 2 +-
 ext/xmlreader/tests/007.phpt             | 4 ++--
 ext/xmlreader/tests/008.phpt             | 4 ++--
 ext/xmlreader/tests/012.phpt             | 6 +++---
 ext/xmlreader/tests/013.phpt             | 4 ++--
 ext/xmlreader/tests/014.phpt             | 2 +-
 ext/xmlreader/tests/015-get-errors.phpt  | 2 +-
 ext/xmlreader/tests/015-move-errors.phpt | 2 +-
 ext/xmlreader/tests/015.phpt             | 2 +-
 ext/xmlreader/tests/bug71805.phpt        | 4 ++--
 15 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'ext/xmlreader/tests')

diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index 6101d6cc48..b2d50731ee 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -4,7 +4,7 @@ XMLReader: libxml2 XML Reader, file data
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
 <?php
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = __DIR__ . '/_002.xml';
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books></books>';
 file_put_contents($filename, $xmlstring);
diff --git a/ext/xmlreader/tests/003-get-errors.phpt b/ext/xmlreader/tests/003-get-errors.phpt
index 61addaca15..614b3501e6 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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt
index 905f8fd03e..6d3282e6a5 100644
--- a/ext/xmlreader/tests/003-mb.phpt
+++ b/ext/xmlreader/tests/003-mb.phpt
@@ -4,7 +4,7 @@ XMLReader: libxml2 XML Reader, attributes test
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
 <?php
-$filename = dirname(__FILE__) . '/私はガラスを食べられます_003.xml';
+$filename = __DIR__ . '/私はガラスを食べられます_003.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/003-move-errors.phpt b/ext/xmlreader/tests/003-move-errors.phpt
index 641324b54e..fdaf3b747a 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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index ac9e73136e..ae255220b3 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -4,7 +4,7 @@ XMLReader: libxml2 XML Reader, attributes test
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
 <?php
-$filename = dirname(__FILE__) . '/_003.xml';
+$filename = __DIR__ . '/_003.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index 9298945847..915a14bccf 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -4,7 +4,7 @@ XMLReader: libxml2 XML Reader, attributes test
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
 <?php
-$filename = dirname(__FILE__) . '/_004.xml';
+$filename = __DIR__ . '/_004.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index acbb574721..88e8800054 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -6,8 +6,8 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema
 <?php
 
 $xmlstring = '<TEI.2>hello</TEI.2>';
-$relaxngfile = dirname(__FILE__) . '/relaxNG.rng';
-$file = dirname(__FILE__) . '/_007.xml';
+$relaxngfile = __DIR__ . '/relaxNG.rng';
+$file = __DIR__ . '/_007.xml';
 file_put_contents($file, $xmlstring);
 
 $reader = new XMLReader();
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index fd3da46184..ceb0972376 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -21,8 +21,8 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </MOVIE>
 </LIST>';
 
-$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd';
-$file = dirname(__FILE__) . '/_008.xml';
+$dtdfile = rawurlencode(__DIR__) . '/dtdexample.dtd';
+$file = __DIR__ . '/_008.xml';
 file_put_contents($file, $xmlstring);
 
 
diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index 50b761c235..ba4455ade7 100644
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -23,7 +23,7 @@ $xmlstring =<<<EOF
 <foo bar=""/>
 EOF;
 
-$xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring);
+$xmlstring = str_replace('012.dtd', __DIR__.'/012.dtd', $xmlstring);
 if (DIRECTORY_SEPARATOR == '\\') {
 	$xmlstring = str_replace('\\',"/", $xmlstring);
 }
@@ -37,7 +37,7 @@ $reader->close();
 
 echo "\nUsing URI:\n";
 $reader = new XMLReader();
-$file = dirname(__FILE__) . '/012.xml';
+$file = __DIR__ . '/012.xml';
 if (DIRECTORY_SEPARATOR == '\\') {
 	$file = str_replace('\\',"/", $file);
 }
@@ -51,7 +51,7 @@ var_dump($reader->getAttribute('baz'));
 $reader->close();
 
 $reader = new XMLReader();
-$reader->open(dirname(__FILE__) . '/012.xml');
+$reader->open(__DIR__ . '/012.xml');
 $reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
 while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
 var_dump($reader->getAttribute('bar'));
diff --git a/ext/xmlreader/tests/013.phpt b/ext/xmlreader/tests/013.phpt
index 09bef8df0c..bceccced6b 100644
--- a/ext/xmlreader/tests/013.phpt
+++ b/ext/xmlreader/tests/013.phpt
@@ -16,7 +16,7 @@ EOF;
 
 $reader = new XMLReader();
 $reader->XML($xml);
-$reader->setSchema(dirname(__FILE__) . '/013.xsd');
+$reader->setSchema(__DIR__ . '/013.xsd');
 while($reader->read()) {
 	if ($reader->nodeType == XMLReader::ELEMENT && $reader->name == 'item') {
 		$reader->read();
@@ -36,7 +36,7 @@ EOF;
 
 $reader = new XMLReader();
 $reader->XML($xml);
-$reader->setSchema(dirname(__FILE__) . '/013.xsd');
+$reader->setSchema(__DIR__ . '/013.xsd');
 while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
 $reader->close();
 
diff --git a/ext/xmlreader/tests/014.phpt b/ext/xmlreader/tests/014.phpt
index cdc041a38e..5969da62f2 100644
--- a/ext/xmlreader/tests/014.phpt
+++ b/ext/xmlreader/tests/014.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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/015-get-errors.phpt b/ext/xmlreader/tests/015-get-errors.phpt
index 0eeed280da..7db7585eef 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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/015-move-errors.phpt b/ext/xmlreader/tests/015-move-errors.phpt
index b54a243070..c5d3b543c1 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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/015.phpt b/ext/xmlreader/tests/015.phpt
index 4945927740..8a67f3c81e 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 = dirname(__FILE__) . '/_014.xml';
+$filename = __DIR__ . '/_014.xml';
 file_put_contents($filename, $xmlstring);
 
 // Load test data into a new XML Reader
diff --git a/ext/xmlreader/tests/bug71805.phpt b/ext/xmlreader/tests/bug71805.phpt
index 3d1713ace5..6f54b1347a 100644
--- a/ext/xmlreader/tests/bug71805.phpt
+++ b/ext/xmlreader/tests/bug71805.phpt
@@ -5,8 +5,8 @@ XMLReader: Bug #71805 XML files can generate UTF-8 error even if they are UTF-8
 --FILE--
 <?php
 
-TestXML(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'XMLReaderGood_bug71805.xml');
-TestXML(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'XMLReaderBad_bug71805.xml');
+TestXML(__DIR__ . DIRECTORY_SEPARATOR . 'XMLReaderGood_bug71805.xml');
+TestXML(__DIR__ . DIRECTORY_SEPARATOR . 'XMLReaderBad_bug71805.xml');
 
 function TestXML($file) {
 	$XR = new XMLReader;
-- 
cgit v1.2.1