mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +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

10
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -632,11 +632,11 @@ class phpbb_functional_test_case extends phpbb_test_case
$db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->getMock('\phpbb\user', array(), array(
$user = $this->createMock('\phpbb\user', array(), array(
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
'\phpbb\datetime'
));
$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);
$cache = new phpbb_mock_null_cache;
@@ -674,17 +674,17 @@ class phpbb_functional_test_case extends phpbb_test_case
$db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->getMock('\phpbb\user', array(), array(
$user = $this->createMock('\phpbb\user', array(), array(
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
'\phpbb\datetime'
));
$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);
$cache = new phpbb_mock_null_cache;
$cache_driver = new \phpbb\cache\driver\dummy();
$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
$phpbb_container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
$phpbb_container
->expects($this->any())
->method('get')

2
tests/test_framework/phpbb_session_test_case.php
View File

@@ -37,7 +37,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
$phpbb_path_helper = new \phpbb\path_helper(
$symfony_request,
$phpbb_filesystem,
$this->getMock('\phpbb\request\request'),
$this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);

8
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -382,10 +382,16 @@ class phpbb_test_case_helpers
}
// Mock the DAL, make it return data from the fixture
$db_driver = $this->test_case->getMockBuilder('phpbb\\db\\driver\\driver')
->disableOriginalConstructor()
->disableOriginalClone()
->disableArgumentCloning()
->disallowMockingUnknownTypes()
->getMock();
$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
$mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
$mb->setConstructorArgs(array(
$this->test_case->getMockBuilder('phpbb\\db\\driver\\driver')->getMock(),
$db_driver,
'phpbb_bbcodes',
'phpbb_smilies',
'phpbb_styles',