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

@@ -10,7 +10,7 @@ class ActionProcedureTest extends BaseProcedureTest
{
$actions = $this->app->getAvailableActions();
$this->assertNotEmpty($actions);
$this->assertInternalType('array', $actions);
$this->assertIsArray($actions);
$this->assertArrayHasKey('\Kanboard\Action\TaskCloseColumn', $actions);
}
@@ -18,7 +18,7 @@ class ActionProcedureTest extends BaseProcedureTest
{
$events = $this->app->getAvailableActionEvents();
$this->assertNotEmpty($events);
$this->assertInternalType('array', $events);
$this->assertIsArray($events);
$this->assertArrayHasKey('task.move.column', $events);
}
@@ -26,7 +26,7 @@ class ActionProcedureTest extends BaseProcedureTest
{
$events = $this->app->getCompatibleActionEvents('\Kanboard\Action\TaskCloseColumn');
$this->assertNotEmpty($events);
$this->assertInternalType('array', $events);
$this->assertIsArray($events);
$this->assertArrayHasKey('task.move.column', $events);
}
@@ -49,7 +49,7 @@ class ActionProcedureTest extends BaseProcedureTest
{
$actions = $this->app->getActions($this->projectId);
$this->assertNotEmpty($actions);
$this->assertInternalType('array', $actions);
$this->assertIsArray($actions);
$this->assertArrayHasKey('id', $actions[0]);
$this->assertArrayHasKey('project_id', $actions[0]);
$this->assertArrayHasKey('event_name', $actions[0]);

View File

@@ -27,7 +27,7 @@ abstract class BaseProcedureTest extends PHPUnit\Framework\TestCase
protected $username = 'test-user';
protected $userId;
public function setUp()
protected function setUp(): void
{
$this->setUpAppClient();
$this->setUpAdminUser();

View File

@@ -40,7 +40,7 @@ class CategoryProcedureTest extends BaseProcedureTest
{
$category = $this->app->getCategory($this->categoryId);
$this->assertInternalType('array', $category);
$this->assertIsArray($category);
$this->assertEquals($this->categoryId, $category['id']);
$this->assertEquals('Category', $category['name']);
$this->assertEquals($this->projectId, $category['project_id']);

View File

@@ -43,11 +43,11 @@ class LinkProcedureTest extends BaseProcedureTest
{
$link_id = $this->app->createLink(array('label' => 'test'));
$this->assertNotFalse($link_id);
$this->assertInternalType('int', $link_id);
$this->assertIsInt($link_id);
$link_id = $this->app->createLink(array('label' => 'foo', 'opposite_label' => 'bar'));
$this->assertNotFalse($link_id);
$this->assertInternalType('int', $link_id);
$this->assertIsInt($link_id);
}
public function testUpdateLink()

View File

@@ -46,7 +46,7 @@ class ProjectProcedureTest extends BaseProcedureTest
{
$projects = $this->app->getAllProjects();
$this->assertNotEmpty($projects);
$this->assertInternalType('array', $projects);
$this->assertIsArray($projects);
$this->assertArrayHasKey('board', $projects[0]['url']);
$this->assertArrayHasKey('list', $projects[0]['url']);
}
@@ -54,14 +54,14 @@ class ProjectProcedureTest extends BaseProcedureTest
public function assertGetProjectActivity()
{
$activities = $this->app->getProjectActivity($this->projectId);
$this->assertInternalType('array', $activities);
$this->assertIsArray($activities);
$this->assertCount(0, $activities);
}
public function assertGetProjectsActivity()
{
$activities = $this->app->getProjectActivities(array('project_ids' => array($this->projectId)));
$this->assertInternalType('array', $activities);
$this->assertIsArray($activities);
$this->assertCount(0, $activities);
}

View File

@@ -31,7 +31,7 @@ class SwimlaneProcedureTest extends BaseProcedureTest
public function assertGetSwimlane()
{
$swimlane = $this->app->getSwimlane($this->swimlaneId);
$this->assertInternalType('array', $swimlane);
$this->assertIsArray($swimlane);
$this->assertEquals('Swimlane 1', $swimlane['name']);
}

View File

@@ -44,7 +44,7 @@ class TaskProcedureTest extends BaseProcedureTest
public function assertGetAllTasks()
{
$tasks = $this->app->getAllTasks($this->projectId);
$this->assertInternalType('array', $tasks);
$this->assertIsArray($tasks);
$this->assertNotEmpty($tasks);
$this->assertArrayHasKey('url', $tasks[0]);
}

View File

@@ -32,7 +32,7 @@ class UserProcedureTest extends BaseProcedureTest
public function assertGetAllUsers()
{
$users = $this->app->getAllUsers();
$this->assertInternalType('array', $users);
$this->assertIsArray($users);
$this->assertNotEmpty($users);
}

View File

@@ -43,7 +43,7 @@ class AverageLeadCycleTimeAnalyticTest extends Base
$stats = $averageLeadCycleTimeAnalytic->build(1);
$this->assertEquals(5, $stats['count']);
$this->assertEquals(3600 + 1800 + 3600 + 2*3600, $stats['total_lead_time'], '', 5);
$this->assertEquals(3600 + 1800 + 3600 + 2*3600, $stats['total_lead_time'], '', 10);
$this->assertEquals(1800 + 900, $stats['total_cycle_time'], '', 5);
$this->assertEquals((3600 + 1800 + 3600 + 2*3600) / 5, $stats['avg_lead_time'], '', 5);
$this->assertEquals((1800 + 900) / 5, $stats['avg_cycle_time'], '', 5);

View File

@@ -8,7 +8,7 @@ require_once __DIR__.'/../Base.php';
class ReverseProxyAuthTest extends Base
{
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -20,7 +20,7 @@ abstract class Base extends PHPUnit\Framework\TestCase
*/
protected $dispatcher;
public function setUp()
protected function setUp(): void
{
date_default_timezone_set('UTC');
$_SESSION = array();
@@ -98,7 +98,7 @@ abstract class Base extends PHPUnit\Framework\TestCase
$loader->register();
}
public function tearDown()
protected function tearDown(): void
{
$this->container['db']->closeConnection();
unset ($this->container);

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]);
}
}
}

