- Replace dirname(__FILE__) with __DIR__

boekkooi · boekkooi · commit 75ceb2ce3022 · 2010-10-14T11:36:09.000+02:00
diff --git a/tests/Validate/setup.php.inc b/tests/Validate/setup.php.inc
@@ -1,2 +1,2 @@
 <?php
-include dirname(__FILE__) . '/../test_framework.php.inc';
+include __DIR__ . '/../test_framework.php.inc';
diff --git a/tests/Validator_PECL/setup.php.inc b/tests/Validator_PECL/setup.php.inc
@@ -1,2 +1,2 @@
 <?php
-include dirname(__FILE__) . '/../test_framework.php.inc';
+include __DIR__ . '/../test_framework.php.inc';
diff --git a/tests/XMLParser/attribs.phpt b/tests/XMLParser/attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a one="two"/>');
 $test->assertEquals(array('a' => array('attribs' => array('one' => 'two'))), $res, 'test');
 $res = $parser->parseString('<?xml version="1.0" ?><a one="two" three="four"/>');
diff --git a/tests/XMLParser/attribs_content.phpt b/tests/XMLParser/attribs_content.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: attributes + content
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a one="two">hi</a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLParser/cdata.phpt b/tests/XMLParser/cdata.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: <![CDATA[]]>
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><![CDATA[hi<there>]]></a>');
 $test->assertEquals(array('a' => 'hi<there>'), $res, 'test');
 ?>
diff --git a/tests/XMLParser/childtag.phpt b/tests/XMLParser/childtag.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: child tag
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><b/></a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLParser/childtag_attribs.phpt b/tests/XMLParser/childtag_attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: child tag + attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><b one="two"/></a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLParser/childtag_content.phpt b/tests/XMLParser/childtag_content.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: child tag + content
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><b/>hi</a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLParser/childtag_sibling_attribs.phpt b/tests/XMLParser/childtag_sibling_attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: child tag + sibling attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><b /><b one="two"/></a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLParser/empty.phpt b/tests/XMLParser/empty.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: empty xml
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a/>');
 $test->assertEquals(array('a' => ''), $res, 'test');
 ?>
diff --git a/tests/XMLParser/parse_open_fail.phpt b/tests/XMLParser/parse_open_fail.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: parse() opening file fails
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 
 $e = new stdClass;
 try {
diff --git a/tests/XMLParser/recursivetag.phpt b/tests/XMLParser/recursivetag.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: complex recursive tags
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 
 $xml = '<?xml version="1.0" ?><package>
 <lead>
diff --git a/tests/XMLParser/setup.php.inc b/tests/XMLParser/setup.php.inc
@@ -1,4 +1,4 @@
 <?php
-include dirname(__FILE__) . '/../test_framework.php.inc';
-include dirname(__FILE__) . '/../../src/Pyrus/XMLParser.php';
+include __DIR__ . '/../test_framework.php.inc';
+include __DIR__ . '/../../src/Pyrus/XMLParser.php';
 $parser = new \PEAR2\Pyrus\XMLParser;
diff --git a/tests/XMLParser/siblingtags.phpt b/tests/XMLParser/siblingtags.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLParser: sibling tags
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $res = $parser->parseString('<?xml version="1.0" ?><a><b/><b/></a>');
 $test->assertEquals(array(
   'a' =>
diff --git a/tests/XMLWriter/attribs.phpt b/tests/XMLWriter/attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 
 $write = new $xmlwriter(array('a' => array('attribs' => array('one' => 'two'))));
 $test->assertEquals('<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/XMLWriter/attribs_content.phpt b/tests/XMLWriter/attribs_content.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: attributes + content
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 
 $write = new $xmlwriter(array(
   'a' =>
diff --git a/tests/XMLWriter/childtag.phpt b/tests/XMLWriter/childtag.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: child tag
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array(
   'a' =>
   array(
diff --git a/tests/XMLWriter/childtag_attribs.phpt b/tests/XMLWriter/childtag_attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: child tag + attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array(
   'a' =>
   array(
diff --git a/tests/XMLWriter/childtag_content.phpt b/tests/XMLWriter/childtag_content.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: child tag + content
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array(
   'a' =>
   array(
diff --git a/tests/XMLWriter/childtag_sibling_attribs.phpt b/tests/XMLWriter/childtag_sibling_attribs.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: child tag + sibling attributes
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array(
   'a' =>
   array(
diff --git a/tests/XMLWriter/empty.phpt b/tests/XMLWriter/empty.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: empty xml
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array('a' => ''));
 $test->assertEquals('<?xml version="1.0" encoding="UTF-8"?>
 <a/>', (string) $write, 'test');
diff --git a/tests/XMLWriter/recursivetag.phpt b/tests/XMLWriter/recursivetag.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: complex recursive tags
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array (
   'package' => 
   array (
diff --git a/tests/XMLWriter/setup.php.inc b/tests/XMLWriter/setup.php.inc
@@ -1,4 +1,4 @@
 <?php
-include dirname(__FILE__) . '/../test_framework.php.inc';
+include __DIR__ . '/../test_framework.php.inc';
 // for easy move to namespaces
 $xmlwriter = 'PEAR2\Pyrus\XMLWriter';
diff --git a/tests/XMLWriter/siblingtags.phpt b/tests/XMLWriter/siblingtags.phpt
@@ -2,7 +2,7 @@
 Pyrus XMLWriter: sibling tags
 --FILE--
 <?php
-require dirname(__FILE__) . '/setup.php.inc';
+require __DIR__ . '/setup.php.inc';
 $write = new $xmlwriter(array(
   'a' =>
   array(

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?php`
`2`		`-include dirname(__FILE__) . '/../test_framework.php.inc';`
	`2`	`+include __DIR__ . '/../test_framework.php.inc';`