From 3d87d61daeb0d3fd6e49b5956def96189d95d424 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 13 Jul 2020 14:06:04 +0700 Subject: [PATCH] [ticket/16549] Add void return type of template methods PHPBB3-16549 --- tests/cache/apcu_driver_test.php | 2 +- tests/cache/memcached_test.php | 2 +- tests/cache/redis_driver_test.php | 2 +- tests/extension/extension_base_test.php | 2 +- tests/filesystem/realpath_test.php | 2 +- tests/functional/extension_acp_test.php | 4 ++-- tests/functional/extension_controller_test.php | 4 ++-- tests/functional/extension_global_lang_test.php | 4 ++-- tests/functional/extension_module_test.php | 4 ++-- tests/functional/extension_permission_lang_test.php | 4 ++-- tests/functional/metadata_manager_test.php | 4 ++-- tests/lint_test.php | 2 +- tests/network/ftp_fsock_pasv_epsv_test.php | 2 +- tests/template/template_test_case.php | 2 +- tests/test_framework/phpbb_database_test_case.php | 4 ++-- tests/test_framework/phpbb_functional_test_case.php | 2 +- tests/text_processing/message_parser_test.php | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/cache/apcu_driver_test.php b/tests/cache/apcu_driver_test.php index d3df5492a2..bc5b5cf160 100644 --- a/tests/cache/apcu_driver_test.php +++ b/tests/cache/apcu_driver_test.php @@ -24,7 +24,7 @@ class phpbb_cache_apcu_driver_test extends phpbb_cache_common_test_case return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { if (!extension_loaded('apcu')) { diff --git a/tests/cache/memcached_test.php b/tests/cache/memcached_test.php index 650b72ea18..14499e7423 100644 --- a/tests/cache/memcached_test.php +++ b/tests/cache/memcached_test.php @@ -22,7 +22,7 @@ class phpbb_cache_memcached_driver_test extends \phpbb_cache_common_test_case return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { if (!extension_loaded('memcached')) { diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php index a2288cf9a8..c5ec7880fd 100644 --- a/tests/cache/redis_driver_test.php +++ b/tests/cache/redis_driver_test.php @@ -22,7 +22,7 @@ class phpbb_cache_redis_driver_test extends \phpbb_cache_common_test_case return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { if (!extension_loaded('redis')) { diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php index ab85d3f02e..03d5547c7c 100644 --- a/tests/extension/extension_base_test.php +++ b/tests/extension/extension_base_test.php @@ -21,7 +21,7 @@ class phpbb_extension_extension_base_test extends phpbb_test_case /** @var phpbb_mock_extension_manager */ protected $extension_manager; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/tests/filesystem/realpath_test.php b/tests/filesystem/realpath_test.php index 58291dac93..145ded7cfa 100644 --- a/tests/filesystem/realpath_test.php +++ b/tests/filesystem/realpath_test.php @@ -18,7 +18,7 @@ class phpbb_filesystem_realpath_test extends phpbb_test_case /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 1c937b106b..4ad2cb0e3f 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -22,7 +22,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case './', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -30,7 +30,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index d680ebe92a..17b5803041 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -30,7 +30,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c 'foo/foo/controller/', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -38,7 +38,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php index a90a769f0d..0cd096e867 100644 --- a/tests/functional/extension_global_lang_test.php +++ b/tests/functional/extension_global_lang_test.php @@ -26,7 +26,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_ 'foo/bar/language/en/', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -34,7 +34,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_ self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index fc617b168b..d9c01175ea 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -25,7 +25,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case './', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -33,7 +33,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php index 498bb90668..5c57c37146 100644 --- a/tests/functional/extension_permission_lang_test.php +++ b/tests/functional/extension_permission_lang_test.php @@ -26,7 +26,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t 'foo/bar/language/en/', ); - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -34,7 +34,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php index 59d3bcbc07..4ecbdd37ca 100644 --- a/tests/functional/metadata_manager_test.php +++ b/tests/functional/metadata_manager_test.php @@ -31,7 +31,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case parent::tearDown(); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -39,7 +39,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { parent::tearDownAfterClass(); diff --git a/tests/lint_test.php b/tests/lint_test.php index 2df572777a..b464f1f6f3 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -15,7 +15,7 @@ class phpbb_lint_test extends phpbb_test_case { static protected $php_binary; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { // Try to use PHP_BINARY constant if available so lint tests are run // using the same php binary as phpunit. If not available (pre PHP diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php index 876df09d1b..f615888efe 100644 --- a/tests/network/ftp_fsock_pasv_epsv_test.php +++ b/tests/network/ftp_fsock_pasv_epsv_test.php @@ -20,7 +20,7 @@ class phpbb_network_ftp_fsock_pasv_epsv_test extends phpbb_test_case { static protected $ipv4; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { $hostname = 'ftp.debian.org.'; self::$ipv4 = gethostbyname($hostname); diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 18b067bb30..3bac42be92 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -25,7 +25,7 @@ class phpbb_template_template_test_case extends phpbb_test_case static protected $language_reflection_lang; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index b73baaeb94..d790c699f4 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -54,7 +54,7 @@ abstract class phpbb_database_test_case extends TestCase return array(); } - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { global $phpbb_root_path, $phpEx; @@ -90,7 +90,7 @@ abstract class phpbb_database_test_case extends TestCase parent::setUpBeforeClass(); } - static public function tearDownAfterClass() + static public function tearDownAfterClass(): void { if (file_exists(self::$install_schema_file)) { diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 4bc37e187f..11a2a64289 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -42,7 +42,7 @@ class phpbb_functional_test_case extends phpbb_test_case static protected $already_installed = false; static protected $last_post_timestamp = 0; - static public function setUpBeforeClass() + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php index d302ee9504..0090a6c41c 100644 --- a/tests/text_processing/message_parser_test.php +++ b/tests/text_processing/message_parser_test.php @@ -16,7 +16,7 @@ require_once __DIR__ . '/../../phpBB/includes/message_parser.php'; class phpbb_text_processing_message_parser_test extends phpbb_test_case { - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -25,7 +25,7 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case stream_wrapper_register('http', __CLASS__ . '_proxy'); } - public static function tearDownAfterClass() + public static function tearDownAfterClass(): void { parent::tearDownAfterClass(); stream_wrapper_restore('http');