View File

@@ -24,7 +24,7 @@ class MetadataCacheDecoratorTest extends Base
*/
protected $metadataCacheDecorator;
public function setUp()
protected function setUp(): void
{
parent::setUp();
@@ -61,11 +61,11 @@ class MetadataCacheDecoratorTest extends Base
->method('set');
$this->metadataModelMock
->expects($this->at(0))
->expects($this->once())
->method('save');
$this->metadataModelMock
->expects($this->at(1))
->expects($this->once())
->method('getAll')
->with($this->entityId)
;
@@ -100,14 +100,14 @@ class MetadataCacheDecoratorTest extends Base
public function testGetWithoutCache()
{
$this->cacheMock
->expects($this->at(0))
->expects($this->once())
->method('get')
->with($this->cachePrefix.$this->entityId)
->will($this->returnValue(null))
;
$this->cacheMock
->expects($this->at(1))
->expects($this->once())
->method('set')
->with(
$this->cachePrefix.$this->entityId,

View File

@@ -121,7 +121,7 @@ class HookHelperTest extends Base
$this->container['helper']
->asset
->expects($this->at(0))
->expects($this->once())
->method('css')
->with(
$this->equalTo('skin.css')
@@ -130,7 +130,7 @@ class HookHelperTest extends Base
$this->container['helper']
->asset
->expects($this->at(1))
->expects($this->once())
->method('js')
->with(
$this->equalTo('skin.js')
@@ -141,7 +141,7 @@ class HookHelperTest extends Base
$hookHelper->attach('test1', 'skin.css');
$hookHelper->attach('test2', 'skin.js');
$this->assertContains('<link rel="stylesheet" href="skin.css"></link>', $hookHelper->asset('css', 'test1'));
$this->assertContains('<script src="skin.js"></script>', $hookHelper->asset('js', 'test2'));
$this->assertStringContainsString('<link rel="stylesheet" href="skin.css"></link>', $hookHelper->asset('css', 'test1'));
$this->assertStringContainsString('<script src="skin.js"></script>', $hookHelper->asset('js', 'test2'));
}
}

View File

@@ -36,7 +36,7 @@ class ProjectActivityHelperTest extends Base
$this->assertNotEmpty($events[0]['event_content']);
$this->assertNotEmpty($events[0]['event_title']);
$this->assertNotEmpty($events[0]['author']);
$this->assertInternalType('array', $events[0]['task']);
$this->assertIsArray($events[0]['task']);
}
public function testGetProjectsEvents()
@@ -66,7 +66,7 @@ class ProjectActivityHelperTest extends Base
$this->assertNotEmpty($events[0]['event_content']);
$this->assertNotEmpty($events[0]['event_title']);
$this->assertNotEmpty($events[0]['author']);
$this->assertInternalType('array', $events[0]['task']);
$this->assertIsArray($events[0]['task']);
}
public function testGetTaskEvents()
@@ -92,6 +92,6 @@ class ProjectActivityHelperTest extends Base
$this->assertNotEmpty($events[0]['event_content']);
$this->assertNotEmpty($events[0]['event_title']);
$this->assertNotEmpty($events[0]['author']);
$this->assertInternalType('array', $events[0]['task']);
$this->assertIsArray($events[0]['task']);
}
}

