mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 12:40:13 +01:00
Code Issues Releases Wiki Activity

[ticket/15392] Changed dirname(__FILE__) to __DIR__

Browse Source 
Changed dirname(__FILE__) to __DIR__ everywhere

PHPBB3-15392
This commit is contained in:
DinHere 2017-12-03 17:19:59 +02:00 committed by Marc Alexander
parent 66cbf2607b
commit 8c9d26db1f
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
198 changed files with 373 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -2,7 +2,7 @@ require 'json'
require 'yaml'
VAGRANTFILE_API_VERSION ||= "2"
confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.__DIR__)
homesteadYamlPath = "vagrant/bootstrap.yaml"
afterScriptPath = "vagrant/after.sh"

8
build/build_helper.php
View File

@ -43,10 +43,10 @@ class build_package
$_before = $this->versions[count($this->versions) - 2];
$this->locations = array(
'new_version' => dirname(dirname(__FILE__)) . '/phpBB/',
'old_versions' => dirname(__FILE__) . '/old_versions/',
'root' => dirname(__FILE__) . '/',
'package_dir' => dirname(__FILE__) . '/new_version/'
'new_version' => dirname(__DIR__) . '/phpBB/',
'old_versions' => __DIR__ . '/old_versions/',
'root' => __DIR__ . '/',
'package_dir' => __DIR__ . '/new_version/'
);
$this->package_infos = array(

4
phpBB/develop/create_schema_files.php
View File

@ -18,7 +18,7 @@
* If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
*/
$schema_path = dirname(__FILE__) . '/../install/schemas/';
$schema_path = __DIR__ . '/../install/schemas/';
$supported_dbms = array(
'mssql',
'mysql_41',
@ -34,7 +34,7 @@ if (!is_writable($schema_path))
}
define('IN_PHPBB', true);
$phpbb_root_path = dirname(__FILE__) . '/../';
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'vendor/autoload.php');

2
phpBB/develop/lang_duplicates.php
View File

@ -34,7 +34,7 @@ $mode = $request->variable('mode', '');
$modules = find_modules($phpbb_root_path . 'language/en');
$kkeys = $keys = array();
$langdir = dirname(__FILE__);
$langdir = __DIR__;
if (isset($lang))
{

4
phpBB/includes/functions.php
View File

@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile)
{
if ($phpbb_filesystem)
{
$root_path = $phpbb_filesystem->realpath(dirname(__FILE__) . '/../');
$root_path = $phpbb_filesystem->realpath(__DIR__ . '/../');
}
else
{
$filesystem = new \phpbb\filesystem\filesystem();
$root_path = $filesystem->realpath(dirname(__FILE__) . '/../');
$root_path = $filesystem->realpath(__DIR__ . '/../');
}
}

2
phpBB/includes/functions_download.php
View File

@ -242,7 +242,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
// X-Sendfile - http://blog.lighttpd.net/articles/2006/07/02/x-sendfile
// Lighttpd's X-Sendfile does not support range requests as of 1.4.26
// and always requires an absolute path.
header('X-Sendfile: ' . dirname(__FILE__) . "/../$upload_dir/{$attachment['physical_filename']}");
header('X-Sendfile: ' . __DIR__ . "/../$upload_dir/{$attachment['physical_filename']}");
exit;
}

6
tests/acp_board/select_auth_method_test.php
View File

