Merge pull request #6436 from nextcloud/dependabot/composer/nextcloud…

…/coding-standard-1.3.1 chore(deps-dev): bump nextcloud/coding-standard from 1.2.3 to 1.3.1
nextcloud · Sep 24, 2024 · 592a840 · 592a840
2 parents 2fd8815 + 3238541
commit 592a840
Show file tree

Hide file tree

Showing 17 changed files with 92 additions and 34 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/AttachmentController.php b/lib/Controller/AttachmentController.php
@@ -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);
 	}

diff --git a/lib/Controller/PublicSessionController.php b/lib/Controller/PublicSessionController.php
@@ -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);
 	}

diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php
@@ -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);
 	}
 

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -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);
 	}
 

diff --git a/lib/Controller/UserApiController.php b/lib/Controller/UserApiController.php
@@ -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);
 	}

diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
@@ -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);
 	}
@@ -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])

diff --git a/lib/DAV/WorkspacePlugin.php b/lib/DAV/WorkspacePlugin.php
@@ -40,7 +40,7 @@ public function __construct(
 		private ICacheFactory $cacheFactory,
 		private IConfig $config,
 		private LoggerInterface $logger,
-		private ?string $userId
+		private ?string $userId,
 	) {
 	}
 

diff --git a/lib/Listeners/BeforeNodeRenamedListener.php b/lib/Listeners/BeforeNodeRenamedListener.php
@@ -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 {

diff --git a/lib/Listeners/BeforeNodeWrittenListener.php b/lib/Listeners/BeforeNodeWrittenListener.php
@@ -23,7 +23,7 @@
 class BeforeNodeWrittenListener implements IEventListener {
 	public function __construct(
 		private LoggerInterface $logger,
-		private DocumentService $documentService
+		private DocumentService $documentService,
 	) {
 	}
 

diff --git a/lib/Listeners/LoadEditorListener.php b/lib/Listeners/LoadEditorListener.php
@@ -22,7 +22,7 @@
 class LoadEditorListener implements \OCP\EventDispatcher\IEventListener {
 	public function __construct(
 		private InitialStateProvider $initialStateProvider,
-		private IEventDispatcher $eventDispatcher
+		private IEventDispatcher $eventDispatcher,
 	) {
 	}
 

diff --git a/lib/Migration/ResetSessionsBeforeYjs.php b/lib/Migration/ResetSessionsBeforeYjs.php
@@ -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,
+	) {
 	}
 
 	/**

diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
@@ -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,
+	) {
 	}
 
 	/**
@@ -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);
 	}
@@ -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);
 	}

diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
@@ -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

diff --git a/lib/Service/InitialStateProvider.php b/lib/Service/InitialStateProvider.php
@@ -27,7 +27,7 @@ public function __construct(
 		private ConfigService $configService,
 		private ITranslationManager $translationManager,
 		private IManager $taskProcessingManager,
-		private ?string $userId
+		private ?string $userId,
 	) {
 	}
 

diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
@@ -45,7 +45,7 @@ public function __construct(
 		IRequest $request,
 		IManager $directManager,
 		?string $userId,
-		ICacheFactory $cacheFactory
+		ICacheFactory $cacheFactory,
 	) {
 		$this->sessionMapper = $sessionMapper;
 		$this->secureRandom = $secureRandom;

diff --git a/lib/YjsMessage.php b/lib/YjsMessage.php
@@ -35,7 +35,7 @@ class YjsMessage {
 	private int $pos = 0;
 
 	public function __construct(
-		private string $data = ''
+		private string $data = '',
 	) {
 	}