View File

@@ -45,9 +45,10 @@ class CommentEventJobTest extends Base
$this->assertTrue($commentModel->remove(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(CommentModel::EVENT_CREATE.'.closure', $called);
$this->assertArrayHasKey(CommentModel::EVENT_UPDATE.'.closure', $called);
$this->assertArrayHasKey(CommentModel::EVENT_DELETE.'.closure', $called);
$this->assertCount(3, $called);
$this->assertEquals(CommentModel::EVENT_CREATE, $called[0]['event']);
$this->assertEquals(CommentModel::EVENT_UPDATE, $called[1]['event']);
$this->assertEquals(CommentModel::EVENT_DELETE, $called[2]['event']);
}
public function testThatUserMentionJobIsCalled()

View File

@@ -38,6 +38,7 @@ class ProjectFileEventJobTest extends Base
$this->assertEquals(1, $projectFileModel->create(1, 'Test', '/tmp/test', 123));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(ProjectFileModel::EVENT_CREATE.'.closure', $called);
$this->assertCount(1, $called);
$this->assertEquals(ProjectFileModel::EVENT_CREATE, $called[0]['event']);
}
}

View File

@@ -46,9 +46,6 @@ class SubtaskEventJobTest extends Base
$this->assertTrue($subtaskModel->remove(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(SubtaskModel::EVENT_CREATE.'.closure', $called);
$this->assertArrayHasKey(SubtaskModel::EVENT_UPDATE.'.closure', $called);
$this->assertArrayHasKey(SubtaskModel::EVENT_DELETE.'.closure', $called);
$this->assertArrayHasKey(SubtaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertCount(5, $called);
}
}

View File

@@ -48,8 +48,7 @@ class TaskEventJobTest extends Base
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertCount(2, $called);
}
public function testTriggerUpdateEvent()
@@ -66,8 +65,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'new title')));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertCount(3, $called);
}
public function testTriggerAssigneeChangeEvent()
@@ -83,7 +81,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerCloseEvent()
@@ -99,7 +97,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskStatusModel->close(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CLOSE.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerOpenEvent()
@@ -116,7 +114,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskStatusModel->open(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_OPEN.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerMovePositionEvent()
@@ -133,7 +131,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 2));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerMoveColumnEvent()
@@ -149,7 +147,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerMoveSwimlaneEvent()
@@ -167,7 +165,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 1, 2));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.closure', $called);
$this->assertCount(1, $called);
}
public function testTriggerMoveProjectEvent()
@@ -184,7 +182,7 @@ class TaskEventJobTest extends Base
$this->assertTrue($taskProjectMoveModel->moveToProject(1, 1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.closure', $called);
$this->assertCount(1, $called);
}
public function testThatUserMentionJobIsCalled()

View File

@@ -41,6 +41,6 @@ class TaskFileEventJobTest extends Base
$this->assertEquals(1, $taskFileModel->create(1, 'Test', '/tmp/test', 123));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskFileModel::EVENT_CREATE.'.closure', $called);
$this->assertCount(1, $called);
}
}

View File

@@ -42,7 +42,7 @@ class TaskLinkEventJobTest extends Base
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskLinkModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertCount(2, $called);
}
public function testTriggerDeleteEvents()
@@ -60,6 +60,6 @@ class TaskLinkEventJobTest extends Base
$this->assertTrue($taskLinkModel->remove(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskLinkModel::EVENT_DELETE.'.closure', $called);
$this->assertCount(1, $called);
}
}

View File

@@ -99,7 +99,7 @@ class UserMentionJobTest extends Base
$userMentionJob->execute('test @user1 @user2', TaskModel::EVENT_USER_MENTION, $event->getAll());
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_USER_MENTION.'.UserMentionJobTest::onUserMention', $called);
$this->assertCount(1, $called);
}
public function onUserMention($event)

View File

