ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Do not error on deprecated methods for now

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-12-28 14:40:14 +01:00
parent 34f45d985f
commit 4e92faa517
11 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AppInfo/Application20.php
View File

@@ -214,7 +214,7 @@ class Application20 extends App implements IBootstrap {
} }
); );
$eventDispatcher->addListener( $eventDispatcher->addListener(
'\OCA\Deck\Board::onShareNew', function (Event $e) { '\OCA\Deck\Board::onShareNew', function (Event $e) use ($server) {
$fullTextSearchService = $server->get(FullTextSearchService::class); $fullTextSearchService = $server->get(FullTextSearchService::class);
$fullTextSearchService->onBoardShares($e); $fullTextSearchService->onBoardShares($e);
} }

2
lib/Db/AssignmentMapper.php
View File

@@ -91,7 +91,7 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
* Check if user exists before assigning it to a card * Check if user exists before assigning it to a card
* *
* @param Entity $entity * @param Entity $entity
* @return null|Assignment * @return Assignment
* @throws NotFoundException * @throws NotFoundException
*/ */
public function insert(Entity $entity): Entity { public function insert(Entity $entity): Entity {

5
lib/Db/StackMapper.php
View File

@@ -39,9 +39,8 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
/** /**
* @param $id * @param $id
* @return \OCP\AppFramework\Db\Entity if not found * @throws MultipleObjectsReturnedException
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException * @throws DoesNotExistException
* @throws \OCP\AppFramework\Db\DoesNotExistException
*/ */
public function find($id): Stack { public function find($id): Stack {
$sql = 'SELECT * FROM `*PREFIX*deck_stacks` ' . $sql = 'SELECT * FROM `*PREFIX*deck_stacks` ' .

5
lib/Provider/DeckProvider.php
View File

@@ -128,10 +128,8 @@ class DeckProvider implements IFullTextSearchProvider {
} }
/**
* @return ISearchTemplate
*/
public function getSearchTemplate(): ISearchTemplate { public function getSearchTemplate(): ISearchTemplate {
/** @psalm-var ISearchTemplate */
$template = new SearchTemplate('icon-deck', 'icons'); $template = new SearchTemplate('icon-deck', 'icons');
return $template; return $template;
@@ -204,6 +202,7 @@ class DeckProvider implements IFullTextSearchProvider {
* @throws MultipleObjectsReturnedException * @throws MultipleObjectsReturnedException
*/ */
public function updateDocument(IIndex $index): IIndexDocument { public function updateDocument(IIndex $index): IIndexDocument {
/** @psalm-var IIndexDocument */
$document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, $index->getDocumentId()); $document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, $index->getDocumentId());
$document->setIndex($index); $document->setIndex($index);

5
lib/Service/BoardService.php
View File

@@ -24,6 +24,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OC\EventDispatcher\SymfonyAdapter;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Activity\ChangeSet; use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\AppInfo\Application; use OCA\Deck\AppInfo\Application;
@@ -46,7 +47,6 @@ use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\LabelMapper;
use OCP\IUserManager; use OCP\IUserManager;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent; use Symfony\Component\EventDispatcher\GenericEvent;
class BoardService { class BoardService {
@@ -64,7 +64,6 @@ class BoardService {
private $groupManager; private $groupManager;
private $userId; private $userId;
private $activityManager; private $activityManager;
/** @var EventDispatcherInterface */
private $eventDispatcher; private $eventDispatcher;
private $changeHelper; private $changeHelper;
@@ -84,7 +83,7 @@ class BoardService {
IUserManager $userManager, IUserManager $userManager,
IGroupManager $groupManager, IGroupManager $groupManager,
ActivityManager $activityManager, ActivityManager $activityManager,
EventDispatcherInterface $eventDispatcher, SymfonyAdapter $eventDispatcher,
ChangeHelper $changeHelper, ChangeHelper $changeHelper,
$userId $userId
) { ) {

2
lib/Service/FullTextSearchService.php
View File

@@ -161,6 +161,7 @@ class FullTextSearchService {
* @return IIndexDocument * @return IIndexDocument
*/ */
public function generateIndexDocumentFromCard(Card $card): IIndexDocument { public function generateIndexDocumentFromCard(Card $card): IIndexDocument {
/** @psalm-var IIndexDocument */
$document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, (string)$card->getId()); $document = new IndexDocument(DeckProvider::DECK_PROVIDER_ID, (string)$card->getId());
return $document; return $document;
@@ -193,6 +194,7 @@ class FullTextSearchService {
public function generateDocumentAccessFromCardId(int $cardId): IDocumentAccess { public function generateDocumentAccessFromCardId(int $cardId): IDocumentAccess {
$board = $this->getBoardFromCardId($cardId); $board = $this->getBoardFromCardId($cardId);
/** @psalm-var IDocumentAccess */
return new DocumentAccess($board->getOwner()); return new DocumentAccess($board->getOwner());
} }

7
lib/Service/PermissionService.php
View File

@@ -106,7 +106,7 @@ class PermissionService {
/** /**
* Get current user permissions for a board * Get current user permissions for a board
* *
* @param Board|Entity $board * @param Board $board
* @return array|bool * @return array|bool
* @internal param $boardId * @internal param $boardId
*/ */
@@ -170,10 +170,9 @@ class PermissionService {
try { try {
$board = $this->boardMapper->find($boardId); $board = $this->boardMapper->find($boardId);
return $board && $userId === $board->getOwner(); return $board && $userId === $board->getOwner();
} catch (DoesNotExistException $e) { } catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
} catch (MultipleObjectsReturnedException $e) {
return false;
} }
return false;
} }
/** /**

15
lib/Service/StackService.php
View File

@@ -24,6 +24,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OC\EventDispatcher\SymfonyAdapter;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Activity\ChangeSet; use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
@@ -36,7 +37,6 @@ use OCA\Deck\Db\LabelMapper;
use OCA\Deck\Db\Stack; use OCA\Deck\Db\Stack;
use OCA\Deck\Db\StackMapper; use OCA\Deck\Db\StackMapper;
use OCA\Deck\StatusException; use OCA\Deck\StatusException;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent; use Symfony\Component\EventDispatcher\GenericEvent;
class StackService { class StackService {
@@ -50,8 +50,7 @@ class StackService {
private $assignedUsersMapper; private $assignedUsersMapper;
private $attachmentService; private $attachmentService;
private $activityManager; private $activityManager;
/** @var EventDispatcherInterface */ private $symfonyAdapter;
private $eventDispatcher;
private $changeHelper; private $changeHelper;
public function __construct( public function __construct(
@@ -65,7 +64,7 @@ class StackService {
AssignmentMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
AttachmentService $attachmentService, AttachmentService $attachmentService,
ActivityManager $activityManager, ActivityManager $activityManager,
EventDispatcherInterface $eventDispatcher, SymfonyAdapter $eventDispatcher,
ChangeHelper $changeHelper ChangeHelper $changeHelper
) { ) {
$this->stackMapper = $stackMapper; $this->stackMapper = $stackMapper;
@@ -78,7 +77,7 @@ class StackService {
$this->assignedUsersMapper = $assignedUsersMapper; $this->assignedUsersMapper = $assignedUsersMapper;
$this->attachmentService = $attachmentService; $this->attachmentService = $attachmentService;
$this->activityManager = $activityManager; $this->activityManager = $activityManager;
$this->eventDispatcher = $eventDispatcher; $this->symfonyAdapter = $eventDispatcher;
$this->changeHelper = $changeHelper; $this->changeHelper = $changeHelper;
} }
@@ -226,7 +225,7 @@ class StackService {
); );
$this->changeHelper->boardChanged($boardId); $this->changeHelper->boardChanged($boardId);
$this->eventDispatcher->dispatch( $this->symfonyAdapter->dispatch(
'\OCA\Deck\Stack::onCreate', '\OCA\Deck\Stack::onCreate',
new GenericEvent(null, ['id' => $stack->getId(), 'stack' => $stack]) new GenericEvent(null, ['id' => $stack->getId(), 'stack' => $stack])
); );
@@ -260,7 +259,7 @@ class StackService {
$this->changeHelper->boardChanged($stack->getBoardId()); $this->changeHelper->boardChanged($stack->getBoardId());
$this->enrichStackWithCards($stack); $this->enrichStackWithCards($stack);
$this->eventDispatcher->dispatch( $this->symfonyAdapter->dispatch(
'\OCA\Deck\Stack::onDelete', new GenericEvent(null, ['id' => $id, 'stack' => $stack]) '\OCA\Deck\Stack::onDelete', new GenericEvent(null, ['id' => $id, 'stack' => $stack])
); );
@@ -315,7 +314,7 @@ class StackService {
); );
$this->changeHelper->boardChanged($stack->getBoardId()); $this->changeHelper->boardChanged($stack->getBoardId());
$this->eventDispatcher->dispatch( $this->symfonyAdapter->dispatch(
'\OCA\Deck\Stack::onUpdate', new GenericEvent(null, ['id' => $id, 'stack' => $stack]) '\OCA\Deck\Stack::onUpdate', new GenericEvent(null, ['id' => $id, 'stack' => $stack])
); );

7
psalm.xml
View File

@@ -26,6 +26,13 @@
<referencedMethod name="/Db\\.*::.*/" /> <referencedMethod name="/Db\\.*::.*/" />
</errorLevel> </errorLevel>
</UndefinedMagicMethod> </UndefinedMagicMethod>
<UndefinedInterfaceMethod>
<errorLevel type="suppress">
<!-- FIXME Deprecated event handling -->
<referencedMethod name="OCP\IUserManager::listen" />
<referencedMethod name="OCP\IGroupManager::listen" />
</errorLevel>
</UndefinedInterfaceMethod>
<UndefinedClass> <UndefinedClass>
<errorLevel type="suppress"> <errorLevel type="suppress">
<referencedClass name="OC\*" /> <referencedClass name="OC\*" />

3
tests/unit/Service/BoardServiceTest.php
View File

@@ -23,6 +23,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OC\EventDispatcher\SymfonyAdapter;
use OC\L10N\L10N; use OC\L10N\L10N;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
@@ -90,7 +91,7 @@ class BoardServiceTest extends TestCase {
$this->groupManager = $this->createMock(IGroupManager::class); $this->groupManager = $this->createMock(IGroupManager::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);
$this->changeHelper = $this->createMock(ChangeHelper::class); $this->changeHelper = $this->createMock(ChangeHelper::class);
$this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); $this->eventDispatcher = $this->createMock(SymfonyAdapter::class);
$this->service = new BoardService( $this->service = new BoardService(
$this->boardMapper, $this->boardMapper,

3
tests/unit/Service/StackServiceTest.php
View File

@@ -23,6 +23,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OC\EventDispatcher\SymfonyAdapter;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
@@ -84,7 +85,7 @@ class StackServiceTest extends TestCase {
$this->labelMapper = $this->createMock(LabelMapper::class); $this->labelMapper = $this->createMock(LabelMapper::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);
$this->changeHelper = $this->createMock(ChangeHelper::class); $this->changeHelper = $this->createMock(ChangeHelper::class);
$this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); $this->eventDispatcher = $this->createMock(SymfonyAdapter::class);
$this->stackService = new StackService( $this->stackService = new StackService(
$this->stackMapper, $this->stackMapper,