PHP 8 Compatibility

This commit is contained in:
Frédéric Guillot
2022-02-05 11:49:03 -08:00
committed by GitHub
parent 61e63ef9e0
commit f5bb55bdb8
558 changed files with 6262 additions and 21691 deletions

View File

@@ -41,7 +41,7 @@ class FileCacheTest extends \Base
*/
public static $functions;
public function setUp()
protected function setUp(): void
{
parent::setup();
@@ -58,7 +58,7 @@ class FileCacheTest extends \Base
->getMock();
}
public function tearDown()
protected function tearDown(): void
{
parent::tearDown();
self::$functions = null;
@@ -71,7 +71,7 @@ class FileCacheTest extends \Base
$cache = new FileCache();
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo(CACHE_DIR)
@@ -79,7 +79,7 @@ class FileCacheTest extends \Base
->will($this->returnValue(false));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('mkdir')
->with(
$this->equalTo(CACHE_DIR),
@@ -88,7 +88,7 @@ class FileCacheTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(2))
->expects($this->once())
->method('file_put_contents')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key),
@@ -106,7 +106,7 @@ class FileCacheTest extends \Base
$cache = new FileCache();
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)
@@ -114,7 +114,7 @@ class FileCacheTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('file_get_contents')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)
@@ -130,7 +130,7 @@ class FileCacheTest extends \Base
$cache = new FileCache();
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)
@@ -146,7 +146,7 @@ class FileCacheTest extends \Base
$cache = new FileCache();
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)
@@ -166,7 +166,7 @@ class FileCacheTest extends \Base
$cache = new FileCache();
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)
@@ -174,7 +174,7 @@ class FileCacheTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('unlink')
->with(
$this->equalTo(CACHE_DIR.DIRECTORY_SEPARATOR.$key)

View File

@@ -13,7 +13,7 @@ class RememberMeCookieTest extends \Base
{
public static $functions;
public function setUp()
protected function setUp(): void
{
parent::setup();
@@ -25,7 +25,7 @@ class RememberMeCookieTest extends \Base
->getMock();
}
public function tearDown()
protected function tearDown(): void
{
parent::tearDown();
self::$functions = null;

View File

@@ -42,7 +42,7 @@ class ClientTest extends \Base
{
public static $functions;
public function setUp()
protected function setUp(): void
{
parent::setup();
@@ -60,7 +60,7 @@ class ClientTest extends \Base
->getMock();
}
public function tearDown()
protected function tearDown(): void
{
parent::tearDown();
self::$functions = null;

View File

@@ -11,7 +11,7 @@ class LdapGroupTest extends Base
private $client;
private $group;
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -15,7 +15,7 @@ class LdapUserTest extends Base
private $user;
private $group;
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -19,7 +19,7 @@ class QueryTest extends \Base
public static $functions;
private $client;
public function setUp()
protected function setUp(): void
{
parent::setup();
@@ -39,7 +39,7 @@ class QueryTest extends \Base
->getMock();
}
public function tearDown()
protected function tearDown(): void
{
parent::tearDown();
self::$functions = null;

View File

@@ -53,7 +53,7 @@ class FileStorageTest extends \Base
{
public static $functions;
public function setUp()
protected function setUp(): void
{
parent::setup();
@@ -73,7 +73,7 @@ class FileStorageTest extends \Base
->getMock();
}
public function tearDown()
protected function tearDown(): void
{
parent::tearDown();
self::$functions = null;
@@ -85,7 +85,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo('somewhere')
@@ -93,7 +93,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(false));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('mkdir')
->with(
$this->equalTo('somewhere')
@@ -101,7 +101,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(2))
->expects($this->once())
->method('file_put_contents')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey'),
@@ -118,7 +118,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'my')
@@ -126,7 +126,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(false));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('mkdir')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'my')
@@ -134,7 +134,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(2))
->expects($this->once())
->method('file_put_contents')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'my'.DIRECTORY_SEPARATOR.'key'),
@@ -150,11 +150,13 @@ class FileStorageTest extends \Base
*/
public function testPutWhenNotAbleToCreateFolder()
{
$this->expectException(\Kanboard\Core\ObjectStorage\ObjectStorageException::class);
$data = 'data';
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo('somewhere')
@@ -162,7 +164,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(false));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('mkdir')
->with(
$this->equalTo('somewhere')
@@ -177,7 +179,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -185,7 +187,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('file_get_contents')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -202,8 +204,10 @@ class FileStorageTest extends \Base
{
$storage = new FileStorage('somewhere');
$this->expectException(\Kanboard\Core\ObjectStorage\ObjectStorageException::class);
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -218,7 +222,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -226,7 +230,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('readfile')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -242,7 +246,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('file_exists')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -250,7 +254,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('unlink')
->with(
$this->equalTo('somewhere'.DIRECTORY_SEPARATOR.'mykey')
@@ -265,7 +269,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo('somewhere')
@@ -273,7 +277,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('rename')
->with(
$this->equalTo('src_file'),
@@ -289,7 +293,7 @@ class FileStorageTest extends \Base
$storage = new FileStorage('somewhere');
self::$functions
->expects($this->at(0))
->expects($this->once())
->method('is_dir')
->with(
$this->equalTo('somewhere')
@@ -297,7 +301,7 @@ class FileStorageTest extends \Base
->will($this->returnValue(true));
self::$functions
->expects($this->at(1))
->expects($this->once())
->method('move_uploaded_file')
->with(
$this->equalTo('src_file'),

View File

@@ -46,7 +46,7 @@ class HookTest extends Base
return array($p);
});
$hook->on('myhook', function () {
$hook->on('myhook', function ($p) {
return array('D');
});

View File

@@ -86,8 +86,8 @@ class AuthenticationManagerTest extends Base
$this->assertTrue($authManager->preAuthentication());
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(AuthenticationManager::EVENT_SUCCESS.'.AuthenticationManagerTest::onSuccess', $called);
$this->assertArrayNotHasKey(AuthenticationManager::EVENT_FAILURE.'.AuthenticationManagerTest::onFailure', $called);
$this->assertCount(1, $called);
$this->assertEquals('auth.success', $called[0]['event']);
}
public function testPreAuthenticationFailed()
@@ -102,8 +102,7 @@ class AuthenticationManagerTest extends Base
$this->assertFalse($authManager->preAuthentication());
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayNotHasKey(AuthenticationManager::EVENT_SUCCESS.'.AuthenticationManagerTest::onSuccess', $called);
$this->assertArrayNotHasKey(AuthenticationManager::EVENT_FAILURE.'.AuthenticationManagerTest::onFailure', $called);
$this->assertCount(0, $called);
}
public function testPasswordAuthenticationSuccessful()
@@ -117,8 +116,8 @@ class AuthenticationManagerTest extends Base
$this->assertTrue($authManager->passwordAuthentication('admin', 'admin'));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(AuthenticationManager::EVENT_SUCCESS.'.AuthenticationManagerTest::onSuccess', $called);
$this->assertArrayNotHasKey(AuthenticationManager::EVENT_FAILURE.'.AuthenticationManagerTest::onFailure', $called);
$this->assertCount(1, $called);
$this->assertEquals('auth.success', $called[0]['event']);
}
public function testPasswordAuthenticationFailed()
@@ -132,8 +131,8 @@ class AuthenticationManagerTest extends Base
$this->assertFalse($authManager->passwordAuthentication('admin', 'wrong password'));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayNotHasKey(AuthenticationManager::EVENT_SUCCESS.'.AuthenticationManagerTest::onSuccess', $called);
$this->assertArrayHasKey(AuthenticationManager::EVENT_FAILURE.'.AuthenticationManagerTest::onFailure', $called);
$this->assertCount(1, $called);
$this->assertEquals('auth.failure', $called[0]['event']);
}
public function onSuccess($event)

View File

@@ -6,7 +6,7 @@ use Kanboard\Core\Translator;
class TranslatorTest extends Base
{
public function setUp()
protected function setUp(): void
{
parent::setUp();
Translator::unload();

View File

@@ -12,7 +12,7 @@ class UserSyncTest extends Base
{
$user = new LdapUserProvider('ldapId', 'bob', 'Bob', '', Role::APP_MANAGER, array());
$userSync = new UserSync($this->container);
$result = $userSync->synchronize($user);
$profile = array(
'id' => 2,
'username' => 'bob',
@@ -22,7 +22,9 @@ class UserSyncTest extends Base
'is_ldap_user' => 1,
);
$this->assertArraySubset($profile, $userSync->synchronize($user));
foreach ($profile as $key => $value) {
$this->assertEquals($value, $result[$key]);
}
}
public function testSynchronizeExistingUser()
@@ -38,7 +40,10 @@ class UserSyncTest extends Base
'role' => Role::APP_MANAGER,
);
$this->assertArraySubset($profile, $userSync->synchronize($user));
$result = $userSync->synchronize($user);
foreach ($profile as $key => $value) {
$this->assertEquals($value, $result[$key]);
}
$user = new LdapUserProvider('ldapId', 'admin', '', '', Role::APP_ADMIN, array());
@@ -50,6 +55,9 @@ class UserSyncTest extends Base
'role' => Role::APP_ADMIN,
);
$this->assertArraySubset($profile, $userSync->synchronize($user));
$result = $userSync->synchronize($user);
foreach ($profile as $key => $value) {
$this->assertEquals($value, $result[$key]);
}
}
}