[ticket/690] Adjust setUp() declaration and classes

B3P-690
This commit is contained in:
Marc Alexander
2021-08-27 21:30:59 +02:00
parent 5b62c517e5
commit 7ee3bd1727
32 changed files with 32 additions and 79 deletions

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_announcement_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();
$this->purge_cache();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_birthday_list_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_link_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_no_error_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_redirect_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_visit_registered_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@
*/
class phpbb_functional_portal_vote_poll_test extends \board3\portal\tests\testframework\functional_test_case
{
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -18,7 +18,7 @@ abstract class database_test_case extends \phpbb_database_test_case
protected $db;
public function setUp()
public function setUp(): void
{
parent::setUp();
global $db;

View File

@@ -1,18 +0,0 @@
<?php
/**
*
* @package Board3 Portal Testing
* @copyright (c) Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
namespace board3\portal\tests\testframework;
abstract class ui_test_case extends \phpbb_ui_test_case
{
static protected function setup_extensions()
{
return array('board3/portal');
}
}

View File

@@ -1,29 +0,0 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 Board3 Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @group ui
*/
class phpbb_ui_portal_visit_ui_test extends \board3\portal\tests\testframework\ui_test_case
{
public function setUp()
{
parent::setUp();
$this->purge_cache();
$this->login();
$this->admin_login();
}
public function test_vanilla_board()
{
$this->visit('app.php/portal');
}
}

View File

@@ -37,7 +37,7 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
/** @var \phpbb_mock_request */
protected $request;
public function setUp()
public function setUp(): void
{
parent::setUp();
global $db, $cache, $phpbb_root_path, $phpEx, $user, $phpbb_container, $request, $template, $table_prefix;

View File

@@ -19,7 +19,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
static public $redirect = false;
public function setUp()
public function setUp(): void
{
global $cache, $phpbb_extension_manager, $phpbb_root_path;

View File

@@ -25,7 +25,7 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
}
public function setUp()
public function setUp(): void
{
global $phpbb_root_path, $phpEx, $table_prefix, $cache;

View File

@@ -22,7 +22,7 @@ class listener_test extends \phpbb_template_template_test_case
static public $hidden_fields = array();
public function setup()
public function setup(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
class phpbb_functions_check_file_src_test extends \board3\portal\tests\testframework\database_test_case
{
public function setUp()
public function setUp(): void
{
global $phpbb_root_path, $portal_root_path;

View File

@@ -15,7 +15,7 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
{
protected $default_main_columns = array('topic_count', 'global_id', 'topic_icons');
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -17,7 +17,7 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/styles.xml');
}
public function setUp()
public function setUp(): void
{
global $cache, $user, $phpbb_root_path;

View File

@@ -14,7 +14,7 @@ class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\tes
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_groups.xml');
}
public function setUp()
public function setUp(): void
{
global $cache, $user, $phpbb_root_path;

View File

@@ -7,7 +7,7 @@
*
*/
class phpbb_functions_simple_test extends PHPUnit_Framework_TestCase
class phpbb_functions_simple_test extends \PHPUnit\Framework\TestCase
{
public function test_ap_validate()
{

View File

@@ -13,7 +13,7 @@ class board3_includes_helper_test extends \board3\portal\tests\testframework\tes
protected $modules;
public function setUp()
public function setUp(): void
{
$config = new \phpbb\config\config(array());
$this->modules = array(

View File

@@ -24,7 +24,7 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/auth.xml');
}
public function setUp()
public function setUp(): void
{
global $phpbb_root_path, $phpEx, $phpbb_dispatcher;

View File

@@ -31,7 +31,7 @@ class phpbb_unit_modules_birthday_list_test extends \board3\portal\tests\testfra
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/users.xml');
}
public function setUp()
public function setUp(): void
{
global $auth, $phpbb_dispatcher, $phpbb_root_path;

View File

@@ -35,7 +35,7 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/configs.xml');
}
public function setUp()
public function setUp(): void
{
parent::setUp();
global $cache, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $request, $user;
@@ -122,7 +122,7 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
{
$this->expected_config[$key] = $value;
}
$portal_config = obtain_portal_config();
foreach ($portal_config as $key => $value)

View File

@@ -20,7 +20,7 @@ class phpbb_unit_modules_clock_test extends \board3\portal\tests\testframework\t
/** @var \phpbb\config\config */
protected $config;
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@ class phpbb_unit_modules_module_base_test extends \board3\portal\tests\testframe
/** @var \board3\portal\modules\module_base */
protected $module_base;
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -17,7 +17,7 @@ class phpbb_unit_modules_search_test extends \board3\portal\tests\testframework\
/** @var \board3\portal\modules\search */
protected $search;
public function setUp()
public function setUp(): void
{
parent::setUp();

View File

@@ -35,7 +35,7 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/configs.xml');
}
public function setUp()
public function setUp(): void
{
parent::setUp();
global $cache, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $request, $config, $phpbb_container, $user;

View File

@@ -11,7 +11,7 @@ class board3_portal_columns_test extends \board3\portal\tests\testframework\test
{
protected $portal_columns;
public function setUp()
public function setUp(): void
{
parent::setUp();
@@ -64,4 +64,4 @@ class board3_portal_columns_test extends \board3\portal\tests\testframework\test
{
$this->assertEquals($constant, $this->portal_columns->string_to_constant($string));
}
}
}

View File

@@ -20,7 +20,7 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
protected $default_main_columns = array('topic_count', 'global_id', 'topic_icons');
protected $fetch_posts;
public function setUp()
public function setUp(): void
{
global $auth, $cache, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $template, $user;

View File

@@ -37,7 +37,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
}
public function setUp()
public function setUp(): void
{
global $cache, $db, $portal_config, $phpbb_root_path, $phpEx;

View File

@@ -31,7 +31,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
return $this->createXMLDataSet(dirname(__FILE__) . '/../acp/fixtures/modules.xml');
}
public function setUp()
public function setUp(): void
{
global $cache, $db, $phpbb_root_path, $phpEx;