From 8c9d26db1fa72d844fbd1a954cd9ecfe46dc206a Mon Sep 17 00:00:00 2001 From: DinHere Date: Sun, 3 Dec 2017 17:19:59 +0200 Subject: [PATCH 1/5] [ticket/15392] Changed dirname(__FILE__) to __DIR__ Changed dirname(__FILE__) to __DIR__ everywhere PHPBB3-15392 --- Vagrantfile | 2 +- build/build_helper.php | 8 ++--- phpBB/develop/create_schema_files.php | 4 +-- phpBB/develop/lang_duplicates.php | 2 +- phpBB/includes/functions.php | 4 +-- phpBB/includes/functions_download.php | 2 +- tests/acp_board/select_auth_method_test.php | 6 ++-- tests/attachment/delete_test.php | 4 +-- tests/attachment/resync_test.php | 2 +- tests/attachment/upload_test.php | 4 +-- tests/auth/provider_apache_test.php | 2 +- tests/auth/provider_db_test.php | 2 +- .../provider_oauth_token_storage_test.php | 4 +-- tests/avatar/manager_test.php | 4 +-- tests/bbcode/parser_test.php | 4 +-- tests/bbcode/url_bbcode_test.php | 4 +-- tests/cache/apcu_driver_test.php | 4 +-- tests/cache/cache_memory_test.php | 4 +-- tests/cache/dummy_driver_test.php | 2 +- tests/cache/file_driver_test.php | 4 +-- tests/cache/redis_driver_test.php | 4 +-- tests/captcha/qa_test.php | 2 +- tests/class_loader/class_loader_test.php | 4 +-- tests/compress/compress_test.php | 14 ++++---- tests/config/db_test.php | 2 +- tests/config/db_text_test.php | 2 +- tests/console/cache/purge_test.php | 2 +- tests/console/cron/cron_list_test.php | 4 +-- tests/console/cron/run_test.php | 4 +-- tests/console/thumbnail_test.php | 10 +++--- tests/console/update/check_test.php | 6 ++-- tests/console/user/activate_test.php | 2 +- tests/console/user/add_test.php | 2 +- tests/console/user/base.php | 2 +- tests/console/user/delete_test.php | 2 +- tests/console/user/reclean_test.php | 2 +- tests/content_visibility/delete_post_test.php | 8 ++--- .../get_forums_visibility_sql_test.php | 2 +- .../get_global_visibility_sql_test.php | 2 +- .../get_visibility_sql_test.php | 2 +- .../set_post_visibility_test.php | 6 ++-- .../set_topic_visibility_test.php | 6 ++-- tests/controller/common_helper_route.php | 10 +++--- tests/controller/controller_test.php | 14 ++++---- .../helper_route_adm_subdir_test.php | 2 +- tests/controller/helper_route_adm_test.php | 2 +- tests/controller/helper_route_other_app.php | 2 +- tests/controller/helper_route_root_test.php | 2 +- tests/controller/helper_route_slash_test.php | 2 +- .../helper_route_unclean_path_test.php | 2 +- tests/cron/manager_test.php | 12 +++---- tests/datetime/from_format_test.php | 2 +- tests/dbal/auto_increment_test.php | 2 +- tests/dbal/boolean_processor_test.php | 2 +- tests/dbal/case_test.php | 2 +- tests/dbal/concatenate_test.php | 2 +- tests/dbal/connect_test.php | 2 +- tests/dbal/cross_join_test.php | 2 +- tests/dbal/db_tools_test.php | 2 +- tests/dbal/migrator_test.php | 32 +++++++++---------- tests/dbal/migrator_tool_config_text_test.php | 2 +- tests/dbal/migrator_tool_module_test.php | 2 +- tests/dbal/migrator_tool_permission_test.php | 2 +- tests/dbal/order_lower_test.php | 2 +- tests/dbal/schema_test.php | 2 +- tests/dbal/select_test.php | 2 +- tests/dbal/sql_affected_rows_test.php | 2 +- tests/dbal/sql_insert_buffer_test.php | 2 +- tests/dbal/write_sequence_test.php | 2 +- tests/dbal/write_test.php | 2 +- tests/di/create_container_test.php | 12 +++---- tests/download/http_byte_range_test.php | 2 +- tests/download/http_user_agent_test.php | 2 +- tests/email/email_parsing_test.php | 2 +- tests/event/md_exporter_test.php | 2 +- tests/event/php_exporter_test.php | 2 +- tests/extension/extension_base_test.php | 8 ++--- tests/extension/finder_test.php | 18 +++++------ tests/extension/manager_test.php | 12 +++---- tests/extension/metadata_manager_test.php | 4 +-- tests/extension/modules_test.php | 20 ++++++------ tests/feed/attachments_base_test.php | 4 +-- tests/files/types_remote_test.php | 2 +- tests/functional/acp_groups_test.php | 2 +- tests/functional/avatar_acp_groups_test.php | 2 +- tests/functional/avatar_acp_users_test.php | 2 +- tests/functional/avatar_ucp_groups_test.php | 2 +- tests/functional/avatar_ucp_users_test.php | 2 +- tests/functional/download_test.php | 2 +- tests/functional/extension_acp_test.php | 2 +- .../functional/extension_controller_test.php | 2 +- .../functional/extension_global_lang_test.php | 2 +- tests/functional/extension_module_test.php | 6 ++-- .../extension_permission_lang_test.php | 2 +- tests/functional/metadata_manager_test.php | 2 +- tests/functional/search/mysql_test.php | 2 +- tests/functional/search/native_test.php | 2 +- tests/functional/search/postgres_test.php | 2 +- tests/functional/search/sphinx_test.php | 2 +- tests/functional/ucp_groups_test.php | 2 +- tests/functions/language_select_test.php | 2 +- tests/functions/obtain_online_test.php | 2 +- tests/functions/phpbb_get_banned_user_ids.php | 4 +-- tests/functions/style_select_test.php | 2 +- tests/functions/user_delete_test.php | 4 +-- tests/functions/validate_date_test.php | 4 +-- tests/functions/validate_email_test.php | 8 ++--- tests/functions/validate_hex_colour_test.php | 2 +- tests/functions/validate_jabber_test.php | 4 +-- tests/functions/validate_lang_iso_test.php | 6 ++-- tests/functions/validate_match_test.php | 4 +-- tests/functions/validate_num_test.php | 4 +-- tests/functions/validate_password_test.php | 4 +-- tests/functions/validate_string_test.php | 4 +-- tests/functions/validate_user_email_test.php | 8 ++--- tests/functions/validate_username_test.php | 8 ++--- tests/functions/validate_with_method_test.php | 4 +-- .../functions_acp/build_cfg_template_test.php | 2 +- tests/functions_acp/build_select_test.php | 2 +- tests/functions_acp/h_radio_test.php | 2 +- .../insert_config_array_test.php | 2 +- .../validate_config_vars_test.php | 2 +- tests/functions_acp/validate_range_test.php | 2 +- ...avoiding_duplicates_notify_status_test.php | 4 +-- .../update_rows_avoiding_duplicates_test.php | 4 +-- .../get_max_setting_from_group_test.php | 4 +-- tests/functions_user/delete_user_test.php | 4 +-- .../group_user_attributes_test.php | 4 +-- tests/groupposition/legend_test.php | 2 +- tests/groupposition/teampage_test.php | 2 +- tests/lint_test.php | 18 +++++------ tests/lock/db_test.php | 2 +- tests/log/add_test.php | 2 +- tests/log/delete_test.php | 2 +- tests/log/function_add_log_test.php | 2 +- tests/log/function_view_log_test.php | 8 ++--- tests/mcp/post_ip_test.php | 4 +-- tests/migrator/convert_timezones_test.php | 2 +- tests/mimetype/guesser_test.php | 6 ++-- tests/network/ftp_fsock_pasv_epsv_test.php | 2 +- tests/notification/base.php | 2 +- tests/notification/convert_test.php | 4 +-- tests/notification/group_request_test.php | 4 +-- tests/notification/notification_test.php | 4 +-- tests/notification/submit_post_base.php | 4 +-- .../submit_post_type_bookmark_test.php | 2 +- .../submit_post_type_post_in_queue_test.php | 2 +- .../submit_post_type_post_test.php | 2 +- .../submit_post_type_quote_test.php | 2 +- .../submit_post_type_topic_test.php | 2 +- tests/notification/user_list_trim_test.php | 2 +- tests/pagination/pagination_test.php | 10 +++--- tests/passwords/drivers_test.php | 2 +- tests/passwords/manager_test.php | 2 +- tests/path_helper/path_helper_test.php | 2 +- tests/privmsgs/delete_user_pms_test.php | 4 +-- tests/regex/password_complexity_test.php | 2 +- tests/search/common_test_case.php | 2 +- tests/search/mysql_test.php | 4 +-- tests/search/native_test.php | 4 +-- tests/search/postgres_test.php | 4 +-- tests/security/extract_current_page_test.php | 2 +- tests/security/redirect_test.php | 2 +- tests/session/check_ban_test.php | 4 +-- tests/session/check_isvalid_test.php | 4 +-- tests/session/create_test.php | 4 +-- tests/session/extract_hostname_test.php | 4 +-- tests/session/extract_page_test.php | 4 +-- tests/session/garbage_collection_test.php | 4 +-- tests/session/session_key_test.php | 4 +-- tests/session/testable_facade.php | 4 +-- tests/session/testable_factory.php | 4 +-- tests/session/unset_admin_test.php | 4 +-- tests/session/validate_referrer_test.php | 4 +-- tests/template/includephp_test.php | 4 +-- .../subdir/includephp_from_subdir_test.php | 2 +- tests/template/template_allfolder_test.php | 4 +-- tests/template/template_events_test.php | 6 ++-- tests/template/template_includecss_test.php | 4 +-- tests/template/template_includejs_test.php | 2 +- tests/template/template_inheritance_test.php | 2 +- tests/template/template_parser_test.php | 2 +- tests/template/template_test.php | 2 +- .../template/template_test_case_with_tree.php | 2 +- ...phpbb_database_test_connection_manager.php | 4 +-- .../phpbb_functional_test_case.php | 2 +- .../phpbb_session_test_case.php | 4 +-- .../phpbb_test_case_helpers.php | 4 +-- tests/text_reparser/manager_test.php | 2 +- tests/tree/nestedset_forum_base.php | 2 +- tests/tree/nestedset_forum_get_data_test.php | 2 +- .../nestedset_forum_insert_delete_test.php | 2 +- tests/tree/nestedset_forum_move_test.php | 2 +- .../tree/nestedset_forum_regenerate_test.php | 2 +- tests/tree/nestedset_forum_test.php | 2 +- tests/upload/fileupload_test.php | 6 ++-- tests/user/user_loader_test.php | 2 +- tests/wrapper/phpbb_php_ini_test.php | 2 +- 198 files changed, 373 insertions(+), 373 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ab225c9ad9..195c1621f5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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" diff --git a/build/build_helper.php b/build/build_helper.php index c33e2419c6..118ab724ab 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -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( diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index fdaa285f99..10f4ffba0b 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -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'); diff --git a/phpBB/develop/lang_duplicates.php b/phpBB/develop/lang_duplicates.php index 7a74b1088a..1ebc9180a3 100644 --- a/phpBB/develop/lang_duplicates.php +++ b/phpBB/develop/lang_duplicates.php @@ -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)) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index fabb6baece..06ff2eca84 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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__ . '/../'); } } diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 20fe4bf843..1ae59448ac 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -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; } diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php index b651fbedf9..e06b5f845d 100644 --- a/tests/acp_board/select_auth_method_test.php +++ b/tests/acp_board/select_auth_method_test.php @@ -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 { diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php index 2fac3344a8..aafc95983d 100644 --- a/tests/attachment/delete_test.php +++ b/tests/attachment/delete_test.php @@ -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 diff --git a/tests/attachment/resync_test.php b/tests/attachment/resync_test.php index f1ddaa00a5..9cadbea047 100644 --- a/tests/attachment/resync_test.php +++ b/tests/attachment/resync_test.php @@ -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 diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php index 2743ee596d..9a30a20b23 100644 --- a/tests/attachment/upload_test.php +++ b/tests/attachment/upload_test.php @@ -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 diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 3690a55cee..567ec538f2 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -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'); } /** diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index 8305e7caa4..d1b6ec2f2c 100644 --- a/tests/auth/provider_db_test.php +++ b/tests/auth/provider_db_test.php @@ -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() diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php index 9b675e4b4e..38bede0001 100644 --- a/tests/auth/provider_oauth_token_storage_test.php +++ b/tests/auth/provider_oauth_token_storage_test.php @@ -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() diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index d5a32f7061..3e71150f1f 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -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 diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php index 0f11189798..5aa829f37d 100644 --- a/tests/bbcode/parser_test.php +++ b/tests/bbcode/parser_test.php @@ -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 { diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php index f95970a6bb..2dfed41b95 100644 --- a/tests/bbcode/url_bbcode_test.php +++ b/tests/bbcode/url_bbcode_test.php @@ -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 { diff --git a/tests/cache/apcu_driver_test.php b/tests/cache/apcu_driver_test.php index 86ae880dab..e4c3ffcb5b 100644 --- a/tests/cache/apcu_driver_test.php +++ b/tests/cache/apcu_driver_test.php @@ -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 diff --git a/tests/cache/cache_memory_test.php b/tests/cache/cache_memory_test.php index 3a465aef7e..1607d29425 100644 --- a/tests/cache/cache_memory_test.php +++ b/tests/cache/cache_memory_test.php @@ -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 diff --git a/tests/cache/dummy_driver_test.php b/tests/cache/dummy_driver_test.php index 6802e120ab..09d33b0475 100644 --- a/tests/cache/dummy_driver_test.php +++ b/tests/cache/dummy_driver_test.php @@ -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 diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index 37973edba3..eb9ee244f1 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -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 diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php index c5ec7880fd..ec9de385a1 100644 --- a/tests/cache/redis_driver_test.php +++ b/tests/cache/redis_driver_test.php @@ -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 diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php index 361b5482f1..996ae53ad8 100644 --- a/tests/captcha/qa_test.php +++ b/tests/captcha/qa_test.php @@ -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 diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index b10010df3f..ae8d82a98d 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -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); diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php index f67726c205..4d1f1fb018 100644 --- a/tests/compress/compress_test.php +++ b/tests/compress/compress_test.php @@ -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(); diff --git a/tests/config/db_test.php b/tests/config/db_test.php index 49d869e388..cf89341566 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -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 diff --git a/tests/config/db_text_test.php b/tests/config/db_text_test.php index 9bf5a2007d..97d7daaf07 100644 --- a/tests/config/db_text_test.php +++ b/tests/config/db_text_test.php @@ -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 diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php index 2bb4252c41..ab5cedc51a 100644 --- a/tests/console/cache/purge_test.php +++ b/tests/console/cache/purge_test.php @@ -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 { diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php index 8c84d69e25..30e93a7850 100644 --- a/tests/console/cron/cron_list_test.php +++ b/tests/console/cron/cron_list_test.php @@ -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; diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php index a75635660d..205ff821b5 100644 --- a/tests/console/cron/run_test.php +++ b/tests/console/cron/run_test.php @@ -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 diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index fb8e146e3c..855d46ab3f 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -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 diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php index 3d52212325..2578eb21cc 100644 --- a/tests/console/update/check_test.php +++ b/tests/console/update/check_test.php @@ -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 diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 59c426bb4f..f646a0f92b 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -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 { diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php index 126771c7c6..31e4334aec 100644 --- a/tests/console/user/add_test.php +++ b/tests/console/user/add_test.php @@ -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 { diff --git a/tests/console/user/base.php b/tests/console/user/base.php index c9ddecc7a4..2ac05576ce 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -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 diff --git a/tests/console/user/delete_test.php b/tests/console/user/delete_test.php index 999203b965..7cb804a451 100644 --- a/tests/console/user/delete_test.php +++ b/tests/console/user/delete_test.php @@ -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 { diff --git a/tests/console/user/reclean_test.php b/tests/console/user/reclean_test.php index 1bf0b8ef5a..8790f4243a 100644 --- a/tests/console/user/reclean_test.php +++ b/tests/console/user/reclean_test.php @@ -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 { diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php index 77f2559ad6..280ec6b7c3 100644 --- a/tests/content_visibility/delete_post_test.php +++ b/tests/content_visibility/delete_post_test.php @@ -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() diff --git a/tests/content_visibility/get_forums_visibility_sql_test.php b/tests/content_visibility/get_forums_visibility_sql_test.php index fde2b62131..f698e88033 100644 --- a/tests/content_visibility/get_forums_visibility_sql_test.php +++ b/tests/content_visibility/get_forums_visibility_sql_test.php @@ -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() diff --git a/tests/content_visibility/get_global_visibility_sql_test.php b/tests/content_visibility/get_global_visibility_sql_test.php index eced3aa680..897bcad3e6 100644 --- a/tests/content_visibility/get_global_visibility_sql_test.php +++ b/tests/content_visibility/get_global_visibility_sql_test.php @@ -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() diff --git a/tests/content_visibility/get_visibility_sql_test.php b/tests/content_visibility/get_visibility_sql_test.php index 6026778487..5107a1a826 100644 --- a/tests/content_visibility/get_visibility_sql_test.php +++ b/tests/content_visibility/get_visibility_sql_test.php @@ -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() diff --git a/tests/content_visibility/set_post_visibility_test.php b/tests/content_visibility/set_post_visibility_test.php index 8f629dca62..f349df7b2e 100644 --- a/tests/content_visibility/set_post_visibility_test.php +++ b/tests/content_visibility/set_post_visibility_test.php @@ -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() diff --git a/tests/content_visibility/set_topic_visibility_test.php b/tests/content_visibility/set_topic_visibility_test.php index 3db79c0fe0..447ae9e1d8 100644 --- a/tests/content_visibility/set_topic_visibility_test.php +++ b/tests/content_visibility/set_topic_visibility_test.php @@ -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() diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 506d422819..760679b71f 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -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(); diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index bed06f8053..5b551e7f75 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -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) diff --git a/tests/controller/helper_route_adm_subdir_test.php b/tests/controller/helper_route_adm_subdir_test.php index a1bf1b8805..9e251ffc9a 100644 --- a/tests/controller/helper_route_adm_subdir_test.php +++ b/tests/controller/helper_route_adm_subdir_test.php @@ -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 { diff --git a/tests/controller/helper_route_adm_test.php b/tests/controller/helper_route_adm_test.php index 6ee394eaaa..3d1fa55db7 100644 --- a/tests/controller/helper_route_adm_test.php +++ b/tests/controller/helper_route_adm_test.php @@ -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 { diff --git a/tests/controller/helper_route_other_app.php b/tests/controller/helper_route_other_app.php index e5513a5180..2ee291efcf 100644 --- a/tests/controller/helper_route_other_app.php +++ b/tests/controller/helper_route_other_app.php @@ -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 { diff --git a/tests/controller/helper_route_root_test.php b/tests/controller/helper_route_root_test.php index 12462e076d..496027961e 100644 --- a/tests/controller/helper_route_root_test.php +++ b/tests/controller/helper_route_root_test.php @@ -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 { diff --git a/tests/controller/helper_route_slash_test.php b/tests/controller/helper_route_slash_test.php index c781a6943e..3b3d66bb9e 100644 --- a/tests/controller/helper_route_slash_test.php +++ b/tests/controller/helper_route_slash_test.php @@ -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 { diff --git a/tests/controller/helper_route_unclean_path_test.php b/tests/controller/helper_route_unclean_path_test.php index 80f1a99fff..b2bc75edf5 100644 --- a/tests/controller/helper_route_unclean_path_test.php +++ b/tests/controller/helper_route_unclean_path_test.php @@ -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 { diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php index 88251bf79d..ea8ebc05dc 100644 --- a/tests/cron/manager_test.php +++ b/tests/cron/manager_test.php @@ -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 { diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 7ecb546768..d95bacdbce 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -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 { diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php index 27d10d2843..7ffa2fb37c 100644 --- a/tests/dbal/auto_increment_test.php +++ b/tests/dbal/auto_increment_test.php @@ -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 diff --git a/tests/dbal/boolean_processor_test.php b/tests/dbal/boolean_processor_test.php index c69f60a1a8..517c1dcaf8 100644 --- a/tests/dbal/boolean_processor_test.php +++ b/tests/dbal/boolean_processor_test.php @@ -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() diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php index 5f1c7d61fa..daa1313e67 100644 --- a/tests/dbal/case_test.php +++ b/tests/dbal/case_test.php @@ -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() diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php index 00e7e107aa..b033f3783d 100644 --- a/tests/dbal/concatenate_test.php +++ b/tests/dbal/concatenate_test.php @@ -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() diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php index 3933dab798..622e55f248 100644 --- a/tests/dbal/connect_test.php +++ b/tests/dbal/connect_test.php @@ -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() diff --git a/tests/dbal/cross_join_test.php b/tests/dbal/cross_join_test.php index be9258c58b..95bcc0be53 100644 --- a/tests/dbal/cross_join_test.php +++ b/tests/dbal/cross_join_test.php @@ -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() diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php index 9ee48c8412..30c95e52e5 100644 --- a/tests/dbal/db_tools_test.php +++ b/tests/dbal/db_tools_test.php @@ -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 diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index e8de47a309..df0c2506ed 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -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 ); diff --git a/tests/dbal/migrator_tool_config_text_test.php b/tests/dbal/migrator_tool_config_text_test.php index e31a74acdb..d75ac834a6 100644 --- a/tests/dbal/migrator_tool_config_text_test.php +++ b/tests/dbal/migrator_tool_config_text_test.php @@ -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 diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index 8edd81f8b9..d1796ca97c 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -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 diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php index d1eb6b2349..723eef2f0a 100644 --- a/tests/dbal/migrator_tool_permission_test.php +++ b/tests/dbal/migrator_tool_permission_test.php @@ -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 diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php index b101d28c7d..472ca1b84f 100644 --- a/tests/dbal/order_lower_test.php +++ b/tests/dbal/order_lower_test.php @@ -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() diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php index 59965655ad..31af5ed52d 100644 --- a/tests/dbal/schema_test.php +++ b/tests/dbal/schema_test.php @@ -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() diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php index 0dac66fc46..141ee03a14 100644 --- a/tests/dbal/select_test.php +++ b/tests/dbal/select_test.php @@ -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() diff --git a/tests/dbal/sql_affected_rows_test.php b/tests/dbal/sql_affected_rows_test.php index e6d0b79c40..e957f2c396 100644 --- a/tests/dbal/sql_affected_rows_test.php +++ b/tests/dbal/sql_affected_rows_test.php @@ -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() diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php index f06d013924..c1ab9ce05b 100644 --- a/tests/dbal/sql_insert_buffer_test.php +++ b/tests/dbal/sql_insert_buffer_test.php @@ -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() diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php index a2d5921797..d3f170eaba 100644 --- a/tests/dbal/write_sequence_test.php +++ b/tests/dbal/write_sequence_test.php @@ -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() diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index 4fa5cc37a2..f0093ff869 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -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() diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index bb87a57a7b..ff53fbf520 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -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/', ); } } diff --git a/tests/download/http_byte_range_test.php b/tests/download/http_byte_range_test.php index 8975ec1799..b138c4da30 100644 --- a/tests/download/http_byte_range_test.php +++ b/tests/download/http_byte_range_test.php @@ -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 { diff --git a/tests/download/http_user_agent_test.php b/tests/download/http_user_agent_test.php index bfee265add..74a626432f 100644 --- a/tests/download/http_user_agent_test.php +++ b/tests/download/http_user_agent_test.php @@ -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 { diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 4ddc8618c7..8bbfd51b0b 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -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', diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php index 2eeb48ea05..ec65c9ec8a 100644 --- a/tests/event/md_exporter_test.php +++ b/tests/event/md_exporter_test.php @@ -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()); } diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php index e93b8a7876..0effa9d181 100644 --- a/tests/event/php_exporter_test.php +++ b/tests/event/php_exporter_test.php @@ -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() diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php index 03d5547c7c..3011634c4b 100644 --- a/tests/extension/extension_base_test.php +++ b/tests/extension/extension_base_test.php @@ -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', diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php index 0c67629c6a..5bd17890d4 100644 --- a/tests/extension/finder_test.php +++ b/tests/extension/finder_test.php @@ -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 ); } diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index 3ab0f608d1..1675c27ede 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -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 ); diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index a2f0542979..682882c3fc 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -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); diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php index 0d4202dcb3..7d41b975a7 100644 --- a/tests/extension/modules_test.php +++ b/tests/extension/modules_test.php @@ -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', diff --git a/tests/feed/attachments_base_test.php b/tests/feed/attachments_base_test.php index 7a04e1a143..8b13d8eb98 100644 --- a/tests/feed/attachments_base_test.php +++ b/tests/feed/attachments_base_test.php @@ -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 diff --git a/tests/files/types_remote_test.php b/tests/files/types_remote_test.php index d42a609fbb..1b3fccb561 100644 --- a/tests/files/types_remote_test.php +++ b/tests/files/types_remote_test.php @@ -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 { diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php index 06001fd262..20f1271011 100644 --- a/tests/functional/acp_groups_test.php +++ b/tests/functional/acp_groups_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_groups_test_case.php'; +require_once __DIR__ . '/common_groups_test_case.php'; /** * @group functional diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php index f9251fd2f0..ecc6f15f15 100644 --- a/tests/functional/avatar_acp_groups_test.php +++ b/tests/functional/avatar_acp_groups_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php index 8b05a28658..7568c3a264 100644 --- a/tests/functional/avatar_acp_users_test.php +++ b/tests/functional/avatar_acp_users_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php index 52ef67543e..2980e814e3 100644 --- a/tests/functional/avatar_ucp_groups_test.php +++ b/tests/functional/avatar_ucp_groups_test.php @@ -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 diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php index 2f0832e092..b78bdac0e2 100644 --- a/tests/functional/avatar_ucp_users_test.php +++ b/tests/functional/avatar_ucp_users_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_avatar_test_case.php'; +require_once __DIR__ . '/common_avatar_test_case.php'; /** * @group functional diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php index 6b58a9fff4..7eed292052 100644 --- a/tests/functional/download_test.php +++ b/tests/functional/download_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; /** * @group functional diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 4ad2cb0e3f..94ed7a35b7 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -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 diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 17b5803041..aa408b3b56 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -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 diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php index 0cd096e867..8c9c38937b 100644 --- a/tests/functional/extension_global_lang_test.php +++ b/tests/functional/extension_global_lang_test.php @@ -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 diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index d9c01175ea..8c676361e6 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -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 . " diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php index 5c57c37146..47adc3f87e 100644 --- a/tests/functional/extension_permission_lang_test.php +++ b/tests/functional/extension_permission_lang_test.php @@ -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 diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php index 4ecbdd37ca..5ef67836c9 100644 --- a/tests/functional/metadata_manager_test.php +++ b/tests/functional/metadata_manager_test.php @@ -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 diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php index f7e6cbf5f1..0f857e9167 100644 --- a/tests/functional/search/mysql_test.php +++ b/tests/functional/search/mysql_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php index 9908b9cdaa..52a653d585 100644 --- a/tests/functional/search/native_test.php +++ b/tests/functional/search/native_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php index a76cc13493..6f5e7e48c2 100644 --- a/tests/functional/search/postgres_test.php +++ b/tests/functional/search/postgres_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional diff --git a/tests/functional/search/sphinx_test.php b/tests/functional/search/sphinx_test.php index 4bf1ab0e16..926f1c6424 100644 --- a/tests/functional/search/sphinx_test.php +++ b/tests/functional/search/sphinx_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; /** * @group functional diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php index f8e801dcf7..387ae827e4 100644 --- a/tests/functional/ucp_groups_test.php +++ b/tests/functional/ucp_groups_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_groups_test_case.php'; +require_once __DIR__ . '/common_groups_test_case.php'; /** * @group functional diff --git a/tests/functions/language_select_test.php b/tests/functions/language_select_test.php index 2d1296d72f..07bc62b259 100644 --- a/tests/functions/language_select_test.php +++ b/tests/functions/language_select_test.php @@ -15,7 +15,7 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/language_select.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/language_select.xml'); } static public function language_select_data() diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php index e6929b1549..3f025364ff 100644 --- a/tests/functions/obtain_online_test.php +++ b/tests/functions/obtain_online_test.php @@ -15,7 +15,7 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/obtain_online.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/obtain_online.xml'); } protected function setUp(): void diff --git a/tests/functions/phpbb_get_banned_user_ids.php b/tests/functions/phpbb_get_banned_user_ids.php index cbabb85485..0877a3526e 100644 --- a/tests/functions/phpbb_get_banned_user_ids.php +++ b/tests/functions/phpbb_get_banned_user_ids.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_get_banned_user_ids_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/banned_users.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/banned_users.xml'); } public function phpbb_get_banned_user_ids_data() diff --git a/tests/functions/style_select_test.php b/tests/functions/style_select_test.php index 27f0e68c88..e36b799bde 100644 --- a/tests/functions/style_select_test.php +++ b/tests/functions/style_select_test.php @@ -15,7 +15,7 @@ class phpbb_functions_style_select_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/style_select.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/style_select.xml'); } static public function style_select_data() diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php index 8417be5ede..ab9341b617 100644 --- a/tests/functions/user_delete_test.php +++ b/tests/functions/user_delete_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_delete_test extends phpbb_database_test_case { @@ -20,7 +20,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_delete.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_delete.xml'); } protected function setUp(): void diff --git a/tests/functions/validate_date_test.php b/tests/functions/validate_date_test.php index cd4e7430f3..60b44b1534 100644 --- a/tests/functions/validate_date_test.php +++ b/tests/functions/validate_date_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_date_test extends phpbb_test_case { diff --git a/tests/functions/validate_email_test.php b/tests/functions/validate_email_test.php index e163d01412..f30e1e5c05 100644 --- a/tests/functions/validate_email_test.php +++ b/tests/functions/validate_email_test.php @@ -7,9 +7,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_email_test extends phpbb_database_test_case { @@ -19,7 +19,7 @@ class phpbb_functions_validate_email_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml'); } protected function setUp(): void diff --git a/tests/functions/validate_hex_colour_test.php b/tests/functions/validate_hex_colour_test.php index b2c4862458..467bcd1d89 100644 --- a/tests/functions/validate_hex_colour_test.php +++ b/tests/functions/validate_hex_colour_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_validate_hex_colour_test extends phpbb_test_case { diff --git a/tests/functions/validate_jabber_test.php b/tests/functions/validate_jabber_test.php index dbdf10cb4a..92cf5062d5 100644 --- a/tests/functions/validate_jabber_test.php +++ b/tests/functions/validate_jabber_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_jabber_test extends phpbb_test_case { diff --git a/tests/functions/validate_lang_iso_test.php b/tests/functions/validate_lang_iso_test.php index cbe5339ea5..6264e21564 100644 --- a/tests/functions/validate_lang_iso_test.php +++ b/tests/functions/validate_lang_iso_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case { @@ -21,7 +21,7 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/language_select.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/language_select.xml'); } protected function setUp(): void diff --git a/tests/functions/validate_match_test.php b/tests/functions/validate_match_test.php index 7159686066..a03d037507 100644 --- a/tests/functions/validate_match_test.php +++ b/tests/functions/validate_match_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_match_test extends phpbb_test_case { diff --git a/tests/functions/validate_num_test.php b/tests/functions/validate_num_test.php index 26470d12f4..c97da1276d 100644 --- a/tests/functions/validate_num_test.php +++ b/tests/functions/validate_num_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_num_test extends phpbb_test_case { diff --git a/tests/functions/validate_password_test.php b/tests/functions/validate_password_test.php index 6e4ccea3ab..bf74cb30fb 100644 --- a/tests/functions/validate_password_test.php +++ b/tests/functions/validate_password_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_password_test extends phpbb_test_case { diff --git a/tests/functions/validate_string_test.php b/tests/functions/validate_string_test.php index 83ba546152..4a79dcd6c7 100644 --- a/tests/functions/validate_string_test.php +++ b/tests/functions/validate_string_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_string_test extends phpbb_test_case { diff --git a/tests/functions/validate_user_email_test.php b/tests/functions/validate_user_email_test.php index fc22b7ac64..fb70c3014a 100644 --- a/tests/functions/validate_user_email_test.php +++ b/tests/functions/validate_user_email_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_user_email_test extends phpbb_database_test_case { @@ -23,7 +23,7 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml'); } protected function setUp(): void diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php index 31837f015b..2ff8bb4e46 100644 --- a/tests/functions/validate_username_test.php +++ b/tests/functions/validate_username_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/../mock/cache.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../mock/cache.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_data_test extends phpbb_database_test_case { @@ -23,7 +23,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_username.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_username.xml'); } protected function setUp(): void diff --git a/tests/functions/validate_with_method_test.php b/tests/functions/validate_with_method_test.php index 1cd610fd2f..d79d5f3c87 100644 --- a/tests/functions/validate_with_method_test.php +++ b/tests/functions/validate_with_method_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; -require_once dirname(__FILE__) . '/validate_data_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/validate_data_helper.php'; class phpbb_functions_validate_with_method_test extends phpbb_test_case { diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php index a3e722c61c..339a9a1d61 100644 --- a/tests/functions_acp/build_cfg_template_test.php +++ b/tests/functions_acp/build_cfg_template_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case { diff --git a/tests/functions_acp/build_select_test.php b/tests/functions_acp/build_select_test.php index 9a295762c3..ed90454c9f 100644 --- a/tests/functions_acp/build_select_test.php +++ b/tests/functions_acp/build_select_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_built_select_test extends phpbb_test_case { diff --git a/tests/functions_acp/h_radio_test.php b/tests/functions_acp/h_radio_test.php index cc9d837357..acba1068f4 100644 --- a/tests/functions_acp/h_radio_test.php +++ b/tests/functions_acp/h_radio_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_h_radio_test extends phpbb_test_case { diff --git a/tests/functions_acp/insert_config_array_test.php b/tests/functions_acp/insert_config_array_test.php index 1264b35bf4..bf71b4e32f 100644 --- a/tests/functions_acp/insert_config_array_test.php +++ b/tests/functions_acp/insert_config_array_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_insert_config_array_test extends phpbb_test_case { diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php index 0198f28a39..c1b4eb60e4 100644 --- a/tests/functions_acp/validate_config_vars_test.php +++ b/tests/functions_acp/validate_config_vars_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case { diff --git a/tests/functions_acp/validate_range_test.php b/tests/functions_acp/validate_range_test.php index 085787105f..8e59011829 100644 --- a/tests/functions_acp/validate_range_test.php +++ b/tests/functions_acp/validate_range_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; class phpbb_functions_acp_validate_range_test extends phpbb_test_case { diff --git a/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php index 150b091ceb..c7c0117dec 100644 --- a/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php +++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_database_helper.php'; class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/topics_watch_duplicates.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/topics_watch_duplicates.xml'); } public static function fixture_data() diff --git a/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php index 0e27f129de..8d4c745997 100644 --- a/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php +++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_database_helper.php'; class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/bookmarks_duplicates.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/bookmarks_duplicates.xml'); } public static function fixture_data() diff --git a/tests/functions_privmsgs/get_max_setting_from_group_test.php b/tests/functions_privmsgs/get_max_setting_from_group_test.php index 6a9018b6d3..ffd602b39d 100644 --- a/tests/functions_privmsgs/get_max_setting_from_group_test.php +++ b/tests/functions_privmsgs/get_max_setting_from_group_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_privmsgs.php'; class phpbb_functions_privmsgs_get_max_setting_from_group_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/get_max_setting_from_group.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/get_max_setting_from_group.xml'); } /** @var \phpbb\db\driver\driver_interface */ diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php index 7e414dad86..199355bcfc 100644 --- a/tests/functions_user/delete_user_test.php +++ b/tests/functions_user/delete_user_test.php @@ -7,7 +7,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_delete_user_test extends phpbb_database_test_case { @@ -16,7 +16,7 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_user.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_user.xml'); } protected function setUp(): void diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php index dd86d23b34..887c21d4ca 100644 --- a/tests/functions_user/group_user_attributes_test.php +++ b/tests/functions_user/group_user_attributes_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_group_user_attributes_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/group_user_attributes.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/group_user_attributes.xml'); } public function group_user_attributes_data() diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php index 66fc909770..95a532bf08 100644 --- a/tests/groupposition/legend_test.php +++ b/tests/groupposition/legend_test.php @@ -15,7 +15,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/legend.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/legend.xml'); } public function get_group_value_data() diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php index 8598e5cfb0..069915c061 100644 --- a/tests/groupposition/teampage_test.php +++ b/tests/groupposition/teampage_test.php @@ -15,7 +15,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/teampage.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/teampage.xml'); } public function get_group_value_data() diff --git a/tests/lint_test.php b/tests/lint_test.php index 6486441f18..cfce137c3b 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -55,7 +55,7 @@ class lint_test extends phpbb_test_case public function lint_data() { - return $this->check(dirname(__FILE__) . '/..'); + return $this->check(__DIR__ . '/..'); } protected function check($root) @@ -81,16 +81,16 @@ class lint_test extends phpbb_test_case continue; } if (is_dir($path) && !in_array($path, array( - dirname(__FILE__) . '/../.git', - dirname(__FILE__) . '/../build/new_version', - dirname(__FILE__) . '/../build/old_versions', - dirname(__FILE__) . '/../phpBB/cache', - dirname(__FILE__) . '/../phpBB/ext', - dirname(__FILE__) . '/../phpBB/store', + __DIR__ . '/../.git', + __DIR__ . '/../build/new_version', + __DIR__ . '/../build/old_versions', + __DIR__ . '/../phpBB/cache', + __DIR__ . '/../phpBB/ext', + __DIR__ . '/../phpBB/store', // PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20 // https://gist.github.com/e003913ffd493da63cbc - dirname(__FILE__) . '/../phpBB/vendor', - dirname(__FILE__) . '/../node_modules', + __DIR__ . '/../phpBB/vendor', + __DIR__ . '/../node_modules', ))) { $files = array_merge($files, $this->check($path)); diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php index c940422f0a..81b3984959 100644 --- a/tests/lock/db_test.php +++ b/tests/lock/db_test.php @@ -19,7 +19,7 @@ class phpbb_lock_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 diff --git a/tests/log/add_test.php b/tests/log/add_test.php index 469d4ebd69..b0d4449cb5 100644 --- a/tests/log/add_test.php +++ b/tests/log/add_test.php @@ -15,7 +15,7 @@ class phpbb_log_add_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/empty_log.xml'); } public function test_log_enabled() diff --git a/tests/log/delete_test.php b/tests/log/delete_test.php index fd8a2cb3df..366d66ee0b 100644 --- a/tests/log/delete_test.php +++ b/tests/log/delete_test.php @@ -17,7 +17,7 @@ class phpbb_log_delete_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/delete_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/delete_log.xml'); } protected function setUp(): void diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php index c3f1a0beba..b572f55699 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -15,7 +15,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/empty_log.xml'); } public static function add_log_function_data() diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index edab371769..9a63e64abe 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -11,15 +11,15 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/../mock/cache.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_admin.php'; +require_once __DIR__ . '/../mock/user.php'; +require_once __DIR__ . '/../mock/cache.php'; class phpbb_log_function_view_log_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/full_log.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/full_log.xml'); } public static function view_log_function_data() diff --git a/tests/mcp/post_ip_test.php b/tests/mcp/post_ip_test.php index f53066c9e6..bd443892e1 100644 --- a/tests/mcp/post_ip_test.php +++ b/tests/mcp/post_ip_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/mcp/mcp_post.php'; +require_once __DIR__ . '/../../phpBB/includes/mcp/mcp_post.php'; class phpbb_mcp_post_ip_test extends phpbb_database_test_case { @@ -20,7 +20,7 @@ class phpbb_mcp_post_ip_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/post_ip.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/post_ip.xml'); } protected function setUp(): void diff --git a/tests/migrator/convert_timezones_test.php b/tests/migrator/convert_timezones_test.php index 4bb0aec34f..5411476289 100644 --- a/tests/migrator/convert_timezones_test.php +++ b/tests/migrator/convert_timezones_test.php @@ -24,7 +24,7 @@ class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case // user_dst doesn't exist anymore, must re-add it to test this $db_tools->sql_column_add('phpbb_users', 'user_dst', array('BOOL', 1)); - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert_timezones.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/convert_timezones.xml'); } public function revert_schema() diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php index 2b6423f1ee..32a2d33253 100644 --- a/tests/mimetype/guesser_test.php +++ b/tests/mimetype/guesser_test.php @@ -13,8 +13,8 @@ namespace phpbb\mimetype; -require_once dirname(__FILE__) . '/null_guesser.php'; -require_once dirname(__FILE__) . '/incorrect_guesser.php'; +require_once __DIR__ . '/null_guesser.php'; +require_once __DIR__ . '/incorrect_guesser.php'; function function_exists($name) { @@ -45,7 +45,7 @@ class guesser_test extends \phpbb_test_case $this->guesser_no_fileinfo = new \phpbb\mimetype\guesser(array($guessers[2])); $this->guesser = new \phpbb\mimetype\guesser($guessers); - $this->path = dirname(__FILE__); + $this->path = __DIR__; $this->jpg_file = $this->path . '/fixtures/jpg'; $this->phpbb_root_path = $phpbb_root_path; } diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php index f615888efe..8ad8d1495d 100644 --- a/tests/network/ftp_fsock_pasv_epsv_test.php +++ b/tests/network/ftp_fsock_pasv_epsv_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_transfer.php'; /** * @group slow diff --git a/tests/notification/base.php b/tests/notification/base.php index e9de0daac1..980e43ce1e 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -15,7 +15,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -require_once dirname(__FILE__) . '/manager_helper.php'; +require_once __DIR__ . '/manager_helper.php'; abstract class phpbb_tests_notification_base extends phpbb_database_test_case { diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php index d4a33ff537..d0f5e829b5 100644 --- a/tests/notification/convert_test.php +++ b/tests/notification/convert_test.php @@ -10,7 +10,7 @@ * the docs/CREDITS.txt file. * */ -require_once dirname(__FILE__) . '/../mock/sql_insert_buffer.php'; +require_once __DIR__ . '/../mock/sql_insert_buffer.php'; class phpbb_notification_convert_test extends phpbb_database_test_case { @@ -18,7 +18,7 @@ class phpbb_notification_convert_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/convert.xml'); } protected function setUp(): void diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php index b935b180d9..cb6a99f3be 100644 --- a/tests/notification/group_request_test.php +++ b/tests/notification/group_request_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_notification_group_request_test extends phpbb_tests_notification_base { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/group_request.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/group_request.xml'); } protected function get_notification_types() diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php index 307f67ac10..08eabaa12a 100644 --- a/tests/notification/notification_test.php +++ b/tests/notification/notification_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_notification_test extends phpbb_tests_notification_base { @@ -19,7 +19,7 @@ class phpbb_notification_test extends phpbb_tests_notification_base public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/notification.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/notification.xml'); } public function test_get_notification_type_id() diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 393ae245e1..1deef67d8f 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -15,7 +15,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_posting.php'; abstract class phpbb_notification_submit_post_base extends phpbb_database_test_case { @@ -47,7 +47,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_' . $this->item_type . '.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/submit_post_' . $this->item_type . '.xml'); } protected function setUp(): void diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php index 073dcf03e7..d3161b5ccd 100644 --- a/tests/notification/submit_post_type_bookmark_test.php +++ b/tests/notification/submit_post_type_bookmark_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notification_submit_post_base { diff --git a/tests/notification/submit_post_type_post_in_queue_test.php b/tests/notification/submit_post_type_post_in_queue_test.php index a53e6e386b..3ef4395c0f 100644 --- a/tests/notification/submit_post_type_post_in_queue_test.php +++ b/tests/notification/submit_post_type_post_in_queue_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_post_in_queue_test extends phpbb_notification_submit_post_base { diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php index 0e680dae01..d63822bad0 100644 --- a/tests/notification/submit_post_type_post_test.php +++ b/tests/notification/submit_post_type_post_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_post_test extends phpbb_notification_submit_post_base { diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php index b4469bdaff..fd73a264fa 100644 --- a/tests/notification/submit_post_type_quote_test.php +++ b/tests/notification/submit_post_type_quote_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_submit_post_base { diff --git a/tests/notification/submit_post_type_topic_test.php b/tests/notification/submit_post_type_topic_test.php index e5da423903..b4297dee6b 100644 --- a/tests/notification/submit_post_type_topic_test.php +++ b/tests/notification/submit_post_type_topic_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_topic_test extends phpbb_notification_submit_post_base { diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php index f4cebda515..4ddfcb82cd 100644 --- a/tests/notification/user_list_trim_test.php +++ b/tests/notification/user_list_trim_test.php @@ -17,7 +17,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_list_trim.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_list_trim.xml'); } protected function setUp(): void diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 688fa7d677..aa192a7040 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../template/template_test_case.php'; +require_once __DIR__ . '/../template/template_test_case.php'; class phpbb_pagination_pagination_test extends phpbb_template_template_test_case { @@ -40,17 +40,17 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $filesystem = new \phpbb\filesystem\filesystem(); - $manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array()); + $manager = new phpbb_mock_extension_manager(__DIR__ . '/', array()); $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( - new \phpbb\routing\file_locator($filesystem, dirname(__FILE__) . '/') + new \phpbb\routing\file_locator($filesystem, __DIR__ . '/') ); - $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $manager); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $manager); $mock_container = new phpbb_mock_container_builder(); $mock_container->set('cron.task_collection', []); - $router = new phpbb_mock_router($mock_container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php', false); + $router = new phpbb_mock_router($mock_container, $resources_locator, $loader, __DIR__ . '/', 'php', false); $request = new phpbb_mock_request(); $request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER); diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php index cb8c58b54e..9c2aa8b160 100644 --- a/tests/passwords/drivers_test.php +++ b/tests/passwords/drivers_test.php @@ -19,7 +19,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case $config = new \phpbb\config\config(array()); $request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'fööbar')); $this->driver_helper = new \phpbb\passwords\driver\helper($config); - $phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; + $phpbb_root_path = __DIR__ . '/../../phpBB/'; $php_ext = 'php'; // Initialize argon2 default options diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php index 74b257ac38..3336f4742e 100644 --- a/tests/passwords/manager_test.php +++ b/tests/passwords/manager_test.php @@ -25,7 +25,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case $config = new \phpbb\config\config(array()); $this->driver_helper = new \phpbb\passwords\driver\helper($config); $request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'töst')); - $phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; + $phpbb_root_path = __DIR__ . '/../../phpBB/'; $php_ext = 'php'; $this->passwords_drivers = array( diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index fc1f31027e..b9d043da28 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -45,7 +45,7 @@ class phpbb_path_helper_test extends phpbb_test_case */ public function set_phpbb_root_path($filesystem) { - $this->phpbb_root_path = $filesystem->clean_path(dirname(__FILE__) . '/../../phpBB/'); + $this->phpbb_root_path = $filesystem->clean_path(__DIR__ . '/../../phpBB/'); } public function test_get_web_root_path() diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index 9d6ba7a917..ee8ade36e7 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_privmsgs.php'; class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml'); + return $this->createXMLDataSet(__DIR__.'/fixtures/delete_user_pms.xml'); } static public function delete_user_pms_data() diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php index 933dc1ac91..37f3a0c53a 100644 --- a/tests/regex/password_complexity_test.php +++ b/tests/regex/password_complexity_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_password_complexity_test extends phpbb_test_case { diff --git a/tests/search/common_test_case.php b/tests/search/common_test_case.php index d157d3ae7e..20993825e2 100644 --- a/tests/search/common_test_case.php +++ b/tests/search/common_test_case.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_search_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_search_test_case.php'; abstract class phpbb_search_common_test_case extends phpbb_search_test_case { diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index 7d3917296e..eaf2d240dd 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_search_mysql_test extends phpbb_search_common_test_case { @@ -20,7 +20,7 @@ class phpbb_search_mysql_test extends phpbb_search_common_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } protected function setUp(): void diff --git a/tests/search/native_test.php b/tests/search/native_test.php index ba37660b1f..943334d959 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_search_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_search_test_case.php'; class phpbb_search_native_test extends phpbb_search_test_case { @@ -20,7 +20,7 @@ class phpbb_search_native_test extends phpbb_search_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/posts.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/posts.xml'); } protected function setUp(): void diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index 7e2a6cec85..3cc3b8c472 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_search_postgres_test extends phpbb_search_common_test_case { @@ -20,7 +20,7 @@ class phpbb_search_postgres_test extends phpbb_search_common_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } protected function setUp(): void diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index f764449eca..0446673c60 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_security_extract_current_page_test extends phpbb_security_test_base diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 8bde1488d8..70e33beaac 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class phpbb_security_redirect_test extends phpbb_security_test_base diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index ef92ad5451..147274398d 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_check_ban_test extends phpbb_session_test_case { @@ -23,7 +23,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_banlist.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_banlist.xml'); } static function check_banned_data() diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php index 90554bfe5f..9629267caa 100644 --- a/tests/session/check_isvalid_test.php +++ b/tests/session/check_isvalid_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_check_isvalid_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } protected function access_with($session_id, $user_id, $user_agent, $ip) diff --git a/tests/session/create_test.php b/tests/session/create_test.php index 105c76eb7f..2647313bd5 100644 --- a/tests/session/create_test.php +++ b/tests/session/create_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_create_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } static function bot($bot_agent, $user_id, $bot_ip) diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php index 3a9d498007..fe2032f547 100644 --- a/tests/session/extract_hostname_test.php +++ b/tests/session/extract_hostname_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_extract_hostname_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static public function extract_current_hostname_data() diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php index f8aa3d27a5..bfcd1838ef 100644 --- a/tests/session/extract_page_test.php +++ b/tests/session/extract_page_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_extract_page_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static public function extract_current_page_data() diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 1c54e79428..9080478a28 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_garbage_collection_test extends phpbb_session_test_case { @@ -19,7 +19,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_garbage.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_garbage.xml'); } protected function setUp(): void diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php index 2a62da2eb5..1ba4319f79 100644 --- a/tests/session/session_key_test.php +++ b/tests/session/session_key_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_login_keys_test extends phpbb_session_test_case { @@ -20,7 +20,7 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_key.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_key.xml'); } public function test_set_key_manually() diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php index 2a2b24fb27..a346203982 100644 --- a/tests/session/testable_facade.php +++ b/tests/session/testable_facade.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/testable_factory.php'; -require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php'; +require_once __DIR__ . '/testable_factory.php'; +require_once __DIR__ . '/../../phpBB/phpbb/session.php'; /** * This class exists to expose session.php's functions in a more testable way. diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php index d381b4cbbd..bd25fa02f0 100644 --- a/tests/session/testable_factory.php +++ b/tests/session/testable_factory.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../mock/container_builder.php'; -require_once dirname(__FILE__) . '/../mock/auth_provider.php'; +require_once __DIR__ . '/../mock/container_builder.php'; +require_once __DIR__ . '/../mock/auth_provider.php'; /** * This class exists to setup an instance of phpbb's session class for testing. diff --git a/tests/session/unset_admin_test.php b/tests/session/unset_admin_test.php index 9633d77be6..55ac526c73 100644 --- a/tests/session/unset_admin_test.php +++ b/tests/session/unset_admin_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_unset_admin_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_full.xml'); } function get_test_session() diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php index 7690a89018..44cf9ed48f 100644 --- a/tests/session/validate_referrer_test.php +++ b/tests/session/validate_referrer_test.php @@ -11,13 +11,13 @@ * */ -require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php'; +require_once __DIR__ . '/../test_framework/phpbb_session_test_case.php'; class phpbb_session_validate_referrer_test extends phpbb_session_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } static function referrer_inputs() diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php index 722e10e42d..92451eb12c 100644 --- a/tests/template/includephp_test.php +++ b/tests/template/includephp_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_includephp_test extends phpbb_template_template_test_case { @@ -40,7 +40,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case global $phpbb_root_path; $filesystem = new \phpbb\filesystem\filesystem(); - $path_to_php = str_replace('\\', '/', dirname(__FILE__)) . '/templates/_dummy_include.php.inc'; + $path_to_php = str_replace('\\', '/', __DIR__) . '/templates/_dummy_include.php.inc'; $this->assertTrue($filesystem->is_absolute_path($path_to_php)); $template_text = "Path is absolute.\n"; diff --git a/tests/template/subdir/includephp_from_subdir_test.php b/tests/template/subdir/includephp_from_subdir_test.php index 08ffb0f7dc..089914d787 100644 --- a/tests/template/subdir/includephp_from_subdir_test.php +++ b/tests/template/subdir/includephp_from_subdir_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../template_test_case.php'; +require_once __DIR__ . '/../template_test_case.php'; class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_template_test_case { diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php index a9a8ecc287..9765b32845 100644 --- a/tests/template/template_allfolder_test.php +++ b/tests/template/template_allfolder_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_allfolder_test extends phpbb_template_template_test_case { @@ -46,7 +46,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case ); $this->extension_manager = new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'vendor4/bar' => array( 'ext_name' => 'vendor4/bar', diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php index 9243390937..aa3f772111 100644 --- a/tests/template/template_events_test.php +++ b/tests/template/template_events_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_events_test extends phpbb_template_template_test_case { @@ -134,9 +134,9 @@ Zeta test event in all', $defaults = $this->config_defaults(); $config = new \phpbb\config\config(array_merge($defaults, $new_config)); - $this->template_path = dirname(__FILE__) . "/datasets/$dataset/styles/silver/template"; + $this->template_path = __DIR__ . "/datasets/$dataset/styles/silver/template"; $this->extension_manager = new phpbb_mock_filesystem_extension_manager( - dirname(__FILE__) . "/datasets/$dataset/" + __DIR__ . "/datasets/$dataset/" ); $filesystem = new \phpbb\filesystem\filesystem(); diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index 5f9875a556..e6429b8c4f 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree { @@ -70,7 +70,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), new phpbb_mock_extension_manager( - dirname(__FILE__) . '/', + __DIR__ . '/', array( 'include/css' => array( 'ext_name' => 'include/css', diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php index 19c016ae5e..7580d4b32d 100644 --- a/tests/template/template_includejs_test.php +++ b/tests/template/template_includejs_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree { diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index 4d918b3167..51cc155c9e 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; +require_once __DIR__ . '/template_test_case_with_tree.php'; class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree { diff --git a/tests/template/template_parser_test.php b/tests/template/template_parser_test.php index 938b1bc8b8..fe0fc97bf8 100644 --- a/tests/template/template_parser_test.php +++ b/tests/template/template_parser_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_parser_test extends phpbb_template_template_test_case { diff --git a/tests/template/template_test.php b/tests/template/template_test.php index fa84cb9770..111a02ebc6 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_test extends phpbb_template_template_test_case { diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php index c0238b6f03..4a1764053b 100644 --- a/tests/template/template_test_case_with_tree.php +++ b/tests/template/template_test_case_with_tree.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case { diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index c32ebf0c71..01c32c3205 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/phpbb_database_connection_odbc_pdo_wrapper.php'; +require_once __DIR__ . '/phpbb_database_connection_odbc_pdo_wrapper.php'; class phpbb_database_test_connection_manager { @@ -177,7 +177,7 @@ class phpbb_database_test_connection_manager { $this->ensure_connected(__METHOD__); - $directory = dirname(__FILE__) . '/../../phpBB/install/schemas/'; + $directory = __DIR__ . '/../../phpBB/install/schemas/'; $this->load_schema_from_file($directory, $db); } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index a77278441e..75453cb5fa 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -262,7 +262,7 @@ class phpbb_functional_test_case extends phpbb_test_case $config, new phpbb\filesystem\filesystem(), self::$config['table_prefix'] . 'ext', - dirname(__FILE__) . '/', + __DIR__ . '/', $phpEx, new \phpbb\cache\service($this->get_cache_driver(), $config, $this->db, $phpbb_root_path, $phpEx) ); diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index c12e0b316e..deb76d4e5e 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/../session/testable_factory.php'; -require_once dirname(__FILE__) . '/../session/testable_facade.php'; +require_once __DIR__ . '/../session/testable_factory.php'; +require_once __DIR__ . '/../session/testable_facade.php'; abstract class phpbb_session_test_case extends phpbb_database_test_case { diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 11a5836fe1..c8cddb4352 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -128,7 +128,7 @@ class phpbb_test_case_helpers { $config = array_merge($config, array( 'dbms' => 'phpbb\db\driver\sqlite3', - 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite3', // filename + 'dbhost' => __DIR__ . '/../phpbb_unit_tests.sqlite3', // filename 'dbport' => '', 'dbname' => '', 'dbuser' => '', @@ -143,7 +143,7 @@ class phpbb_test_case_helpers } else { - $test_config = dirname(__FILE__) . '/../test_config.php'; + $test_config = __DIR__ . '/../test_config.php'; } $config_php_file = new \phpbb\config_php_file('', ''); diff --git a/tests/text_reparser/manager_test.php b/tests/text_reparser/manager_test.php index a70e41dce7..98882385a2 100644 --- a/tests/text_reparser/manager_test.php +++ b/tests/text_reparser/manager_test.php @@ -27,7 +27,7 @@ class phpbb_text_reparser_manager_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 diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php index 44d51f7100..c1fd5955b1 100644 --- a/tests/tree/nestedset_forum_base.php +++ b/tests/tree/nestedset_forum_base.php @@ -15,7 +15,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/phpbb_forums.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/phpbb_forums.xml'); } protected $forum_data = array( diff --git a/tests/tree/nestedset_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php index 48fbabdb8c..90ef6b3dc3 100644 --- a/tests/tree/nestedset_forum_get_data_test.php +++ b/tests/tree/nestedset_forum_get_data_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_get_data_test extends phpbb_tests_tree_nestedset_forum_base { diff --git a/tests/tree/nestedset_forum_insert_delete_test.php b/tests/tree/nestedset_forum_insert_delete_test.php index 79ba12b353..e58c1b8c68 100644 --- a/tests/tree/nestedset_forum_insert_delete_test.php +++ b/tests/tree/nestedset_forum_insert_delete_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_add_remove_test extends phpbb_tests_tree_nestedset_forum_base { diff --git a/tests/tree/nestedset_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php index d884117fa0..b738a0f6a8 100644 --- a/tests/tree/nestedset_forum_move_test.php +++ b/tests/tree/nestedset_forum_move_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nestedset_forum_base { diff --git a/tests/tree/nestedset_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php index 914cc5f749..487237deda 100644 --- a/tests/tree/nestedset_forum_regenerate_test.php +++ b/tests/tree/nestedset_forum_regenerate_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_nestedset_forum_base { diff --git a/tests/tree/nestedset_forum_test.php b/tests/tree/nestedset_forum_test.php index 7ccdc0a9b5..bffceb73ef 100644 --- a/tests/tree/nestedset_forum_test.php +++ b/tests/tree/nestedset_forum_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/nestedset_forum_base.php'; +require_once __DIR__ . '/nestedset_forum_base.php'; class pphpbb_tests_tree_nestedset_forum_test extends phpbb_tests_tree_nestedset_forum_base { diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index 2f55b7e83a..2f36a7f5b5 100644 --- a/tests/upload/fileupload_test.php +++ b/tests/upload/fileupload_test.php @@ -133,15 +133,15 @@ class phpbb_fileupload_test extends phpbb_test_case $file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path); $file->set_upload_ary(array( 'size' => 50, - 'tmp_name' => dirname(__FILE__) . '/fixture/disallowed', + 'tmp_name' => __DIR__ . '/fixture/disallowed', 'name' => 'disallowed.jpg', 'type' => 'image/jpg' )) ->set_upload_namespace($upload); - file_put_contents(dirname(__FILE__) . '/fixture/disallowed', '' . file_get_contents(dirname(__FILE__) . '/fixture/jpg')); + file_put_contents(__DIR__ . '/fixture/disallowed', '' . file_get_contents(__DIR__ . '/fixture/jpg')); $upload->common_checks($file); $this->assertEquals('DISALLOWED_CONTENT', $file->error[0]); - unlink(dirname(__FILE__) . '/fixture/disallowed'); + unlink(__DIR__ . '/fixture/disallowed'); } public function test_common_checks_invalid_filename() diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php index b22b3690ad..dd00d6eb06 100644 --- a/tests/user/user_loader_test.php +++ b/tests/user/user_loader_test.php @@ -18,7 +18,7 @@ class phpbb_user_loader_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user_loader.xml'); } protected function setUp(): void diff --git a/tests/wrapper/phpbb_php_ini_test.php b/tests/wrapper/phpbb_php_ini_test.php index 858cf473a3..57aed77a1a 100644 --- a/tests/wrapper/phpbb_php_ini_test.php +++ b/tests/wrapper/phpbb_php_ini_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/phpbb_php_ini_fake.php'; +require_once __DIR__ . '/phpbb_php_ini_fake.php'; class phpbb_wrapper_phpbb_php_ini_test extends phpbb_test_case { From 448b6a7d49bd98f73c4000287d6121ba26c94a63 Mon Sep 17 00:00:00 2001 From: DinHere Date: Sun, 3 Dec 2017 21:56:46 +0200 Subject: [PATCH 2/5] [ticket/15392] Remove not needed realpath() PHPBB3-15392 --- phpBB/develop/namespacify.php | 9 ++++----- phpBB/develop/rename_interfaces.php | 4 ++-- phpBB/includes/functions.php | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/phpBB/develop/namespacify.php b/phpBB/develop/namespacify.php index 447e87905e..b6414d57a4 100644 --- a/phpBB/develop/namespacify.php +++ b/phpBB/develop/namespacify.php @@ -20,10 +20,10 @@ // die("Please read the first lines of this script for instructions on how to enable it"); -$namespace_dir = realpath(__DIR__ . '/../phpbb/'); -$code_dir = realpath(__DIR__ . '/../'); -$test_dir = realpath(__DIR__ . '/../../tests/'); -$config_dir = realpath(__DIR__ . '/../config/'); +$namespace_dir = __DIR__ . '/../phpbb/'; +$code_dir = __DIR__ . '/../'; +$test_dir = __DIR__ . '/../../tests/'; +$config_dir = __DIR__ . '/../config/'; function map_class_name($old_class_name, $code_dir) { @@ -191,4 +191,3 @@ foreach ($iterator as $file) file_put_contents($file->getPathname(), $code); } } - diff --git a/phpBB/develop/rename_interfaces.php b/phpBB/develop/rename_interfaces.php index 90bf9cc205..f0dcf0be96 100644 --- a/phpBB/develop/rename_interfaces.php +++ b/phpBB/develop/rename_interfaces.php @@ -20,8 +20,8 @@ // die("Please read the first lines of this script for instructions on how to enable it"); -$code_dir = realpath(__DIR__ . '/../'); -$test_dir = realpath(__DIR__ . '/../../tests/'); +$code_dir = __DIR__ . '/../'; +$test_dir = __DIR__ . '/../../tests/'; $iterator = new \AppendIterator(); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir))); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir))); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 06ff2eca84..1206f42caf 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile) { if ($phpbb_filesystem) { - $root_path = $phpbb_filesystem->realpath(__DIR__ . '/../'); + $root_path = $phpbb_filesystem-> __DIR__ . '/../'; } else { $filesystem = new \phpbb\filesystem\filesystem(); - $root_path = $filesystem->realpath(__DIR__ . '/../'); + $root_path = $filesystem-> __DIR__ . '/../'; } } From f3d3b493f7ab9dc9062c6d324c40e6e3b5470c15 Mon Sep 17 00:00:00 2001 From: DinHere Date: Sun, 3 Dec 2017 22:33:45 +0200 Subject: [PATCH 3/5] [ticket/15392] Removed realpath only where needed PHPBB3-15392 --- phpBB/develop/namespacify.php | 8 ++++---- phpBB/develop/rename_interfaces.php | 4 ++-- phpBB/includes/functions.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/develop/namespacify.php b/phpBB/develop/namespacify.php index b6414d57a4..d2dd5f24a6 100644 --- a/phpBB/develop/namespacify.php +++ b/phpBB/develop/namespacify.php @@ -20,10 +20,10 @@ // die("Please read the first lines of this script for instructions on how to enable it"); -$namespace_dir = __DIR__ . '/../phpbb/'; -$code_dir = __DIR__ . '/../'; -$test_dir = __DIR__ . '/../../tests/'; -$config_dir = __DIR__ . '/../config/'; +$namespace_dir = realpath(__DIR__ . '/../phpbb/'); +$code_dir = realpath(__DIR__ . '/../'); +$test_dir = realpath(__DIR__ . '/../../tests/'); +$config_dir = realpath(__DIR__ . '/../config/'); function map_class_name($old_class_name, $code_dir) { diff --git a/phpBB/develop/rename_interfaces.php b/phpBB/develop/rename_interfaces.php index f0dcf0be96..90bf9cc205 100644 --- a/phpBB/develop/rename_interfaces.php +++ b/phpBB/develop/rename_interfaces.php @@ -20,8 +20,8 @@ // die("Please read the first lines of this script for instructions on how to enable it"); -$code_dir = __DIR__ . '/../'; -$test_dir = __DIR__ . '/../../tests/'; +$code_dir = realpath(__DIR__ . '/../'); +$test_dir = realpath(__DIR__ . '/../../tests/'); $iterator = new \AppendIterator(); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($code_dir))); $iterator->append(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($test_dir))); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 1206f42caf..14640d6c52 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile) { if ($phpbb_filesystem) { - $root_path = $phpbb_filesystem-> __DIR__ . '/../'; + $root_path = $phpbb_filesystem-> realpath(__DIR__ . '/../'); } else { $filesystem = new \phpbb\filesystem\filesystem(); - $root_path = $filesystem-> __DIR__ . '/../'; + $root_path = $filesystem-> realpath(__DIR__ . '/../'); } } From 20d4a86016c40008154544101f303f9da9f5ee6f Mon Sep 17 00:00:00 2001 From: DinHere Date: Sun, 3 Dec 2017 22:58:46 +0200 Subject: [PATCH 4/5] [ticket/15392] Resolve incorrect replacements after code review PHPBB3-15392 --- Vagrantfile | 2 +- phpBB/includes/functions.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 195c1621f5..ab225c9ad9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,7 +2,7 @@ require 'json' require 'yaml' VAGRANTFILE_API_VERSION ||= "2" -confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.__DIR__) +confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__)) homesteadYamlPath = "vagrant/bootstrap.yaml" afterScriptPath = "vagrant/after.sh" diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 14640d6c52..06ff2eca84 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile) { if ($phpbb_filesystem) { - $root_path = $phpbb_filesystem-> realpath(__DIR__ . '/../'); + $root_path = $phpbb_filesystem->realpath(__DIR__ . '/../'); } else { $filesystem = new \phpbb\filesystem\filesystem(); - $root_path = $filesystem-> realpath(__DIR__ . '/../'); + $root_path = $filesystem->realpath(__DIR__ . '/../'); } } From 7a310cc7d9b1ba2ac92ad2939df60754e124d79d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 4 Mar 2021 16:34:52 +0100 Subject: [PATCH 5/5] [ticket/15392] Replace remaining dirname(__FILE__) with __DIR__ PHPBB3-15392 --- tests/auth/provider_ldap_test.php | 2 +- tests/cache/file_driver_test.php | 2 +- tests/cache/memcached_test.php | 4 ++-- tests/console/cache/purge_test.php | 2 +- tests/controller/common_helper_route.php | 2 +- tests/dbal/migrator_tool_module_test.php | 6 +++--- tests/di/container_cache_directory_test.php | 2 +- tests/functions_content/phpbb_format_quote_test.php | 2 +- tests/functions_user/whois_test.php | 2 +- tests/group/helper_get_name_string_test.php | 2 +- tests/group/helper_get_name_test.php | 2 +- tests/group/helper_get_rank_test.php | 2 +- tests/migrator/get_callable_from_step_test.php | 2 +- tests/notification/notification_method_email_test.php | 6 +++--- tests/notification/submit_post_type_forum_test.php | 2 +- tests/profilefields/manager_test.php | 2 +- tests/profilefields/type_url_test.php | 6 +++--- tests/template/extension_test.php | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php index 7234138a7d..463b48d438 100644 --- a/tests/auth/provider_ldap_test.php +++ b/tests/auth/provider_ldap_test.php @@ -45,7 +45,7 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/user.xml'); } /** diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index eb9ee244f1..10c9aec182 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -26,7 +26,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case { parent::setUp(); - $this->cache_dir = dirname(__FILE__) . '/../tmp/cache/'; + $this->cache_dir = __DIR__ . '/../tmp/cache/'; if (file_exists($this->cache_dir)) { diff --git a/tests/cache/memcached_test.php b/tests/cache/memcached_test.php index 14499e7423..172be10624 100644 --- a/tests/cache/memcached_test.php +++ b/tests/cache/memcached_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/common_test_case.php'; +require_once __DIR__ . '/common_test_case.php'; class phpbb_cache_memcached_driver_test extends \phpbb_cache_common_test_case { @@ -19,7 +19,7 @@ class phpbb_cache_memcached_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 diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php index ab5cedc51a..06dcbd547f 100644 --- a/tests/console/cache/purge_test.php +++ b/tests/console/cache/purge_test.php @@ -29,7 +29,7 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case { global $phpbb_root_path, $phpEx; - $this->cache_dir = dirname(__FILE__) . '/tmp/cache/'; + $this->cache_dir = __DIR__ . '/tmp/cache/'; if (file_exists($this->cache_dir)) { diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 760679b71f..b565f17f1a 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -38,7 +38,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_ public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); } protected function setUp(): void diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index d1796ca97c..7d192dfecf 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -11,8 +11,8 @@ * */ -require_once dirname(__FILE__) . '/ext/foo/bar/acp/acp_test_info.php'; -require_once dirname(__FILE__) . '/ext/foo/bar/ucp/ucp_test_info.php'; +require_once __DIR__ . '/ext/foo/bar/acp/acp_test_info.php'; +require_once __DIR__ . '/ext/foo/bar/ucp/ucp_test_info.php'; class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case { @@ -43,7 +43,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); // 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__ . '/'; $phpbb_extension_manager = new phpbb_mock_extension_manager($phpbb_root_path); $module_manager = new \phpbb\module\module_manager($cache, $this->db, $phpbb_extension_manager, MODULES_TABLE, $phpbb_root_path, $phpEx); diff --git a/tests/di/container_cache_directory_test.php b/tests/di/container_cache_directory_test.php index bbd3582dc1..75ca88584a 100644 --- a/tests/di/container_cache_directory_test.php +++ b/tests/di/container_cache_directory_test.php @@ -26,7 +26,7 @@ namespace public 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->filename = $this->phpbb_root_path . '../tmp/container.php'; diff --git a/tests/functions_content/phpbb_format_quote_test.php b/tests/functions_content/phpbb_format_quote_test.php index 2f19c198e7..04dc620c29 100644 --- a/tests/functions_content/phpbb_format_quote_test.php +++ b/tests/functions_content/phpbb_format_quote_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; +require_once __DIR__ . '/../../phpBB/includes/message_parser.php'; class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case { diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php index 0ab5bc0ef6..4dd72311bb 100644 --- a/tests/functions_user/whois_test.php +++ b/tests/functions_user/whois_test.php @@ -7,7 +7,7 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; class phpbb_functions_user_whois_test extends phpbb_test_case { diff --git a/tests/group/helper_get_name_string_test.php b/tests/group/helper_get_name_string_test.php index c626328dcc..34dab1471d 100644 --- a/tests/group/helper_get_name_string_test.php +++ b/tests/group/helper_get_name_string_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/helper_test_case.php'; +require_once __DIR__ . '/helper_test_case.php'; class phpbb_group_helper_get_name_string_test extends phpbb_group_helper_test_case { diff --git a/tests/group/helper_get_name_test.php b/tests/group/helper_get_name_test.php index b39b2cbedd..d7e906ce9c 100644 --- a/tests/group/helper_get_name_test.php +++ b/tests/group/helper_get_name_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/helper_test_case.php'; +require_once __DIR__ . '/helper_test_case.php'; class phpbb_group_helper_get_name_test extends phpbb_group_helper_test_case { diff --git a/tests/group/helper_get_rank_test.php b/tests/group/helper_get_rank_test.php index 5efd8ad95e..95dc2ae600 100644 --- a/tests/group/helper_get_rank_test.php +++ b/tests/group/helper_get_rank_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/helper_test_case.php'; +require_once __DIR__ . '/helper_test_case.php'; class phpbb_group_helper_get_rank_test extends phpbb_group_helper_test_case { diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php index 1dbcc264b5..9d8748bf5b 100644 --- a/tests/migrator/get_callable_from_step_test.php +++ b/tests/migrator/get_callable_from_step_test.php @@ -64,7 +64,7 @@ class get_callable_from_step_test extends phpbb_database_test_case public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/../dbal/fixtures/migrator.xml'); + return $this->createXMLDataSet(__DIR__ . '/../dbal/fixtures/migrator.xml'); } public function get_callable_from_step_provider() diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 8c442d4e0b..63e2dfb343 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -15,7 +15,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; -require_once dirname(__FILE__) . '/base.php'; +require_once __DIR__ . '/base.php'; class notification_method_email_test extends phpbb_tests_notification_base { @@ -24,7 +24,7 @@ class notification_method_email_test extends phpbb_tests_notification_base public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/email_notification.type.post.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/email_notification.type.post.xml'); } protected function get_notification_methods() @@ -257,7 +257,7 @@ class notification_method_email_test extends phpbb_tests_notification_base 'post_username' => '', 'forum_name' => '', ], - + $post_data); $notification_options = [ 'item_id' => $post_data['post_id'], diff --git a/tests/notification/submit_post_type_forum_test.php b/tests/notification/submit_post_type_forum_test.php index 1635f65863..7f06b18951 100644 --- a/tests/notification/submit_post_type_forum_test.php +++ b/tests/notification/submit_post_type_forum_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/submit_post_base.php'; +require_once __DIR__ . '/submit_post_base.php'; class phpbb_notification_submit_post_type_forum_test extends phpbb_notification_submit_post_base { diff --git a/tests/profilefields/manager_test.php b/tests/profilefields/manager_test.php index 5503061fa6..04b0508bc1 100644 --- a/tests/profilefields/manager_test.php +++ b/tests/profilefields/manager_test.php @@ -36,7 +36,7 @@ class manager_test extends phpbb_database_test_case */ public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/manager.xml'); + return $this->createXMLDataSet(__DIR__ . '/fixtures/manager.xml'); } protected function setUp(): void diff --git a/tests/profilefields/type_url_test.php b/tests/profilefields/type_url_test.php index db0aa43a9c..8c2b3ed707 100644 --- a/tests/profilefields/type_url_test.php +++ b/tests/profilefields/type_url_test.php @@ -11,9 +11,9 @@ * */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; +require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; +require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; class phpbb_profilefield_type_url_test extends phpbb_test_case { diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 1d2221bb09..6308928325 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -11,7 +11,7 @@ * */ -require_once dirname(__FILE__) . '/template_test_case.php'; +require_once __DIR__ . '/template_test_case.php'; class phpbb_template_extension_test extends phpbb_template_template_test_case {