mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 12:53:37 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/mock/cache.php
View File

@@ -72,13 +72,13 @@ class phpbb_mock_cache implements \phpbb\cache\driver\driver_interface
}
}
public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
public function checkVar(PHPUnit\Framework\Assert $test, $var_name, $data)
{
$test->assertTrue(isset($this->data[$var_name]));
$test->assertEquals($data, $this->data[$var_name]);
}
public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true)
public function checkAssociativeVar(PHPUnit\Framework\Assert $test, $var_name, $data, $sort = true)
{
$test->assertTrue(isset($this->data[$var_name]));
@@ -93,12 +93,12 @@ class phpbb_mock_cache implements \phpbb\cache\driver\driver_interface
$test->assertEquals($data, $this->data[$var_name]);
}
public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name)
public function checkVarUnset(PHPUnit\Framework\Assert $test, $var_name)
{
$test->assertFalse(isset($this->data[$var_name]));
}
public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)
public function check(PHPUnit\Framework\Assert $test, $data, $ignore_db_info = true)
{
$cache_data = $this->data;

4
tests/mock/session_testable.php
View File

@@ -30,14 +30,14 @@ class phpbb_mock_session_testable extends \phpbb\session
/**
* Checks if the cookies were set correctly.
*
* @param PHPUnit_Framework_Assert test The test from which this is called
* @param PHPUnit\Framework\Assert test The test from which this is called
* @param array(string => mixed) cookies The cookie data to check against.
* The keys are cookie names, the values can either be null to
* check only the existence of the cookie, or an array(d, t),
* where d is the cookie data to check, or null to skip the
* check and t is the cookie time to check, or null to skip.
*/
public function check_cookies(PHPUnit_Framework_Assert $test, $cookies)
public function check_cookies(PHPUnit\Framework\Assert $test, $cookies)
{
$test->assertEquals(array_keys($cookies), array_keys($this->_cookies), 'Incorrect cookies were set');