aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFyorl <gaelreth@gmail.com>2012-09-01 09:45:11 +0800
committerFyorl <gaelreth@gmail.com>2012-09-01 09:45:11 +0800
commit1520130b2707039630fb3a83e4ab7654db3ad537 (patch)
tree0f82cb4f430ef9fb3da135d4e9006f59fc8e8be4
parent94c9d7029809bce1ab8a70981f81dfb02a5b2a38 (diff)
downloadforums-1520130b2707039630fb3a83e4ab7654db3ad537.tar
forums-1520130b2707039630fb3a83e4ab7654db3ad537.tar.gz
forums-1520130b2707039630fb3a83e4ab7654db3ad537.tar.bz2
forums-1520130b2707039630fb3a83e4ab7654db3ad537.tar.xz
forums-1520130b2707039630fb3a83e4ab7654db3ad537.zip
[ticket/11045] Replaced __DIR__ with dirname(__FILE__)
PHPBB3-11045
-rw-r--r--tests/compress/compress_test.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index c9450f2e29..ac8dd358d3 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -7,9 +7,9 @@
*
*/
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_compress.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
class phpbb_compress_test extends phpbb_test_case
{
@@ -37,7 +37,7 @@ class phpbb_compress_test extends phpbb_test_case
global $phpbb_root_path;
$phpbb_root_path = '';
- $this->path = __DIR__ . '/fixtures/';
+ $this->path = dirname(__FILE__) . '/fixtures/';
if (!@extension_loaded('zlib') || !@extension_loaded('bz2'))
{
@@ -47,7 +47,7 @@ class phpbb_compress_test extends phpbb_test_case
protected function tearDown()
{
- foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir)
+ foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir)
{
$this->clear_dir($dir);
}
@@ -101,7 +101,7 @@ class phpbb_compress_test extends phpbb_test_case
foreach ($filelist as $filename)
{
- $path = __DIR__ . self::EXTRACT_DIR . $filename;
+ $path = dirname(__FILE__) . self::EXTRACT_DIR . $filename;
$this->assertTrue(file_exists($path));
// Check the file's contents is correct
@@ -143,7 +143,7 @@ class phpbb_compress_test extends phpbb_test_case
*/
public function test_compress_tar($filename, $type)
{
- $tar = __DIR__ . self::ARCHIVE_DIR . $filename;
+ $tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
$compress = new compress_tar('w', $tar);
$this->archive_files($compress);
$compress->close();
@@ -160,7 +160,7 @@ class phpbb_compress_test extends phpbb_test_case
*/
public function test_compress_zip()
{
- $zip = __DIR__ . self::ARCHIVE_DIR . 'archive.zip';
+ $zip = dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
$compress = new compress_zip('w', $zip);
$this->archive_files($compress);
$compress->close();