@ -11,9 +11,9 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_board.php';
require_once dirname(__FILE__) . '/auth_provider/invalid.php';
require_once dirname(__FILE__) . '/auth_provider/valid.php';
require_once __DIR__ . '/../../phpBB/includes/acp/acp_board.php';
require_once __DIR__ . '/auth_provider/invalid.php';
require_once __DIR__ . '/auth_provider/valid.php';
class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
{

4
tests/attachment/delete_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once(dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php');
require_once(__DIR__ . '/../../phpBB/includes/functions_admin.php');
class phpbb_attachment_delete_test extends \phpbb_database_test_case
{
@ -37,7 +37,7 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml');
}
protected function setUp(): void

2
tests/attachment/resync_test.php
View File

@ -21,7 +21,7 @@ class phpbb_attachment_resync_test extends \phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml');
}
protected function setUp(): void

4
tests/attachment/upload_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once(dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php');
require_once(__DIR__ . '/../../phpBB/includes/functions_posting.php');
class phpbb_attachment_upload_test extends \phpbb_database_test_case
{
@ -64,7 +64,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml');
}
protected function setUp(): void

2
tests/auth/provider_apache_test.php
View File

@ -35,7 +35,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml');
}
/**

2
tests/auth/provider_db_test.php
View File

@ -15,7 +15,7 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml');
}
public function test_login()

4
tests/auth/provider_oauth_token_storage_test.php
View File

@ -13,7 +13,7 @@
use OAuth\OAuth2\Token\StdOAuth2Token;
require_once dirname(__FILE__) . '/phpbb_not_a_token.php';
require_once __DIR__ . '/phpbb_not_a_token.php';
class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_case
{
@ -51,7 +51,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/oauth_tokens.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/oauth_tokens.xml');
}
public static function retrieveAccessToken_data()

4
tests/avatar/manager_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/driver/foobar.php';
require_once __DIR__ . '/driver/foobar.php';
class phpbb_avatar_manager_test extends \phpbb_database_test_case
{
@ -22,7 +22,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/users.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/users.xml');
}
protected function setUp(): void

4
tests/bbcode/parser_test.php
View File

@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
require_once __DIR__ . '/../../phpBB/includes/bbcode.php';
require_once __DIR__ . '/../../phpBB/includes/message_parser.php';
class phpbb_bbcode_parser_test extends \phpbb_test_case
{

4
tests/bbcode/url_bbcode_test.php
View File

@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
require_once __DIR__ . '/../../phpBB/includes/bbcode.php';
require_once __DIR__ . '/../../phpBB/includes/message_parser.php';
class phpbb_url_bbcode_test extends phpbb_test_case
{

4
tests/cache/apcu_driver_test.php vendored
View File

@ -15,7 +15,7 @@
// http://forums.devshed.com/php-development-5/apc-problem-561290.html
// http://php.net/manual/en/apc.configuration.php
require_once dirname(__FILE__) . '/common_test_case.php';
require_once __DIR__ . '/common_test_case.php';
class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case
{
@ -23,7 +23,7 @@ class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
static public function setUpBeforeClass(): void

4
tests/cache/cache_memory_test.php vendored
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/cache_memory.php';
require_once __DIR__ . '/cache_memory.php';
class phpbb_cache_memory_test extends phpbb_database_test_case
{
@ -20,7 +20,7 @@ class phpbb_cache_memory_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/cache_memory.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/cache_memory.xml');
}
protected function setUp(): void

2
tests/cache/dummy_driver_test.php vendored
View File

@ -15,7 +15,7 @@ class phpbb_cache_dummy_driver_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

4
tests/cache/file_driver_test.php vendored
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_test_case.php';
require_once __DIR__ . '/common_test_case.php';
class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
{
@ -19,7 +19,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

4
tests/cache/redis_driver_test.php vendored
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_test_case.php';
require_once __DIR__ . '/common_test_case.php';
class phpbb_cache_redis_driver_test extends \phpbb_cache_common_test_case
{
@ -19,7 +19,7 @@ class phpbb_cache_redis_driver_test extends \phpbb_cache_common_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
static public function setUpBeforeClass(): void

2
tests/captcha/qa_test.php
View File

@ -20,7 +20,7 @@ class phpbb_captcha_qa_test extends \phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml');
}
protected function setUp(): void

4
tests/class_loader/class_loader_test.php
View File

@ -33,7 +33,7 @@ class phpbb_class_loader_test extends \phpbb_test_case
public function test_resolve_path()
{
$prefix = dirname(__FILE__) . '/';
$prefix = __DIR__ . '/';
$class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/');
$prefix .= 'phpbb/';
@ -68,7 +68,7 @@ class phpbb_class_loader_test extends \phpbb_test_case
);
$cache = new phpbb_mock_cache($cache_map);
$prefix = dirname(__FILE__) . '/';
$prefix = __DIR__ . '/';
$class_loader = new \phpbb\class_loader('phpbb\\', $prefix . 'phpbb/', 'php', $cache);
$class_loader_ext = new \phpbb\class_loader('\\', $prefix . 'phpbb/', 'php', $cache);

14
tests/compress/compress_test.php
View File

@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../phpBB/includes/functions_compress.php';
class phpbb_compress_test extends phpbb_test_case
{
@ -40,7 +40,7 @@ class phpbb_compress_test extends phpbb_test_case
global $phpbb_root_path;
$phpbb_root_path = '';
$this->path = dirname(__FILE__) . '/fixtures/';
$this->path = __DIR__ . '/fixtures/';
}
protected function check_extensions($extensions)
@ -56,7 +56,7 @@ class phpbb_compress_test extends phpbb_test_case
protected function tearDown(): void
{
foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir)
foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir)
{
$this->clear_dir($dir);
}
@ -110,7 +110,7 @@ class phpbb_compress_test extends phpbb_test_case
foreach ($filelist as $filename)
{
$path = dirname(__FILE__) . self::EXTRACT_DIR . $filename;
$path = __DIR__ . self::EXTRACT_DIR . $filename;
$this->assertTrue(file_exists($path));
// Check the file's contents is correct
@ -155,7 +155,7 @@ class phpbb_compress_test extends phpbb_test_case
{
$this->check_extensions($extensions);
$tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
$tar = __DIR__ . self::ARCHIVE_DIR . $filename;
$compress = new compress_tar('w', $tar);
$this->archive_files($compress);
$compress->close();
@ -174,7 +174,7 @@ class phpbb_compress_test extends phpbb_test_case
{
$this->check_extensions(array('zlib'));
$zip = dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
$zip = __DIR__ . self::ARCHIVE_DIR . 'archive.zip';
$compress = new compress_zip('w', $zip);
$this->archive_files($compress);
$compress->close();

2
tests/config/db_test.php
View File

@ -19,7 +19,7 @@ class phpbb_config_db_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

2
tests/config/db_text_test.php
View File

@ -18,7 +18,7 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config_text.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config_text.xml');
}
protected function setUp(): void

2
tests/console/cache/purge_test.php vendored
View File

@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\cache\purge;
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php';
class phpbb_console_command_cache_purge_test extends phpbb_test_case
{

4
tests/console/cron/cron_list_test.php
View File

@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/tasks/simple_ready.php';
require_once dirname(__FILE__) . '/tasks/simple_not_ready.php';
require_once __DIR__ . '/tasks/simple_ready.php';
require_once __DIR__ . '/tasks/simple_not_ready.php';
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;

4
tests/console/cron/run_test.php
View File

@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\cron\run;
require_once dirname(__FILE__) . '/tasks/simple.php';
require_once __DIR__ . '/tasks/simple.php';
class phpbb_console_command_cron_run_test extends phpbb_database_test_case
{
@ -29,7 +29,7 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

10
tests/console/thumbnail_test.php
View File

@ -29,7 +29,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/thumbnail.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/thumbnail.xml');
}
protected function setUp(): void
@ -70,10 +70,10 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
$phpbb_filesystem = new \phpbb\filesystem\filesystem();
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1');
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2');
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2');
copy(dirname(__FILE__) . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2');
copy(__DIR__ . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt');
}
protected function tearDown(): void

6
tests/console/update/check_test.php
View File

@ -15,9 +15,9 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\update\check;
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../../phpBB/includes/utf/utf_tools.php';
require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../../phpBB/includes/utf/utf_tools.php';
/**
* @slow

2
tests/console/user/activate_test.php
View File

@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\activate;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_activate_test extends phpbb_console_user_base
{

2
tests/console/user/add_test.php
View File

@ -18,7 +18,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_add_test extends phpbb_console_user_base
{

2
tests/console/user/base.php
View File

@ -28,7 +28,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

2
tests/console/user/delete_test.php
View File

@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\delete;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_delete_test extends phpbb_console_user_base
{

2
tests/console/user/reclean_test.php
View File

@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\reclean;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_reclean_test extends phpbb_console_user_base
{

8
tests/content_visibility/delete_post_test.php
View File

@ -11,15 +11,15 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
require_once dirname(__FILE__) . '/../mock/search.php';
require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../phpBB/includes/functions_posting.php';
require_once __DIR__ . '/../mock/search.php';
class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_post.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_post.xml');
}
public function delete_post_data()

2
tests/content_visibility/get_forums_visibility_sql_test.php
View File

@ -15,7 +15,7 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_forums_visibility_sql.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml');
}
public function get_forums_visibility_sql_data()

2
tests/content_visibility/get_global_visibility_sql_test.php
View File

@ -15,7 +15,7 @@ class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_data
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_forums_visibility_sql.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/get_forums_visibility_sql.xml');
}
public function get_global_visibility_sql_data()

2
tests/content_visibility/get_visibility_sql_test.php
View File

@ -15,7 +15,7 @@ class phpbb_content_visibility_get_visibility_sql_test extends phpbb_database_te
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_visibility_sql.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/get_visibility_sql.xml');
}
public function get_visibility_sql_data()

6
tests/content_visibility/set_post_visibility_test.php
View File

@ -11,14 +11,14 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../phpBB/includes/functions_posting.php';
class phpbb_content_visibility_set_post_visibility_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/set_post_visibility.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/set_post_visibility.xml');
}
public function set_post_visibility_data()

6
tests/content_visibility/set_topic_visibility_test.php
View File

@ -11,14 +11,14 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../phpBB/includes/functions_posting.php';
class phpbb_content_visibility_set_topic_visibility_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/set_topic_visibility.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/set_topic_visibility.xml');
}
public function set_topic_visibility_data()

10
tests/controller/common_helper_route.php
View File

@ -46,7 +46,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@ -138,7 +138,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@ -149,10 +149,10 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
);
$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
new \phpbb\routing\file_locator($this->filesystem, dirname(__FILE__) . '/')
new \phpbb\routing\file_locator($this->filesystem, __DIR__ . '/')
);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php', false);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, __DIR__ . '/', 'php', false);
$this->auth = new \phpbb\auth\auth();
$this->cache = new \phpbb\cache\driver\dummy();
$this->db = $this->new_dbal();

14
tests/controller/controller_test.php
View File

@ -24,7 +24,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
protected function setUp(): void
{
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@ -45,10 +45,10 @@ class phpbb_controller_controller_test extends phpbb_test_case
$container->setParameter('core.environment', PHPBB_ENVIRONMENT);
$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
new \phpbb\routing\file_locator(new \phpbb\filesystem\filesystem(), dirname(__FILE__) . '/')
new \phpbb\routing\file_locator(new \phpbb\filesystem\filesystem(), __DIR__ . '/')
);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$router = new phpbb_mock_router($container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php', false);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$router = new phpbb_mock_router($container, $resources_locator, $loader, __DIR__ . '/', 'php', false);
$routes = $router->get_routes();
// This will need to be updated if any new routes are defined
@ -85,7 +85,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
{
$container = $this->get_foo_container();
$resolver = new \phpbb\controller\resolver($container, dirname(__FILE__) . '/');
$resolver = new \phpbb\controller\resolver($container, __DIR__ . '/');
$symfony_request = new Request();
$symfony_request->attributes->set('_controller', 'foo.controller:handle');
@ -109,7 +109,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
array('', array(), array(), '\ReflectionException', 'Function () does not exist'),
// Before PHP 8: 'Method __invoke does not exist'
// As of PHP 8: 'Method phpbb\controller\foo::__invoke() does not exist'
array(new phpbb\controller\foo, array(), array(), '\ReflectionException',
array(new phpbb\controller\foo, array(), array(), '\ReflectionException',
'Method ' . (version_compare(PHP_VERSION, '8', '>=') ? 'phpbb\controller\foo::__invoke()' : '__invoke') . ' does not exist'),
);
}
@ -121,7 +121,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
{
$container = $this->get_foo_container();
$resolver = new \phpbb\controller\resolver($container, dirname(__FILE__) . '/');
$resolver = new \phpbb\controller\resolver($container, __DIR__ . '/');
$symfony_request = new Request();
foreach ($set_attributes as $name => $value)

2
tests/controller/helper_route_adm_subdir_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_adm_subdir_test extends phpbb_controller_common_helper_route
{

2
tests/controller/helper_route_adm_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_adm_test extends phpbb_controller_common_helper_route
{

2
tests/controller/helper_route_other_app.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_other_app_test extends phpbb_controller_common_helper_route
{

2
tests/controller/helper_route_root_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_test extends phpbb_controller_common_helper_route
{

2
tests/controller/helper_route_slash_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_slash_test extends phpbb_controller_common_helper_route
{

2
tests/controller/helper_route_unclean_path_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_helper_route.php';
require_once __DIR__ . '/common_helper_route.php';
class phpbb_controller_helper_route_unclean_path_test extends phpbb_controller_common_helper_route
{

12
tests/cron/manager_test.php
View File

@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php';
require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php';
require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php';
require_once dirname(__FILE__) . '/tasks/simple_ready.php';
require_once dirname(__FILE__) . '/tasks/simple_not_runnable.php';
require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php';
require_once __DIR__ . '/includes/cron/task/core/dummy_task.php';
require_once __DIR__ . '/includes/cron/task/core/second_dummy_task.php';
require_once __DIR__ . '/ext/testext/cron/dummy_task.php';
require_once __DIR__ . '/tasks/simple_ready.php';
require_once __DIR__ . '/tasks/simple_not_runnable.php';
require_once __DIR__ . '/tasks/simple_should_not_run.php';
class phpbb_cron_manager_test extends \phpbb_test_case
{

2
tests/datetime/from_format_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once __DIR__ . '/../mock/lang.php';
class phpbb_datetime_from_format_test extends phpbb_test_case
{

2
tests/dbal/auto_increment_test.php
View File

@ -20,7 +20,7 @@ class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

2
tests/dbal/boolean_processor_test.php
View File

@ -15,7 +15,7 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/boolean_processor.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/boolean_processor.xml');
}
public function test_single_not_like()

2
tests/dbal/case_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_case_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
}
public function test_case_int()

2
tests/dbal/concatenate_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_concatenate_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
}
public function test_concatenate_string()

2
tests/dbal/connect_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml');
}
public function test_failing_connect()

2
tests/dbal/cross_join_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_cross_join_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/massmail_crossjoin.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/massmail_crossjoin.xml');
}
public function test_cross_join()

2
tests/dbal/db_tools_test.php
View File

@ -22,7 +22,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
}
protected function setUp(): void

32
tests/dbal/migrator_test.php
View File

@ -11,19 +11,19 @@
*
*/
require_once dirname(__FILE__) . '/migration/dummy.php';
require_once dirname(__FILE__) . '/migration/unfulfillable.php';
require_once dirname(__FILE__) . '/migration/if.php';
require_once dirname(__FILE__) . '/migration/recall.php';
require_once dirname(__FILE__) . '/migration/if_params.php';
require_once dirname(__FILE__) . '/migration/recall_params.php';
require_once dirname(__FILE__) . '/migration/revert.php';
require_once dirname(__FILE__) . '/migration/revert_with_dependency.php';
require_once dirname(__FILE__) . '/migration/revert_table.php';
require_once dirname(__FILE__) . '/migration/revert_table_with_dependency.php';
require_once dirname(__FILE__) . '/migration/fail.php';
require_once dirname(__FILE__) . '/migration/installed.php';
require_once dirname(__FILE__) . '/migration/schema.php';
require_once __DIR__ . '/migration/dummy.php';
require_once __DIR__ . '/migration/unfulfillable.php';
require_once __DIR__ . '/migration/if.php';
require_once __DIR__ . '/migration/recall.php';
require_once __DIR__ . '/migration/if_params.php';
require_once __DIR__ . '/migration/recall_params.php';
require_once __DIR__ . '/migration/revert.php';
require_once __DIR__ . '/migration/revert_with_dependency.php';
require_once __DIR__ . '/migration/revert_table.php';
require_once __DIR__ . '/migration/revert_table_with_dependency.php';
require_once __DIR__ . '/migration/fail.php';
require_once __DIR__ . '/migration/installed.php';
require_once __DIR__ . '/migration/schema.php';
class phpbb_dbal_migrator_test extends phpbb_database_test_case
{
@ -41,7 +41,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/migrator.xml');
}
protected function setUp(): void
@ -66,7 +66,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->db,
$this->db_tools,
'phpbb_migrations',
dirname(__FILE__) . '/../../phpBB/',
__DIR__ . '/../../phpBB/',
'php',
'phpbb_',
$tools,
@ -81,7 +81,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->config,
new phpbb\filesystem\filesystem(),
'phpbb_ext',
dirname(__FILE__) . '/../../phpBB/',
__DIR__ . '/../../phpBB/',
'php',
null
);

