1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00

[ticket/14948] Adjust calls for twig and phpunit updates

PHPBB3-14948
This commit is contained in:
Marc Alexander
2018-12-30 11:36:08 +01:00
parent d968392b4d
commit ebac54aa9e
189 changed files with 275 additions and 257 deletions

View File

@@ -17,6 +17,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
{
protected $user_id = 4;
protected $key_id = 4;
/** @var \phpbb\session */
protected $session;
protected $backup_cache;
@@ -37,7 +38,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
);
}
public function setUp()
public function setUp(): void
{
parent::setUp();
// Get session here so that config is mocked correctly
@@ -59,7 +60,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
);
}
public function tearDown()
public function tearDown(): void
{
parent::tearDown();
// Set cache back to what it was before the test changed it
@@ -75,7 +76,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
$ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
$is_banned = !empty($ban);
}
catch (PHPUnit_Framework_Error_Notice $e)
catch (PHPUnit\Framework\Error\Notice $e)
{
// User error was triggered, user must have been banned
$is_banned = true;

View File

@@ -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()
public function setUp(): void
{
parent::setUp();
$this->session = $this->session_factory->get_session($this->db);

View File

@@ -120,10 +120,10 @@ class phpbb_session_testable_factory
/**
* Check if the cache used for the generated session contains correct data.
*
* @param PHPUnit_Framework_Assert $test The test case to call assert methods
* @param PHPUnit\Framework\Assert $test The test case to call assert methods
* on
*/
public function check(PHPUnit_Framework_Assert $test)
public function check(PHPUnit\Framework\Assert $test)
{
$this->cache->check($test, $this->get_cache_data());
}