[ticket/16549] PHPUnit function declarations tiny cleanup

PHPBB3-16549

tests/acp_board/select_auth_method_test.php

@@ -27,7 +27,7 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
 		);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/attachment/delete_test.php

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

tests/attachment/manager_test.php

@@ -17,7 +17,7 @@ class phpbb_attachment_manager_test extends \phpbb_test_case
 	protected $resync;
 	protected $upload;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->delete = $this->getMockBuilder('\phpbb\attachment\delete')
 			->disableOriginalConstructor()

tests/attachment/resync_test.php

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

tests/attachment/upload_test.php

@@ -67,7 +67,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/resync.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $phpbb_root_path, $phpEx;
 

tests/auth/provider_apache_test.php

@@ -17,7 +17,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 	protected $user;
 	protected $request;
 
-	protected function setup(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/auth/provider_ldap_test.php

@@ -21,7 +21,7 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case
 
 	protected $user;
 
-	protected function setup() : void
+	protected function setUp() : void
 	{
 		parent::setUp();
 

tests/auth/provider_oauth_token_storage_test.php

@@ -25,7 +25,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c
 	protected $state_table;
 	protected $user;
 
-	protected function setup(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/avatar/manager_test.php

@@ -25,7 +25,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/users.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/captcha/qa_test.php

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

tests/class_loader/class_loader_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_class_loader_test extends \phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_class_loader;
 		$phpbb_class_loader->unregister();
@@ -22,7 +22,7 @@ class phpbb_class_loader_test extends \phpbb_test_case
 		$phpbb_class_loader_ext->unregister();
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		global $phpbb_class_loader_ext;
 		$phpbb_class_loader_ext->register();

tests/config/db_test.php

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

tests/config/db_text_test.php

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

tests/console/config/config_test.php

@@ -20,7 +20,7 @@ class phpbb_console_command_config_test extends phpbb_test_case
 	protected $command_name;
 	protected $user;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/console/cron/run_test.php

@@ -32,7 +32,7 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $db, $config, $phpbb_root_path, $phpEx;
 

tests/console/thumbnail_test.php

@@ -32,7 +32,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/thumbnail.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $phpbb_root_path, $phpEx, $phpbb_filesystem;
 

tests/console/user/activate_test.php

@@ -21,7 +21,7 @@ class phpbb_console_user_activate_test extends phpbb_console_user_base
 {
 	protected $notifications;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/console/user/base.php

@@ -31,7 +31,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx;
 

tests/controller/common_helper_route.php

@@ -41,7 +41,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
 		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 

tests/controller/controller_test.php

@@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
 class phpbb_controller_controller_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->extension_manager = new phpbb_mock_extension_manager(
 			dirname(__FILE__) . '/',

tests/cron/manager_test.php

@@ -20,7 +20,7 @@ require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php';
 
 class phpbb_cron_manager_test extends \phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->manager = $this->create_cron_manager(array(
 			new phpbb_cron_task_core_dummy_task(),

tests/dbal/migrator_test.php

@@ -44,7 +44,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/dbal/migrator_tool_config_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->config = new \phpbb\config\config(array());
 

tests/dbal/migrator_tool_config_text_test.php

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

tests/dbal/migrator_tool_module_test.php

@@ -21,7 +21,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_module.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		// Need global $db, $user for delete_module function in acp_modules
 		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log;

tests/dbal/migrator_tool_permission_test.php

@@ -30,7 +30,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_permission.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		// Global $db and $cache are needed in acp/auth.php constructor
 		global $phpbb_root_path, $phpEx, $db, $cache;

tests/dbal/sql_affected_rows_test.php

@@ -16,7 +16,7 @@ class phpbb_dbal_sql_affected_rows_test extends phpbb_database_test_case
 	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->db = $this->new_dbal();

tests/dbal/sql_insert_buffer_test.php

@@ -16,7 +16,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
 	protected $db;
 	protected $buffer;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/di/create_container_test.php

@@ -26,7 +26,7 @@ namespace
 		protected $phpbb_root_path;
 		protected $filename;
 
-		public function setUp(): void
+		protected function setUp(): void
 		{
 			$this->phpbb_root_path = dirname(__FILE__) . '/';
 			$this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php');

tests/di/ordered_service_collection_test.php

@@ -18,7 +18,7 @@ class phpbb_ordered_service_collection_test extends \phpbb_test_case
 	 */
 	protected $service_collection;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$container = new phpbb_mock_container_builder();
 		$container->set('foo', new StdClass);

tests/di/service_collection_test.php

@@ -18,7 +18,7 @@ class phpbb_service_collection_test extends \phpbb_test_case
 	 */
 	protected $service_collection;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$container = new phpbb_mock_container_builder();
 		$container->set('foo', new StdClass);

tests/email/email_parsing_test.php

@@ -19,7 +19,7 @@ class phpbb_email_parsing_test extends phpbb_test_case
 	/** @var \ReflectionProperty */
 	protected $reflection_template_property;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_container, $config, $phpbb_root_path, $phpEx, $request, $user;
 

tests/error_collector_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_error_collector_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/event/export_php_test.php

@@ -16,7 +16,7 @@ class phpbb_event_export_php_test extends phpbb_test_case
 	/** @var \phpbb\event\php_exporter */
 	protected $exporter;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/event/php_exporter_test.php

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

tests/extension/extension_base_test.php

@@ -30,7 +30,7 @@ class phpbb_extension_extension_base_test extends phpbb_test_case
 		self::$reflection_method_get_migration_file_list->setAccessible(true);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$container = new phpbb_mock_container_builder();
 		$migrator = new phpbb_mock_migrator();

tests/extension/finder_test.php

@@ -18,7 +18,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	/** @var \phpbb\finder */
 	protected $finder;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->extension_manager = new phpbb_mock_extension_manager(
 			dirname(__FILE__) . '/',

tests/extension/modules_test.php

@@ -24,7 +24,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
 	protected $finder;
 	protected $module_manager;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_extension_manager;
 

tests/feed/attachments_base_test.php

@@ -25,7 +25,7 @@ class phpbb_feed_attachments_base_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/../extension/fixtures/extensions.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/filesystem/clean_path_test.php

@@ -15,7 +15,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
 {
 	protected $filesystem;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->filesystem = new \phpbb\filesystem\filesystem();

tests/filesystem/is_absolute_test.php

@@ -16,7 +16,7 @@ class phpbb_filesystem_is_absolute_test extends phpbb_test_case
 	/** @var \phpbb\filesystem\filesystem_interface */
 	protected $filesystem;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/filesystem/realpath_test.php

@@ -27,7 +27,7 @@ class phpbb_filesystem_realpath_test extends phpbb_test_case
 		self::$filesystem_own_realpath->setAccessible(true);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/acp_permissions_test.php

@@ -16,7 +16,7 @@
 */
 class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/acp_profile_field_test.php

@@ -16,7 +16,7 @@
 */
 class phpbb_functional_acp_profile_field_test extends phpbb_functional_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/acp_users_test.php

@@ -16,7 +16,7 @@
 */
 class phpbb_functional_acp_users_test extends phpbb_functional_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/common_avatar_test_case.php

@@ -21,7 +21,7 @@ abstract class phpbb_functional_common_avatar_test_case extends phpbb_functional
 
 	abstract function get_url();
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->path = __DIR__ . '/fixtures/files/';

tests/functional/extension_acp_test.php

@@ -37,7 +37,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/extension_controller_test.php

@@ -45,7 +45,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/extension_global_lang_test.php

@@ -41,7 +41,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -52,7 +52,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
 		$this->purge_cache();
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		parent::tearDown();
 

tests/functional/extension_module_test.php

@@ -40,7 +40,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $db;
 

tests/functional/extension_permission_lang_test.php

@@ -41,7 +41,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/feed_test.php

@@ -20,7 +20,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 
 	static public $init_values = array();
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->purge_cache();

tests/functional/fileupload_form_test.php

@@ -18,14 +18,14 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 {
 	private $path;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->path = __DIR__ . '/fixtures/files/';
 		$this->add_lang('posting');
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');
 		foreach ($iterator as $fileinfo)

tests/functional/fileupload_remote_test.php

@@ -34,7 +34,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 	/** @var string phpBB root path */
 	protected $phpbb_root_path;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		// Only doing this within the functional framework because we need a
@@ -65,7 +65,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		global $config, $user;
 		$user = null;

tests/functional/forgot_password_test.php

@@ -45,7 +45,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		$this->login();
 		$this->admin_login();

tests/functional/metadata_manager_test.php

@@ -24,7 +24,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 		'foo/bar/',
 	);
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		$this->purge_cache();
 
@@ -46,7 +46,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 		self::$helper->restore_original_ext_dir();
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functional/plupload_test.php

@@ -30,7 +30,7 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 		$db->sql_query($query);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->purge_cache();
@@ -40,7 +40,7 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 		$this->login();
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		$this->set_extension_group_permission(0);
 		$iterator = new DirectoryIterator(__DIR__ . '/../../phpBB/files/');

tests/functional/ucp_pm_test.php

@@ -16,7 +16,7 @@
 */
 class phpbb_functional_ucp_pm_test extends phpbb_functional_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->login();

tests/functions/generate_string_list.php

@@ -15,7 +15,7 @@ class phpbb_generate_string_list_test extends phpbb_test_case
 {
 	public $user;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functions/phpbb_get_banned_user_ids.php

@@ -43,7 +43,7 @@ class phpbb_get_banned_user_ids_test extends phpbb_database_test_case
 		);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $db;
 

tests/functions_content/get_username_string_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/functions_content/phpbb_format_quote_test.php

@@ -18,7 +18,7 @@ class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $lang;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $cache, $user, $phpbb_root_path, $phpEx;
 

tests/group/helper_test_case.php

@@ -116,7 +116,7 @@ class phpbb_group_helper_test_case extends phpbb_test_case
 		$this->group_helper = new \phpbb\group\helper($auth, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->setup_engine();
 	}

tests/help/manager_test.php

@@ -20,7 +20,7 @@ class phpbb_help_manager_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $language;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->disableOriginalConstructor()

tests/installer/database_helper_test.php

@@ -18,7 +18,7 @@ class phpbb_installer_database_helper_test extends phpbb_test_case
 	 */
 	private $database_helper;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$filesystem = new \phpbb\filesystem\filesystem();
 		$phpbb_root_path = '';

tests/installer/installer_config_test.php

@@ -20,7 +20,7 @@ class phpbb_installer_config_test extends phpbb_test_case
 	 */
 	private $config;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$phpbb_root_path = __DIR__ . './../../phpBB/';
 		$filesystem = $this->createMock('\phpbb\filesystem\filesystem');

tests/installer/module_base_test.php

@@ -26,7 +26,7 @@ class module_base_test extends phpbb_test_case
 	 */
 	protected $container;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		// DI container mock
 		$this->container = new phpbb_mock_container_builder();

tests/language/language_test.php

@@ -16,7 +16,7 @@ class phpbb_language_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $lang;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/lock/db_test.php

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

tests/migrations/migrations_check_config_added_test.php

@@ -13,7 +13,7 @@
 
 class migrations_check_config_added_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path;
 

tests/migrator/get_callable_from_step_test.php

@@ -13,7 +13,7 @@
 
 class get_callable_from_step_test extends phpbb_database_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log, $user;
 

tests/migrator/get_schema_steps_test.php

@@ -13,7 +13,7 @@
 
 class get_schema_steps_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/migrator/reverse_update_data_test.php

@@ -16,7 +16,7 @@ class reverse_update_data_test extends phpbb_test_case
 	/** @var \phpbb\db\migration\helper */
 	protected $helper;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/migrator/schema_generator_test.php

@@ -24,7 +24,7 @@ class schema_generator_test extends phpbb_test_case
 	/** @var \phpbb\db\migration\schema_generator */
 	protected $generator;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/mimetype/guesser_test.php

@@ -27,7 +27,7 @@ class guesser_test extends \phpbb_test_case
 
 	protected $fileinfo_supported = false;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path;
 

tests/notification/submit_post_base.php

@@ -47,7 +47,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_' . $this->item_type . '.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/submit_post_type_bookmark_test.php

@@ -17,7 +17,7 @@ class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notificati
 {
 	protected $item_type = 'notification.type.bookmark';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/submit_post_type_post_in_queue_test.php

@@ -17,7 +17,7 @@ class phpbb_notification_submit_post_type_post_in_queue_test extends phpbb_notif
 {
 	protected $item_type = 'notification.type.post_in_queue';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/submit_post_type_post_test.php

@@ -17,7 +17,7 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
 {
 	protected $item_type = 'notification.type.post';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/submit_post_type_quote_test.php

@@ -17,7 +17,7 @@ class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_
 {
 	protected $item_type = 'notification.type.quote';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/submit_post_type_topic_test.php

@@ -17,7 +17,7 @@ class phpbb_notification_submit_post_type_topic_test extends phpbb_notification_
 {
 	protected $item_type = 'notification.type.topic';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/notification/user_list_trim_test.php

@@ -20,7 +20,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_list_trim.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx, $phpbb_dispatcher, $user, $cache, $auth;
 

tests/pagination/pagination_test.php

@@ -22,7 +22,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 		return implode('-', func_get_args());
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/passwords/drivers_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_passwords_helper_test extends \phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		// Prepare dependencies for drivers
 		$config =  new \phpbb\config\config(array());

tests/passwords/manager_test.php

@@ -19,7 +19,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 
 	protected $default_pw = 'foobar';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		// Prepare dependencies for manager and driver
 		$config =  new \phpbb\config\config(array());

tests/path_helper/path_helper_test.php

@@ -17,7 +17,7 @@ class phpbb_path_helper_test extends phpbb_test_case
 	protected $path_helper;
 	protected $phpbb_root_path = '';
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/profilefields/manager_test.php

@@ -39,7 +39,7 @@ class manager_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/manager.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 

tests/profilefields/type_bool_test.php

@@ -23,7 +23,7 @@ class phpbb_profilefield_type_bool_test extends phpbb_test_case
 	* @access public
 	* @return void
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_date_test.php

@@ -23,7 +23,7 @@ class phpbb_profilefield_type_date_test extends phpbb_test_case
 	* @access public
 	* @return null
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_dropdown_test.php

@@ -23,7 +23,7 @@ class phpbb_profilefield_type_dropdown_test extends phpbb_test_case
 	* @access public
 	* @return null
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_int_test.php

@@ -22,7 +22,7 @@ class phpbb_profilefield_type_int_test extends phpbb_test_case
 	* @access public
 	* @return null
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 

tests/profilefields/type_string_test.php

@@ -22,7 +22,7 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
 	* @access public
 	* @return null
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;
 

tests/profilefields/type_url_test.php

@@ -26,7 +26,7 @@ class phpbb_profilefield_type_url_test extends phpbb_test_case
 	* @access public
 	* @return null
 	*/
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;
 

tests/random/gen_rand_string_test.php

@@ -17,7 +17,7 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
 	const MIN_STRING_LENGTH = 1;
 	const MAX_STRING_LENGTH = 15;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $config;
 

tests/regex/email_test.php

@@ -15,7 +15,7 @@ class phpbb_regex_email_test extends phpbb_test_case
 {
 	protected $regex;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->regex = '#^' . get_preg_expression('email') . '$#i';
 	}

tests/regex/ipv4_test.php

@@ -15,7 +15,7 @@ class phpbb_regex_ipv4_test extends phpbb_test_case
 {
 	protected $regex;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->regex = get_preg_expression('ipv4');
 	}

tests/regex/ipv6_test.php

@@ -15,7 +15,7 @@ class phpbb_regex_ipv6_test extends phpbb_test_case
 {
 	protected $regex;
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		$this->regex = get_preg_expression('ipv6');
 	}

tests/security/hash_test.php

@@ -13,7 +13,7 @@
 
 class phpbb_security_hash_test extends phpbb_test_case
 {
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		global $phpbb_container;
 

tests/session/check_ban_test.php

@@ -38,7 +38,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		);
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		// Get session here so that config is mocked correctly
@@ -60,7 +60,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		);
 	}
 
-	public function tearDown(): void
+	protected function tearDown(): void
 	{
 		parent::tearDown();
 		// Set cache back to what it was before the test changed it

tests/session/garbage_collection_test.php

@@ -22,7 +22,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_garbage.xml');
 	}
 
-	public function setUp(): void
+	protected function setUp(): void
 	{
 		parent::setUp();
 		$this->session = $this->session_factory->get_session($this->db);