2
tests/dbal/migrator_tool_config_text_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_migrator_tool_config_text_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_config_text.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_config_text.xml');
}
protected function setUp(): void

2
tests/dbal/migrator_tool_module_test.php
View File

@ -18,7 +18,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_module.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_module.xml');
}
protected function setUp(): void

2
tests/dbal/migrator_tool_permission_test.php
View File

@ -27,7 +27,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_permission.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/migrator_permission.xml');
}
protected function setUp(): void

2
tests/dbal/order_lower_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/styles.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/styles.xml');
}
public function test_order_lower()

2
tests/dbal/schema_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_schema_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
}
public function test_config_value_multibyte()

2
tests/dbal/select_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/three_users.xml');
}
public function return_on_error_select_data()

2
tests/dbal/sql_affected_rows_test.php
View File

@ -24,7 +24,7 @@ class phpbb_dbal_sql_affected_rows_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
public function test_update()

2
tests/dbal/sql_insert_buffer_test.php
View File

@ -27,7 +27,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
public function test_multi_insert_disabled_insert_and_flush()

2
tests/dbal/write_sequence_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/three_users.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/three_users.xml');
}
static public function write_sequence_data()

2
tests/dbal/write_test.php
View File

@ -15,7 +15,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/config.xml');
}
public function build_array_insert_data()

