From 4e92faa517aca042022ec293245d753322ea0ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 28 Dec 2020 14:40:14 +0100 Subject: [PATCH] Do not error on deprecated methods for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/AppInfo/Application20.php | 2 +- lib/Db/AssignmentMapper.php | 2 +- lib/Db/StackMapper.php | 5 ++--- lib/Provider/DeckProvider.php | 5 ++--- lib/Service/BoardService.php | 5 ++--- lib/Service/FullTextSearchService.php | 2 ++ lib/Service/PermissionService.php | 7 +++---- lib/Service/StackService.php | 15 +++++++-------- psalm.xml | 7 +++++++ tests/unit/Service/BoardServiceTest.php | 3 ++- tests/unit/Service/StackServiceTest.php | 3 ++- 11 files changed, 31 insertions(+), 25 deletions(-) diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php index 8f75799c2..11fbf6619 100644 --- a/lib/AppInfo/Application20.php +++ b/lib/AppInfo/Application20.php @@ -214,7 +214,7 @@ class Application20 extends App implements IBootstrap { } ); $eventDispatcher->addListener( - '\OCA\Deck\Board::onShareNew', function (Event $e) { + '\OCA\Deck\Board::onShareNew', function (Event $e) use ($server) { $fullTextSearchService = $server->get(FullTextSearchService::class); $fullTextSearchService->onBoardShares($e); } diff --git a/lib/Db/AssignmentMapper.php b/lib/Db/AssignmentMapper.php index 1abe144ec..bce0db4e8 100644 --- a/lib/Db/AssignmentMapper.php +++ b/lib/Db/AssignmentMapper.php @@ -91,7 +91,7 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper { * Check if user exists before assigning it to a card * * @param Entity $entity - * @return null|Assignment + * @return Assignment * @throws NotFoundException */ public function insert(Entity $entity): Entity { diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php index 8cf28918a..fc2f6c715 100644 --- a/lib/Db/StackMapper.php +++ b/lib/Db/StackMapper.php @@ -39,9 +39,8 @@ class StackMapper extends DeckMapper implements IPermissionMapper { /** * @param $id - * @return \OCP\AppFramework\Db\Entity if not found - * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException - * @throws \OCP\AppFramework\Db\DoesNotExistException + * @throws MultipleObjectsReturnedException + * @throws DoesNotExistException */ public function find($id): Stack { $sql = 'SELECT * FROM `*PREFIX*deck_stacks` ' . diff --git a/lib/Provider/DeckProvider.php b/lib/Provider/DeckProvider.php index e886ed2f3..72e0e623c 100644 --- a/lib/Provider/DeckProvider.php +++ b/lib/Provider/DeckProvider.php @@ -128,10 +128,8 @@ class DeckProvider implements IFullTextSearchProvider { } - /** - * @return ISearchTemplate - */ public function getSearchTemplate(): ISearchTemplate { + /** @psalm-var ISearchTemplate */ $template = new SearchTemplate('icon-deck', 'icons'); return $template; @@ -204,6 +202,7 @@ class DeckProvider implements IFullTextSearchProvider { * @throws MultipleObjectsReturnedException */ public function updateDocument(IIndex $index): IIndexDocument { + /** @psalm-var IIndexDocument */ $document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, $index->getDocumentId()); $document->setIndex($index); diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index b5e60a625..f49a5e706 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -24,6 +24,7 @@ namespace OCA\Deck\Service; +use OC\EventDispatcher\SymfonyAdapter; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; use OCA\Deck\AppInfo\Application; @@ -46,7 +47,6 @@ use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\LabelMapper; use OCP\IUserManager; use OCA\Deck\BadRequestException; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class BoardService { @@ -64,7 +64,6 @@ class BoardService { private $groupManager; private $userId; private $activityManager; - /** @var EventDispatcherInterface */ private $eventDispatcher; private $changeHelper; @@ -84,7 +83,7 @@ class BoardService { IUserManager $userManager, IGroupManager $groupManager, ActivityManager $activityManager, - EventDispatcherInterface $eventDispatcher, + SymfonyAdapter $eventDispatcher, ChangeHelper $changeHelper, $userId ) { diff --git a/lib/Service/FullTextSearchService.php b/lib/Service/FullTextSearchService.php index 3362ea162..dc56073ec 100644 --- a/lib/Service/FullTextSearchService.php +++ b/lib/Service/FullTextSearchService.php @@ -161,6 +161,7 @@ class FullTextSearchService { * @return IIndexDocument */ public function generateIndexDocumentFromCard(Card $card): IIndexDocument { + /** @psalm-var IIndexDocument */ $document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, (string)$card->getId()); return $document; @@ -193,6 +194,7 @@ class FullTextSearchService { public function generateDocumentAccessFromCardId(int $cardId): IDocumentAccess { $board = $this->getBoardFromCardId($cardId); + /** @psalm-var IDocumentAccess */ return new DocumentAccess($board->getOwner()); } diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index ce0088258..05c393786 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -106,7 +106,7 @@ class PermissionService { /** * Get current user permissions for a board * - * @param Board|Entity $board + * @param Board $board * @return array|bool * @internal param $boardId */ @@ -170,10 +170,9 @@ class PermissionService { try { $board = $this->boardMapper->find($boardId); return $board && $userId === $board->getOwner(); - } catch (DoesNotExistException $e) { - } catch (MultipleObjectsReturnedException $e) { - return false; + } catch (DoesNotExistException | MultipleObjectsReturnedException $e) { } + return false; } /** diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php index b5dc22213..6bca4a4ce 100644 --- a/lib/Service/StackService.php +++ b/lib/Service/StackService.php @@ -24,6 +24,7 @@ namespace OCA\Deck\Service; +use OC\EventDispatcher\SymfonyAdapter; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; use OCA\Deck\BadRequestException; @@ -36,7 +37,6 @@ use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\Stack; use OCA\Deck\Db\StackMapper; use OCA\Deck\StatusException; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class StackService { @@ -50,8 +50,7 @@ class StackService { private $assignedUsersMapper; private $attachmentService; private $activityManager; - /** @var EventDispatcherInterface */ - private $eventDispatcher; + private $symfonyAdapter; private $changeHelper; public function __construct( @@ -65,7 +64,7 @@ class StackService { AssignmentMapper $assignedUsersMapper, AttachmentService $attachmentService, ActivityManager $activityManager, - EventDispatcherInterface $eventDispatcher, + SymfonyAdapter $eventDispatcher, ChangeHelper $changeHelper ) { $this->stackMapper = $stackMapper; @@ -78,7 +77,7 @@ class StackService { $this->assignedUsersMapper = $assignedUsersMapper; $this->attachmentService = $attachmentService; $this->activityManager = $activityManager; - $this->eventDispatcher = $eventDispatcher; + $this->symfonyAdapter = $eventDispatcher; $this->changeHelper = $changeHelper; } @@ -226,7 +225,7 @@ class StackService { ); $this->changeHelper->boardChanged($boardId); - $this->eventDispatcher->dispatch( + $this->symfonyAdapter->dispatch( '\OCA\Deck\Stack::onCreate', new GenericEvent(null, ['id' => $stack->getId(), 'stack' => $stack]) ); @@ -260,7 +259,7 @@ class StackService { $this->changeHelper->boardChanged($stack->getBoardId()); $this->enrichStackWithCards($stack); - $this->eventDispatcher->dispatch( + $this->symfonyAdapter->dispatch( '\OCA\Deck\Stack::onDelete', new GenericEvent(null, ['id' => $id, 'stack' => $stack]) ); @@ -315,7 +314,7 @@ class StackService { ); $this->changeHelper->boardChanged($stack->getBoardId()); - $this->eventDispatcher->dispatch( + $this->symfonyAdapter->dispatch( '\OCA\Deck\Stack::onUpdate', new GenericEvent(null, ['id' => $id, 'stack' => $stack]) ); diff --git a/psalm.xml b/psalm.xml index 60aae76d9..04840bad9 100644 --- a/psalm.xml +++ b/psalm.xml @@ -26,6 +26,13 @@ + + + + + + + diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php index 909eb5c21..146c08bc0 100644 --- a/tests/unit/Service/BoardServiceTest.php +++ b/tests/unit/Service/BoardServiceTest.php @@ -23,6 +23,7 @@ namespace OCA\Deck\Service; +use OC\EventDispatcher\SymfonyAdapter; use OC\L10N\L10N; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Db\Acl; @@ -90,7 +91,7 @@ class BoardServiceTest extends TestCase { $this->groupManager = $this->createMock(IGroupManager::class); $this->activityManager = $this->createMock(ActivityManager::class); $this->changeHelper = $this->createMock(ChangeHelper::class); - $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); + $this->eventDispatcher = $this->createMock(SymfonyAdapter::class); $this->service = new BoardService( $this->boardMapper, diff --git a/tests/unit/Service/StackServiceTest.php b/tests/unit/Service/StackServiceTest.php index e40d8e93c..36f8a5463 100644 --- a/tests/unit/Service/StackServiceTest.php +++ b/tests/unit/Service/StackServiceTest.php @@ -23,6 +23,7 @@ namespace OCA\Deck\Service; +use OC\EventDispatcher\SymfonyAdapter; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Card; @@ -84,7 +85,7 @@ class StackServiceTest extends TestCase { $this->labelMapper = $this->createMock(LabelMapper::class); $this->activityManager = $this->createMock(ActivityManager::class); $this->changeHelper = $this->createMock(ChangeHelper::class); - $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); + $this->eventDispatcher = $this->createMock(SymfonyAdapter::class); $this->stackService = new StackService( $this->stackMapper,