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

Fix ParamNameMismatch occurences

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2021-06-10 08:01:27 +02:00
parent ba6f7fd55d
commit b657967cac
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/AclMapper.php
View File

@@ -44,9 +44,9 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
return ($row['owner'] === $userId); return ($row['owner'] === $userId);
} }
public function findBoardId($aclId): ?int { public function findBoardId($id): ?int {
try { try {
$entity = $this->find($aclId); $entity = $this->find($id);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException | MultipleObjectsReturnedException $e) { } catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
} }

4
lib/Db/AssignmentMapper.php
View File

@@ -83,8 +83,8 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
return $this->cardMapper->isOwner($userId, $cardId); return $this->cardMapper->isOwner($userId, $cardId);
} }
public function findBoardId($cardId): ?int { public function findBoardId($id): ?int {
return $this->cardMapper->findBoardId($cardId); return $this->cardMapper->findBoardId($id);
} }
/** /**

4
lib/Db/CardMapper.php
View File

@@ -546,10 +546,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
return ($row['owner'] === $userId); return ($row['owner'] === $userId);
} }
public function findBoardId($cardId): ?int { public function findBoardId($id): ?int {
$sql = 'SELECT id FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))'; $sql = 'SELECT id FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT); $stmt->bindParam(1, $id, \PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
return $stmt->fetchColumn() ?? null; return $stmt->fetchColumn() ?? null;
} }

4
lib/Db/LabelMapper.php
View File

@@ -101,9 +101,9 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
return ($row['owner'] === $userId); return ($row['owner'] === $userId);
} }
public function findBoardId($labelId): ?int { public function findBoardId($id): ?int {
try { try {
$entity = $this->find($labelId); $entity = $this->find($id);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException $e) { } catch (DoesNotExistException $e) {
} catch (MultipleObjectsReturnedException $e) { } catch (MultipleObjectsReturnedException $e) {

4
lib/Db/StackMapper.php
View File

@@ -75,9 +75,9 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
return ($row['owner'] === $userId); return ($row['owner'] === $userId);
} }
public function findBoardId($stackId): ?int { public function findBoardId($id): ?int {
try { try {
$entity = $this->find($stackId); $entity = $this->find($id);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException $e) { } catch (DoesNotExistException $e) {
} catch (MultipleObjectsReturnedException $e) { } catch (MultipleObjectsReturnedException $e) {

2
lib/Provider/DeckProvider.php
View File

@@ -238,7 +238,7 @@ class DeckProvider implements IFullTextSearchProvider {
* *
* @param ISearchRequest $request * @param ISearchRequest $request
*/ */
public function improveSearchRequest(ISearchRequest $request) { public function improveSearchRequest(ISearchRequest $searchRequest) {
} }

5
tests/psalm-baseline.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.7.2@83a0325c0a95c0ab531d6b90c877068b464377b5"> <files psalm-version="4.7.3@38c452ae584467e939d55377aaf83b5a26f19dd1">
<file src="lib/Activity/ActivityManager.php"> <file src="lib/Activity/ActivityManager.php">
<TypeDoesNotContainType occurrences="1"> <TypeDoesNotContainType occurrences="1">
<code>$message !== null</code> <code>$message !== null</code>
@@ -274,6 +274,9 @@
<InvalidReturnType occurrences="1"> <InvalidReturnType occurrences="1">
<code>getSharesInFolder</code> <code>getSharesInFolder</code>
</InvalidReturnType> </InvalidReturnType>
<InvalidThrow occurrences="1">
<code>throw new GenericShareException('Already shared', $this-&gt;l-&gt;t('Path is already shared with this card'), 403);</code>
</InvalidThrow>
<MissingDependency occurrences="8"> <MissingDependency occurrences="8">
<code>GenericShareException</code> <code>GenericShareException</code>
<code>GenericShareException</code> <code>GenericShareException</code>