mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/14972] Migrate from deprecated getMock() method to createMock()

Browse Source 
PHPBB3-14972
This commit is contained in:
rxu
2017-03-19 21:46:20 +07:00
committed by Marc Alexander
parent cdf3aa27df
commit 42b7782927
70 changed files with 168 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/dbal/db_tools_test.php
View File

@@ -346,10 +346,10 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
public function test_perform_schema_changes_drop_tables()
{
$db_tools = $this->getMock('\phpbb\db\tools\tools', array(
'sql_table_exists',
'sql_table_drop',
), array(&$this->db));
$db_tools = $this->getMockBuilder('\phpbb\db\tools\tools')
->setMethods(array('sql_table_exists', 'sql_table_drop'))
->setConstructorArgs(array(&$this->db))
->getMock();
// pretend all tables exist
$db_tools->expects($this->any())->method('sql_table_exists')
@@ -372,10 +372,10 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
public function test_perform_schema_changes_drop_columns()
{
$db_tools = $this->getMock('\phpbb\db\tools\tools', array(
'sql_column_exists',
'sql_column_remove',
), array(&$this->db));
$db_tools = $this->getMockBuilder('\phpbb\db\tools\tools')
->setMethods(array('sql_column_exists', 'sql_column_remove'))
->setConstructorArgs(array(&$this->db))
->getMock();
// pretend all columns exist
$db_tools->expects($this->any())->method('sql_column_exists')

2
tests/dbal/migrator_tool_module_test.php
View File

@@ -39,7 +39,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
$cache = new phpbb_mock_cache;
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$auth = $this->getMock('\phpbb\auth\auth');
$auth = $this->createMock('\phpbb\auth\auth');
$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