Skip to content

Commit

Permalink
Merge pull request #6256 from nextcloud/dependabot/composer/nextcloud…
Browse files Browse the repository at this point in the history
…/coding-standard-1.2.3

chore(deps-dev): bump nextcloud/coding-standard from 1.2.1 to 1.2.3
  • Loading branch information
juliusknorr authored Aug 26, 2024
2 parents c3e514f + b3c8746 commit a628d71
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions lib/Service/AttachmentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
/**
* Save an uploaded file in the attachment folder
*
* @param int $documentId
* @param string $newFileName
* @param int $documentId
* @param string $newFileName
* @param resource $newFileResource
* @param string $userId
* @param string $userId
*
* @return array
* @throws InvalidPathException
Expand Down Expand Up @@ -470,7 +470,7 @@ private function isDownloadDisabled(File $file): bool {
/**
* Get a user file from file ID
*
* @param int $documentId
* @param int $documentId
* @param string $userId
*
* @return File
Expand Down Expand Up @@ -568,7 +568,7 @@ public function cleanupAttachments(int $fileId): int {
* Get attachment file names listed in the markdown file content
*
* @param string $content
* @param int $fileId
* @param int $fileId
*
* @return array
*/
Expand Down
10 changes: 5 additions & 5 deletions lib/Service/DocumentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ public function addStep(Document $document, Session $session, array $steps, int

/**
* @param Document $document
* @param Session $session
* @param Step[] $steps
* @param Session $session
* @param Step[] $steps
*
* @return int
*
Expand All @@ -269,7 +269,7 @@ private function insertSteps(Document $document, Session $session, array $steps)
$step->setTimestamp(time());
$step = $this->stepMapper->insert($step);
$newVersion = $step->getId();
$this->logger->debug("Adding steps to " . $document->getId() . ": bumping version from $stepsVersion to $newVersion");
$this->logger->debug('Adding steps to ' . $document->getId() . ": bumping version from $stepsVersion to $newVersion");
$this->cache->set('document-version-' . $document->getId(), $newVersion);
// TODO write steps to cache for quicker reading
return $newVersion;
Expand Down Expand Up @@ -632,7 +632,7 @@ public function lock(int $fileId): bool {
ILock::TYPE_APP,
Application::APP_NAME
));
} catch (NoLockProviderException | PreConditionNotMetException | NotFoundException $e) {
} catch (NoLockProviderException|PreConditionNotMetException|NotFoundException $e) {
} catch (OwnerLockedException $e) {
return false;
}
Expand All @@ -651,7 +651,7 @@ public function unlock(int $fileId): void {
ILock::TYPE_APP,
Application::APP_NAME
));
} catch (NoLockProviderException | PreConditionNotMetException | NotFoundException $e) {
} catch (NoLockProviderException|PreConditionNotMetException|NotFoundException $e) {
}
}

Expand Down

0 comments on commit a628d71

Please sign in to comment.