12
tests/di/create_container_test.php
View File

@ -13,7 +13,7 @@
namespace
{
require_once dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/di/extension.php';
require_once __DIR__ . '/fixtures/ext/vendor/enabled_4/di/extension.php';
class phpbb_di_container_test extends \phpbb_test_case
{
@ -28,7 +28,7 @@ namespace
protected function setUp(): void
{
$this->phpbb_root_path = dirname(__FILE__) . '/';
$this->phpbb_root_path = __DIR__ . '/';
$this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php');
$this->builder = new phpbb_mock_phpbb_di_container_builder($this->phpbb_root_path . 'fixtures/', 'php');
$this->builder->with_config($this->config_php);
@ -162,10 +162,10 @@ namespace phpbb\extension
public function all_enabled($phpbb_relative = true)
{
return array(
'vendor/enabled' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled/',
'vendor/enabled-2' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-2/',
'vendor/enabled-3' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-3/',
'vendor/enabled_4' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/',
'vendor/enabled' => __DIR__ . '/fixtures/ext/vendor/enabled/',
'vendor/enabled-2' => __DIR__ . '/fixtures/ext/vendor/enabled-2/',
'vendor/enabled-3' => __DIR__ . '/fixtures/ext/vendor/enabled-3/',
'vendor/enabled_4' => __DIR__ . '/fixtures/ext/vendor/enabled_4/',
);
}
}

2
tests/download/http_byte_range_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php';
require_once __DIR__ . '/../../phpBB/includes/functions_download.php';
class phpbb_download_http_byte_range_test extends phpbb_test_case
{

2
tests/download/http_user_agent_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php';
require_once __DIR__ . '/../../phpBB/includes/functions_download.php';
class phpbb_download_http_user_agent_test extends phpbb_test_case
{

2
tests/email/email_parsing_test.php
View File

@ -56,7 +56,7 @@ class phpbb_email_parsing_test extends phpbb_test_case
$user->data['user_lang'] = 'en';
$phpbb_container->set('user', $user);
$extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',

2
tests/event/md_exporter_test.php
View File

@ -91,7 +91,7 @@ class phpbb_event_md_exporter_test extends phpbb_test_case
*/
public function test_crawl_eventsmd($file, $min_version, $max_version, $events)
{
$exporter = new \phpbb\event\md_exporter(dirname(__FILE__) . '/fixtures/', null, $min_version, $max_version);
$exporter = new \phpbb\event\md_exporter(__DIR__ . '/fixtures/', null, $min_version, $max_version);
$this->assertSame(count($events), $exporter->crawl_eventsmd($file, 'adm'));
$this->assertEquals($events, $exporter->get_events());
}

2
tests/event/php_exporter_test.php
View File

@ -19,7 +19,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
protected function setUp(): void
{
parent::setUp();
$this->exporter = new \phpbb\event\php_exporter(dirname(__FILE__) . '/fixtures/');
$this->exporter = new \phpbb\event\php_exporter(__DIR__ . '/fixtures/');
}
static public function crawl_php_file_data()

8
tests/extension/extension_base_test.php
View File

@ -10,9 +10,9 @@
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/ext/vendor2/bar/migrations/bar.php';
require_once dirname(__FILE__) . '/ext/vendor2/bar/migrations/foo.php';
require_once dirname(__FILE__) . '/ext/vendor2/bar/migrations/migration.php';
require_once __DIR__ . '/ext/vendor2/bar/migrations/bar.php';
require_once __DIR__ . '/ext/vendor2/bar/migrations/foo.php';
require_once __DIR__ . '/ext/vendor2/bar/migrations/migration.php';
class phpbb_extension_extension_base_test extends phpbb_test_case
{
@ -37,7 +37,7 @@ class phpbb_extension_extension_base_test extends phpbb_test_case
$container->set('migrator', $migrator);
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',

18
tests/extension/finder_test.php
View File

@ -21,7 +21,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
protected function setUp(): void
{
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@ -106,7 +106,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
sort($dirs);
$this->assertEquals(array(
dirname(__FILE__) . '/ext/vendor2/foo/type/',
__DIR__ . '/ext/vendor2/foo/type/',
), $dirs);
}
@ -118,9 +118,9 @@ class phpbb_extension_finder_test extends phpbb_test_case
sort($dirs);
$this->assertEquals(array(
dirname(__FILE__) . '/ext/vendor2/foo/sub/type/',
dirname(__FILE__) . '/ext/vendor2/foo/type/',
dirname(__FILE__) . '/ext/vendor2/foo/typewrong/',
__DIR__ . '/ext/vendor2/foo/sub/type/',
__DIR__ . '/ext/vendor2/foo/type/',
__DIR__ . '/ext/vendor2/foo/typewrong/',
), $dirs);
}
@ -224,7 +224,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
{
$files = $this->finder
->extension_directory('/type')
->find_from_extension('vendor2/foo', dirname(__FILE__) . '/ext/vendor2/foo/');
->find_from_extension('vendor2/foo', __DIR__ . '/ext/vendor2/foo/');
$classes = $this->finder->get_classes_from_files($files);
sort($classes);
@ -243,7 +243,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function test_get_classes_create_cache()
{
$cache = new phpbb_mock_cache;
$finder = new \phpbb\finder(new \phpbb\filesystem\filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name');
$finder = new \phpbb\finder(new \phpbb\filesystem\filesystem(), __DIR__ . '/', $cache, 'php', '_custom_cache_name');
$finder->set_extensions(array_keys($this->extension_manager->all_enabled()));
$files = $finder->suffix('_class.php')->get_files();
@ -284,7 +284,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
$finder = new \phpbb\finder(
new \phpbb\filesystem\filesystem(),
dirname(__FILE__) . '/',
__DIR__ . '/',
new phpbb_mock_cache(array(
'_ext_finder' => array(
md5(serialize($query)) => array('file_name' => 'extension'),
@ -300,7 +300,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
sort($classes);
$this->assertEquals(
array(dirname(__FILE__) . '/file_name'),
array(__DIR__ . '/file_name'),
$classes
);
}

12
tests/extension/manager_test.php
View File

@ -11,10 +11,10 @@
*
*/
require_once dirname(__FILE__) . '/ext/vendor2/bar/ext.php';
require_once dirname(__FILE__) . '/ext/vendor2/foo/ext.php';
require_once dirname(__FILE__) . '/ext/vendor3/foo/ext.php';
require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php';
require_once __DIR__ . '/ext/vendor2/bar/ext.php';
require_once __DIR__ . '/ext/vendor2/foo/ext.php';
require_once __DIR__ . '/ext/vendor3/foo/ext.php';
require_once __DIR__ . '/ext/vendor/moo/ext.php';
class phpbb_extension_manager_test extends phpbb_database_test_case
{
@ -23,7 +23,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/extensions.xml');
}
protected function setUp(): void
@ -178,7 +178,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$config,
new \phpbb\filesystem\filesystem(),
'phpbb_ext',
dirname(__FILE__) . '/',
__DIR__ . '/',
$php_ext,
($with_cache) ? new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_root_path, $php_ext) : null
);

4
tests/extension/metadata_manager_test.php
View File

@ -29,7 +29,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/extensions.xml');
}
protected function setUp(): void
@ -42,7 +42,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$this->db = $this->new_dbal();
$factory = new \phpbb\db\tools\factory();
$this->db_tools = $factory->get($this->db);
$this->phpbb_root_path = dirname(__FILE__) . '/';
$this->phpbb_root_path = __DIR__ . '/';
$this->phpEx = 'php';
$this->cache = new \phpbb\cache\service(new phpbb_mock_cache(), $this->config, $this->db, $this->phpbb_root_path, $this->phpEx);

20
tests/extension/modules_test.php
View File

@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/ext/vendor2/foo/acp/a_info.php';
require_once dirname(__FILE__) . '/ext/vendor2/foo/mcp/a_info.php';
require_once dirname(__FILE__) . '/ext/vendor2/foo/acp/fail_info.php';
require_once dirname(__FILE__) . '/ext/vendor2/bar/acp/a_info.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_module.php';
require_once __DIR__ . '/ext/vendor2/foo/acp/a_info.php';
require_once __DIR__ . '/ext/vendor2/foo/mcp/a_info.php';
require_once __DIR__ . '/ext/vendor2/foo/acp/fail_info.php';
require_once __DIR__ . '/ext/vendor2/bar/acp/a_info.php';
require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php';
require_once __DIR__ . '/../../phpBB/includes/functions_module.php';
class phpbb_extension_modules_test extends phpbb_test_case
{
@ -29,7 +29,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
global $phpbb_extension_manager;
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@ -49,7 +49,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
$this->createMock('\phpbb\db\driver\driver_interface'),
$this->extension_manager,
MODULES_TABLE,
dirname(__FILE__) . '/',
__DIR__ . '/',
'php'
);
}
@ -61,7 +61,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
// $this->markTestIncomplete('Modules no speak namespace! Going to get rid of db modules altogether and fix this test after.');
// Correctly set the root path for this test to this directory, so the classes can be found
$phpbb_root_path = dirname(__FILE__) . '/';
$phpbb_root_path = __DIR__ . '/';
// Find acp module info files
$acp_modules = $this->module_manager->get_module_infos('acp');
@ -193,7 +193,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
global $phpbb_extension_manager, $phpbb_dispatcher;
$phpbb_extension_manager = $this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',

4
tests/feed/attachments_base_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once(dirname(__FILE__) . '/attachments_mock_feed.php');
require_once(__DIR__ . '/attachments_mock_feed.php');
class phpbb_feed_attachments_base_test extends phpbb_database_test_case
{
@ -22,7 +22,7 @@ class phpbb_feed_attachments_base_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/../extension/fixtures/extensions.xml');
return $this->createXMLDataSet(__DIR__ . '/../extension/fixtures/extensions.xml');
}
protected function setUp(): void

2
tests/files/types_remote_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/type_foo.php';
require_once __DIR__ . '/type_foo.php';
class phpbb_files_types_remote_test extends phpbb_test_case
{

2
tests/functional/acp_groups_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_groups_test_case.php';
require_once __DIR__ . '/common_groups_test_case.php';
/**
* @group functional

2
tests/functional/avatar_acp_groups_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
require_once __DIR__ . '/common_avatar_test_case.php';
/**
* @group functional

2
tests/functional/avatar_acp_users_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
require_once __DIR__ . '/common_avatar_test_case.php';
/**
* @group functional

2
tests/functional/avatar_ucp_groups_test.php
View File

@ -10,7 +10,7 @@
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
require_once __DIR__ . '/common_avatar_test_case.php';
/**
* @group functional

2
tests/functional/avatar_ucp_users_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
require_once __DIR__ . '/common_avatar_test_case.php';
/**
* @group functional

2
tests/functional/download_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php';
require_once __DIR__ . '/../../phpBB/includes/functions_posting.php';
/**
* @group functional

2
tests/functional/extension_acp_test.php
View File

@ -27,7 +27,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/../extension/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void

2
tests/functional/extension_controller_test.php
View File

@ -35,7 +35,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void

2
tests/functional/extension_global_lang_test.php
View File

@ -31,7 +31,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void

6
tests/functional/extension_module_test.php
View File

@ -10,7 +10,7 @@
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php';
require_once __DIR__ . '/../../phpBB/includes/acp/acp_modules.php';
/**
* @group functional
@ -30,7 +30,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void
@ -51,7 +51,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
$db = $this->get_db();
$cache = $this->get_cache_driver();
$modules = new \phpbb\module\module_manager($cache, $db, $this->phpbb_extension_manager, MODULES_TABLE, dirname(__FILE__) . '/../../phpBB/', 'php');
$modules = new \phpbb\module\module_manager($cache, $db, $this->phpbb_extension_manager, MODULES_TABLE, __DIR__ . '/../../phpBB/', 'php');
$sql = 'SELECT module_id
FROM ' . MODULES_TABLE . "

2
tests/functional/extension_permission_lang_test.php
View File

@ -31,7 +31,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void

2
tests/functional/metadata_manager_test.php
View File

@ -36,7 +36,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
parent::setUpBeforeClass();
self::$helper = new phpbb_test_case_helpers(__CLASS__);
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
self::$helper->copy_ext_fixtures(__DIR__ . '/fixtures/ext/', self::$fixtures);
}
static public function tearDownAfterClass(): void

2
tests/functional/search/mysql_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group functional

2
tests/functional/search/native_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group functional

2
tests/functional/search/postgres_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group functional

2
tests/functional/search/sphinx_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group functional

2
tests/functional/ucp_groups_test.php
View File

@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/common_groups_test_case.php';
require_once __DIR__ . '/common_groups_test_case.php';
/**
* @group functional

Some files were not shown because too many files have changed in this diff Show More