Skip to content

Commit

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

chore(deps-dev): bump nextcloud/coding-standard from 1.2.3 to 1.3.1
  • Loading branch information
mejo- authored Sep 24, 2024
2 parents 2fd8815 + 3238541 commit 592a840
Show file tree
Hide file tree
Showing 17 changed files with 92 additions and 34 deletions.
71 changes: 59 additions & 12 deletions composer.lock

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

2 changes: 1 addition & 1 deletion lib/Controller/AttachmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function __construct(
private IL10N $l10n,
private LoggerInterface $logger,
private IMimeTypeDetector $mimeTypeDetector,
private AttachmentService $attachmentService
private AttachmentService $attachmentService,
) {
parent::__construct($appName, $request);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/PublicSessionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct(
IRequest $request,
ISession $session,
private ShareManager $shareManager,
private ApiService $apiService
private ApiService $apiService,
) {
parent::__construct($appName, $request, $session);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/Controller/SessionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public function __construct(
private SessionService $sessionService,
private NotificationService $notificationService,
private IUserManager $userManager,
private IUserSession $userSession) {
private IUserSession $userSession,
) {
parent::__construct($appName, $request);
}

Expand Down
7 changes: 6 additions & 1 deletion lib/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ class SettingsController extends Controller {
'workspace_enabled'
];

public function __construct(string $appName, IRequest $request, private IConfig $config, private ?string $userId) {
public function __construct(
string $appName,
IRequest $request,
private IConfig $config,
private ?string $userId,
) {
parent::__construct($appName, $request);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/UserApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function __construct(
IRequest $request,
private SessionService $sessionService,
private ISearch $collaboratorSearch,
private IUserManager $userManager
private IUserManager $userManager,
) {
parent::__construct($appName, $request);
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/WorkspaceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function __construct(
private IEventDispatcher $eventDispatcher,
private LoggerInterface $logger,
private ISession $session,
private ?string $userId
private ?string $userId,
) {
parent::__construct($appName, $request);
}
Expand Down Expand Up @@ -173,9 +173,9 @@ public function direct(string $path): DataResponse {
if ($folder instanceof Folder) {
$file = $this->getFile($folder);
if ($file === null) {
$token = $this->directEditingManager->create($path . '/'. $this->workspaceService->getSupportedFilenames()[0], Application::APP_NAME, TextDocumentCreator::CREATOR_ID);
$token = $this->directEditingManager->create($path . '/' . $this->workspaceService->getSupportedFilenames()[0], Application::APP_NAME, TextDocumentCreator::CREATOR_ID);
} else {
$token = $this->directEditingManager->open($path . '/'. $file->getName(), Application::APP_NAME);
$token = $this->directEditingManager->open($path . '/' . $file->getName(), Application::APP_NAME);
}
return new DataResponse([
'url' => $this->urlGenerator->linkToRouteAbsolute('files.DirectEditingView.edit', ['token' => $token])
Expand Down
2 changes: 1 addition & 1 deletion lib/DAV/WorkspacePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct(
private ICacheFactory $cacheFactory,
private IConfig $config,
private LoggerInterface $logger,
private ?string $userId
private ?string $userId,
) {
}

Expand Down
3 changes: 2 additions & 1 deletion lib/Listeners/BeforeNodeRenamedListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ class BeforeNodeRenamedListener implements IEventListener {
public function __construct(
private readonly AttachmentService $attachmentService,
private readonly DocumentService $documentService,
private readonly LoggerInterface $logger) {
private readonly LoggerInterface $logger,
) {
}

public function handle(Event $event): void {
Expand Down
2 changes: 1 addition & 1 deletion lib/Listeners/BeforeNodeWrittenListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
class BeforeNodeWrittenListener implements IEventListener {
public function __construct(
private LoggerInterface $logger,
private DocumentService $documentService
private DocumentService $documentService,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Listeners/LoadEditorListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class LoadEditorListener implements \OCP\EventDispatcher\IEventListener {
public function __construct(
private InitialStateProvider $initialStateProvider,
private IEventDispatcher $eventDispatcher
private IEventDispatcher $eventDispatcher,
) {
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Migration/ResetSessionsBeforeYjs.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
use OCP\Migration\IRepairStep;

class ResetSessionsBeforeYjs implements IRepairStep {
public function __construct(private IAppConfig $config,
private DocumentService $documentService) {
public function __construct(
private IAppConfig $config,
private DocumentService $documentService,
) {
}

/**
Expand Down
10 changes: 6 additions & 4 deletions lib/Service/AttachmentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@
use OCP\Util;

class AttachmentService {
public function __construct(private IRootFolder $rootFolder,
public function __construct(
private IRootFolder $rootFolder,
private ShareManager $shareManager,
private IPreview $previewManager,
private IMimeTypeDetector $mimeTypeDetector,
private IURLGenerator $urlGenerator,
private IFilenameValidator $filenameValidator) {
private IFilenameValidator $filenameValidator,
) {
}

/**
Expand Down Expand Up @@ -101,7 +103,7 @@ private function getImageFileContent(string $imageFileName, File $textFile, bool
* @throws NotPermittedException
* @throws NoUserException
*/
public function getMediaFile(int $documentId, string $mediaFileName, string $userId): File|null {
public function getMediaFile(int $documentId, string $mediaFileName, string $userId): ?File {
$textFile = $this->getTextFile($documentId, $userId);
return $this->getMediaFullFile($mediaFileName, $textFile);
}
Expand All @@ -114,7 +116,7 @@ public function getMediaFile(int $documentId, string $mediaFileName, string $use
* @throws InvalidPathException
* @throws NoUserException
*/
public function getMediaFilePublic(int $documentId, string $mediaFileName, string $shareToken): File|null {
public function getMediaFilePublic(int $documentId, string $mediaFileName, string $shareToken): ?File {
$textFile = $this->getTextFilePublic($documentId, $shareToken);
return $this->getMediaFullFile($mediaFileName, $textFile);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/DocumentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function createDocument(File $file): Document {
try {
/** @var Document $document */
$document = $this->documentMapper->insert($document);
$this->cache->set('document-version-'.$document->getId(), 0);
$this->cache->set('document-version-' . $document->getId(), 0);
} catch (Exception $e) {
if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
// Document might have been created in the meantime
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/InitialStateProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function __construct(
private ConfigService $configService,
private ITranslationManager $translationManager,
private IManager $taskProcessingManager,
private ?string $userId
private ?string $userId,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/SessionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct(
IRequest $request,
IManager $directManager,
?string $userId,
ICacheFactory $cacheFactory
ICacheFactory $cacheFactory,
) {
$this->sessionMapper = $sessionMapper;
$this->secureRandom = $secureRandom;
Expand Down
2 changes: 1 addition & 1 deletion lib/YjsMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class YjsMessage {
private int $pos = 0;

public function __construct(
private string $data = ''
private string $data = '',
) {
}

Expand Down

0 comments on commit 592a840

Please sign in to comment.