diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 7a261a428..98a645a57 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -34,7 +34,7 @@ jobs: POSTGRES_DB: nextcloud options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 mysql: - image: mariadb + image: mariadb:10.5 ports: - 4444:3306/tcp env: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 61de2a314..35cfe66a5 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -35,7 +35,7 @@ jobs: POSTGRES_DB: nextcloud options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 mysql: - image: mariadb + image: mariadb:10.5 ports: - 4444:3306/tcp env: diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php index 0eb83b668..b0bb47870 100644 --- a/lib/Db/BoardMapper.php +++ b/lib/Db/BoardMapper.php @@ -28,7 +28,6 @@ use OCP\IDBConnection; use OCP\ILogger; use OCP\IUserManager; use OCP\IGroupManager; -use Psr\Log\LoggerInterface; class BoardMapper extends DeckMapper implements IPermissionMapper { private $labelMapper; @@ -47,7 +46,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper { StackMapper $stackMapper, IUserManager $userManager, IGroupManager $groupManager, - LoggerInterface $logger + ILogger $logger ) { parent::__construct($db, 'deck_boards', Board::class); $this->labelMapper = $labelMapper; diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 9e0a0aa93..2a1acdda7 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,21 +1,9 @@ - + $message !== null - - getArchived - getBoardId - getBoardId - getBoardId - getBoardId - getCardId - getCardId - getStackId - getTitle - getTitle - @@ -27,25 +15,6 @@ Application - - - IBootstrap - - - - - listen - listen - - - - - getAcl - getOwner - getTitle - getTitle - - void @@ -89,13 +58,6 @@ $parentId - - - Application - Application - Application - - $modified !== null @@ -104,21 +66,6 @@ Util - - - Job - - - - - Job - - - - - Job - - ExternalCalendar @@ -140,18 +87,6 @@ NotFound - - - IWidget - - - - - getPermissionEdit - getPermissionManage - getPermissionShare - - $aclId @@ -161,60 +96,26 @@ $cardId - - getParticipant - getParticipant - getParticipant - getParticipant - getParticipant - getParticipant - getType - getType - getType - - - getCardId - getCardId - $query - - - getLastModified - - $boardId - + + \OCA\Circles\Api\v1\Circles \OCA\Circles\Api\v1\Circles - - setAcl - setLabels - VCalendar VCalendar - - getArchived - getArchived - getDescription - getLabels - getLabels - getLastModified - getLastModified - getStackId - getTitle - @@ -226,21 +127,6 @@ $cardId - - getDescription - getDescription - getDuedate - setCreatedAt - setDatabaseType - setDatabaseType - setDescription - setDescription - setLabels - setLastModified - setLastModified - setNotified - setNotified - @@ -269,69 +155,21 @@ \OCA\Circles\Model\Circle - - - getLastModified - - $labelId - - setLastModified - setLastModified - - - - - getETag - VCalendar VCalendar - - getLastModified - getTitle - $stackId - - getBoardId - - - - - BeforeTemplateRenderedEvent - - - - - getParticipant - getParticipant - getType - getType - - - - - $board->getId() - - - Application - - - getTitle - getTitle - getTitle - getTitle - @@ -348,129 +186,18 @@ [] - - IndexDocument - SearchTemplate - - - - - SearchResultEntry - - - - - SearchResultEntry - - - - - IProvider - $cardId $cardId - - getParticipant - getParticipant - getParticipant - getType - getType - getType - setCardId - setParticipant - setType - - - $this->currentUser - - - $this->currentUser - - - - - Application - - - getCardId - getCardId - getCardId - getData - getType - getType - setCardId - setCreatedAt - setCreatedBy - setData - setLastModified - setLastModified - setType - - - '\OCA\Deck\Board::onCreate' - '\OCA\Deck\Board::onDelete' - '\OCA\Deck\Board::onDelete' - '\OCA\Deck\Board::onShareEdit' - '\OCA\Deck\Board::onUpdate' - '\OCA\Deck\Board::onUpdate' - - - Application - Application - Application - findAll findAll - - getAcl - getAcl - getAcl - getBoardId - getBoardId - getBoardId - getBoardId - getParticipant - getType - setBoardId - setBoardId - setBoardId - setBoardId - setColor - setColor - setColor - setColor - setColor - setLabels - setOwner - setOwner - setParticipant - setPermissionEdit - setPermissionEdit - setPermissionManage - setPermissionManage - setPermissionShare - setPermissionShare - setPermissions - setPermissions - setPermissions - setPermissions - setSettings - setTitle - setTitle - setTitle - setTitle - setTitle - setTitle - setType - @@ -479,52 +206,6 @@ \OCP\AppFramework\Db\ - - getArchived - getArchived - getArchived - getArchived - getArchived - getDescription - getDescription - getDescription - getDescriptionPrev - getDescriptionPrev - getLastEditor - getLastEditor - getLastEditor - getOrder - setArchived - setArchived - setArchived - setAssignedUsers - setAssignedUsers - setAttachmentCount - setAttachments - setCommentsUnread - setDeletedAt - setDeletedAt - setDescription - setDescription - setDescriptionPrev - setDescriptionPrev - setDuedate - setDuedate - setLabels - setLastEditor - setOrder - setOrder - setOwner - setOwner - setStackId - setStackId - setStackId - setTitle - setTitle - setTitle - setType - setType - @@ -533,13 +214,6 @@ - - Application - Application - Application - Application - Application - $this->cardMapper $this->permissionService @@ -559,21 +233,8 @@ (int)$value - - Application - Application - Application - Application - Application - Application - Application - - - Application - Application - $color === false || $color === null $color === null @@ -597,94 +258,16 @@ is_resource($content) is_resource($content) - - getCardId - getCardId - getCardId - getData - getData - setData - setData - setDeletedAt - setExtendedData - setLastModified - - - - - DocumentAccess - IndexDocument - - - getDescription - getDescription - getTitle - getTitle - - - - - getBoardId - getBoardId - getBoardId - setBoardId - setColor - setColor - setTitle - setTitle - - - - - setAssignedUsers - setAttachmentCount - setCommentsUnread - setLabels - \OCA\Circles\Api\v1\Circles \OCA\Circles\Api\v1\Circles - - getAcl - getParticipant - getParticipant - getParticipant - getParticipant - getType - getType - getType - getType - getType - getType - - - '\OCA\Deck\Stack::onCreate' - '\OCA\Deck\Stack::onDelete' - '\OCA\Deck\Stack::onUpdate' - BadRquestException - - getBoardId - getBoardId - getBoardId - getBoardId - getOrder - setBoardId - setBoardId - setCards - setDeletedAt - setDeletedAt - setOrder - setOrder - setTitle - setTitle - diff --git a/tests/unit/Db/AclMapperTest.php b/tests/unit/Db/AclMapperTest.php index 97d57ef54..de0721191 100644 --- a/tests/unit/Db/AclMapperTest.php +++ b/tests/unit/Db/AclMapperTest.php @@ -24,6 +24,7 @@ namespace OCA\Deck\Db; use OCP\IGroupManager; +use OCP\ILogger; use OCP\IUserManager; use Test\AppFramework\Db\MapperTestUtility; @@ -54,7 +55,8 @@ class AclMapperTest extends MapperTestUtility { $this->aclMapper, \OC::$server->query(StackMapper::class), $this->userManager, - $this->groupManager + $this->groupManager, + $this->createMock(ILogger::class) ); $this->boards = [ diff --git a/tests/unit/Db/BoardMapperTest.php b/tests/unit/Db/BoardMapperTest.php index 3d0b0049a..53ff24d2b 100644 --- a/tests/unit/Db/BoardMapperTest.php +++ b/tests/unit/Db/BoardMapperTest.php @@ -25,8 +25,8 @@ namespace OCA\Deck\Db; use OCP\IDBConnection; use OCP\IGroupManager; +use OCP\ILogger; use OCP\IUserManager; -use Psr\Log\LoggerInterface; use Test\AppFramework\Db\MapperTestUtility; /** @@ -63,7 +63,7 @@ class BoardMapperTest extends MapperTestUtility { \OC::$server->query(StackMapper::class), $this->userManager, $this->groupManager, - $this->createMock(LoggerInterface::class) + $this->createMock(ILogger::class) ); $this->aclMapper = \OC::$server->query(AclMapper::class); $this->labelMapper = \OC::$server->query(LabelMapper::class);