@@ -12,7 +12,7 @@ class ApplicationAuthorizationMiddlewareMiddlewareTest extends Base
private $middleware;
private $nextMiddleware;
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@ class AuthenticationMiddlewareTest extends Base
private $middleware;
private $nextMiddleware;
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -12,7 +12,7 @@ class ProjectAuthorizationMiddlewareMiddlewareTest extends Base
private $middleware;
private $nextMiddleware;
public function setUp()
protected function setUp(): void
{
parent::setUp();

View File

@@ -45,10 +45,10 @@ class ProjectDailyStatsTest extends Base
$this->assertEquals($expected[0]['day'], $metrics[0]['day']);
$this->assertEquals($expected[1]['day'], $metrics[1]['day']);
$this->assertEquals($expected[0]['avg_lead_time'], $metrics[0]['avg_lead_time'], '', 2);
$this->assertEquals($expected[1]['avg_lead_time'], $metrics[1]['avg_lead_time'], '', 2);
$this->assertEquals($expected[0]['avg_lead_time'], $metrics[0]['avg_lead_time'], '', 5);
$this->assertEquals($expected[1]['avg_lead_time'], $metrics[1]['avg_lead_time'], '', 5);
$this->assertEquals($expected[0]['avg_cycle_time'], $metrics[0]['avg_cycle_time'], '', 2);
$this->assertEquals($expected[1]['avg_cycle_time'], $metrics[1]['avg_cycle_time'], '', 2);
$this->assertEquals($expected[0]['avg_cycle_time'], $metrics[0]['avg_cycle_time'], '', 5);
$this->assertEquals($expected[1]['avg_cycle_time'], $metrics[1]['avg_cycle_time'], '', 5);
}
}

View File

@@ -281,7 +281,8 @@ class ProjectModelTest extends Base
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1)));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.Kanboard\Subscriber\ProjectModificationDateSubscriber::execute', $called);
$this->assertCount(1, $called);
$this->assertEquals(TaskModel::EVENT_CREATE_UPDATE, $called[0]['event']);
$project = $projectModel->getById(1);
$this->assertNotEmpty($project);

View File

@@ -33,8 +33,7 @@ class TaskCreationModelTest extends Base
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1)));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
$this->assertCount(2, $called);
$task = $taskFinderModel->getById(1);
$this->assertNotEmpty($task);
@@ -56,8 +55,7 @@ class TaskCreationModelTest extends Base
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.TaskCreationModelTest::onCreate', $called);
$this->assertCount(2, $called);
$task = $finderModel->getById(1);
$this->assertNotEmpty($task);

View File

@@ -80,8 +80,7 @@ class TaskDuplicationModelTest extends Base
$this->assertEquals(2, $taskDuplicationModel->duplicate(1));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
$this->assertCount(2, $called);
// Check the values of the duplicated task
$task = $taskFinderModel->getById(2);

View File

@@ -75,8 +75,7 @@ class TaskModificationModelTest extends Base
$this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'After')));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationModelTest::onCreateUpdate', $called);
$this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationModelTest::onUpdate', $called);
$this->assertCount(2, $called);
$task = $taskFinderModel->getById(1);
$this->assertEquals('After', $task['title']);
@@ -100,7 +99,7 @@ class TaskModificationModelTest extends Base
$this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.TaskModificationModelTest::onAssigneeChange', $called);
$this->assertCount(1, $called);
$task = $taskFinderModel->getById(1);
$this->assertEquals(1, $task['owner_id']);

View File

@@ -552,8 +552,7 @@ class TaskPositionModelTest extends Base
$this->assertEquals(2, $task['position']);
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.TaskPositionModelTest::onMoveColumn', $called);
$this->assertEquals(1, count($called));
$this->assertCount(1, $called);
// We move the task 1 to the position 2
$this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
@@ -569,8 +568,7 @@ class TaskPositionModelTest extends Base
$this->assertEquals(1, $task['position']);
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.TaskPositionModelTest::onMovePosition', $called);
$this->assertEquals(2, count($called));
$this->assertCount(2, $called);
// Move to another swimlane
$this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1, 2));
@@ -588,8 +586,7 @@ class TaskPositionModelTest extends Base
$this->assertEquals(1, $task['swimlane_id']);
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.TaskPositionModelTest::onMoveSwimlane', $called);
$this->assertEquals(3, count($called));
$this->assertCount(3, $called);
}
public function onMoveColumn($event)

View File

@@ -47,8 +47,7 @@ class TaskProjectDuplicationModelTest extends Base
$this->assertEquals(2, $taskProjectDuplicationModel->duplicateToProject(1, 2));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
$this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
$this->assertCount(2, $called);
// Check the values of the duplicated task
$task = $taskFinderModel->getById(2);

View File

@@ -54,7 +54,7 @@ class TaskProjectMoveModelTest extends Base
$this->assertTrue($taskProjectMoveModel->moveToProject(1, 2));
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.TaskProjectMoveModelTest::onMoveProject', $called);
$this->assertCount(1, $called);
// Check the values of the moved task
$task = $taskFinderModel->getById(1);

View File

@@ -100,8 +100,7 @@ class TaskStatusModelTest extends Base
$this->assertEquals(time(), $task['date_modification'], '', 1);
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey('task.close.TaskStatusModelTest::onTaskClose', $called);
$this->assertArrayHasKey('task.open.TaskStatusModelTest::onTaskOpen', $called);
$this->assertCount(2, $called);
}
public function onTaskOpen($event)