chore: Bump php-cs-fixer config and apply

Signed-off-by: Julius Knorr <[email protected]>
nextcloud · Sep 19, 2024 · 9ca8814 · 9ca8814
1 parent 62c6c04
commit 9ca8814
Show file tree

Hide file tree

Showing 45 changed files with 234 additions and 105 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Backgroundjobs/Cleanup.php b/lib/Backgroundjobs/Cleanup.php
@@ -13,7 +13,11 @@
 use OCP\IDBConnection;
 
 class Cleanup extends TimedJob {
-	public function __construct(ITimeFactory $time, private IDBConnection $db, private WopiMapper $wopiMapper) {
+	public function __construct(
+		ITimeFactory $time,
+		private IDBConnection $db,
+		private WopiMapper $wopiMapper,
+	) {
 		parent::__construct($time);
 
 		$this->setInterval(60 * 60);

diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -90,7 +90,7 @@ public function __construct(
 		private PermissionManager $permissionManager,
 		private IAppManager $appManager,
 		private ?string $userId,
-		private IURLGenerator $urlGenerator
+		private IURLGenerator $urlGenerator,
 	) {
 	}
 

diff --git a/lib/Command/ConvertToBigInt.php b/lib/Command/ConvertToBigInt.php
@@ -18,7 +18,9 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class ConvertToBigInt extends Command {
-	public function __construct(private Connection $connection) {
+	public function __construct(
+		private Connection $connection,
+	) {
 		parent::__construct();
 	}
 

diff --git a/lib/Command/InstallDefaultFonts.php b/lib/Command/InstallDefaultFonts.php
@@ -11,7 +11,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InstallDefaultFonts extends Command {
-	public function __construct(private FontService $fontService) {
+	public function __construct(
+		private FontService $fontService,
+	) {
 		parent::__construct();
 	}
 

diff --git a/lib/Command/UpdateEmptyTemplates.php b/lib/Command/UpdateEmptyTemplates.php
@@ -13,7 +13,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateEmptyTemplates extends Command {
-	public function __construct(private TemplateManager $templateManager) {
+	public function __construct(
+		private TemplateManager $templateManager,
+	) {
 		parent::__construct();
 	}
 

diff --git a/lib/Controller/AssetsController.php b/lib/Controller/AssetsController.php
@@ -22,13 +22,15 @@
 use OCP\IURLGenerator;
 
 class AssetsController extends Controller {
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		private AssetMapper $assetMapper,
 		private IRootFolder $rootFolder,
 		private ?string $userId,
 		private UserScopeService $userScopeService,
-		private IURLGenerator $urlGenerator) {
+		private IURLGenerator $urlGenerator,
+	) {
 		parent::__construct($appName, $request);
 	}
 

diff --git a/lib/Controller/DirectViewController.php b/lib/Controller/DirectViewController.php
@@ -42,7 +42,7 @@ public function __construct(
 		private AppConfig $appConfig,
 		private TemplateManager $templateManager,
 		private FederationService $federationService,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 	}

diff --git a/lib/Controller/DocumentAPIController.php b/lib/Controller/DocumentAPIController.php
@@ -29,7 +29,16 @@
 use Throwable;
 
 class DocumentAPIController extends \OCP\AppFramework\OCSController {
-	public function __construct(IRequest $request, private IRootFolder $rootFolder, private IManager $shareManager, private TemplateManager $templateManager, private IL10N $l10n, private LoggerInterface $logger, private ILockManager $lockManager, private $userId) {
+	public function __construct(
+		IRequest $request,
+		private IRootFolder $rootFolder,
+		private IManager $shareManager,
+		private TemplateManager $templateManager,
+		private IL10N $l10n,
+		private LoggerInterface $logger,
+		private ILockManager $lockManager,
+		private $userId,
+	) {
 		parent::__construct(Application::APPNAME, $request);
 	}
 

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -58,7 +58,7 @@ public function __construct(
 		private TemplateManager $templateManager,
 		private FederationService $federationService,
 		private InitialStateService $initialState,
-		private IURLGenerator $urlGenerator
+		private IURLGenerator $urlGenerator,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -144,7 +144,7 @@ public function index($fileId, ?string $path = null): RedirectResponse|TemplateR
 			if ($encryptionManager->isEnabled()) {
 				// Update the current file to be accessible with system public shared key
 				$owner = $file->getOwner()->getUID();
-				$absPath = '/' . $owner . '/' .  $file->getInternalPath();
+				$absPath = '/' . $owner . '/' . $file->getInternalPath();
 				$accessList = OC::$server->getEncryptionFilesHelper()->getAccessList($absPath);
 				$accessList['public'] = true;
 				$encryptionManager->getEncryptionModule()->update($absPath, $owner, $accessList);

diff --git a/lib/Controller/FederationController.php b/lib/Controller/FederationController.php
@@ -26,7 +26,7 @@ public function __construct(
 		private LoggerInterface $logger,
 		private WopiMapper $wopiMapper,
 		private IUserManager $userManager,
-		private IURLGenerator $urlGenerator
+		private IURLGenerator $urlGenerator,
 	) {
 		parent::__construct($appName, $request);
 	}

diff --git a/lib/Controller/OCSController.php b/lib/Controller/OCSController.php
@@ -33,7 +33,8 @@ class OCSController extends \OCP\AppFramework\OCSController {
 	/**
 	 * @param string $userId
 	 */
-	public function __construct(string $appName,
+	public function __construct(
+		string $appName,
 		IRequest $request,
 		private IRootFolder $rootFolder,
 		private $userId,
@@ -43,7 +44,7 @@ public function __construct(string $appName,
 		private TokenManager $tokenManager,
 		private IManager $shareManager,
 		private FederationService $federationService,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -94,7 +95,7 @@ public function createPublic(
 		string $shareToken,
 		?string $host = null,
 		string $path = '',
-		?string $password = null
+		?string $password = null,
 	): DataResponse {
 		if ($host) {
 			$remoteCollabora = $this->federationService->getRemoteCollaboraURL($host);
@@ -182,7 +183,7 @@ public function createPublicFromInitiator(
 		string $initiatorToken,
 		string $shareToken,
 		string $path = '',
-		?string $password = null
+		?string $password = null,
 	): DataResponse {
 		try {
 			$share = $this->shareManager->getShareByToken($shareToken);

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -43,7 +43,8 @@ class SettingsController extends Controller {
 		'application/vnd.ms-opentype',
 	];
 
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		private IL10N $l10n,
 		private AppConfig $appConfig,
@@ -54,7 +55,7 @@ public function __construct($appName,
 		private DemoService $demoService,
 		private FontService $fontService,
 		private LoggerInterface $logger,
-		private ?string $userId
+		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -120,7 +121,7 @@ public function setSettings(
 		?string $use_groups,
 		?string $doc_format,
 		?string $external_apps,
-		?string $canonical_webroot
+		?string $canonical_webroot,
 	): JSONResponse {
 		if ($wopi_url !== null) {
 			$this->appConfig->setAppValue('wopi_url', $wopi_url);

diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php
@@ -38,13 +38,14 @@ class TemplatesController extends Controller {
 	 * @param TemplateManager $manager
 	 * @param IPreview $preview
 	 */
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		private IL10N $l10n,
 		private TemplateManager $manager,
 		private IPreview $preview,
 		private IMimeTypeDetector $mimeTypeDetector,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
@@ -82,7 +82,7 @@ public function __construct(
 		private IEncryptionManager $encryptionManager,
 		private IGroupManager $groupManager,
 		private ILockManager $lockManager,
-		private IEventDispatcher $eventDispatcher
+		private IEventDispatcher $eventDispatcher,
 	) {
 		parent::__construct($appName, $request);
 	}

diff --git a/lib/Db/AssetMapper.php b/lib/Db/AssetMapper.php
@@ -17,7 +17,11 @@ class AssetMapper extends QBMapper {
 	/** @var int Lifetime of a token is 10 minutes */
 	public const TOKEN_TTL = 600;
 
-	public function __construct(IDBConnection $db, private ISecureRandom $random, private ITimeFactory $time) {
+	public function __construct(
+		IDBConnection $db,
+		private ISecureRandom $random,
+		private ITimeFactory $time,
+	) {
 		parent::__construct($db, 'richdocuments_assets', Asset::class);
 	}
 

diff --git a/lib/Db/DirectMapper.php b/lib/Db/DirectMapper.php
@@ -17,9 +17,11 @@ class DirectMapper extends QBMapper {
 	/** @var int Lifetime of a token is 10 minutes */
 	public const TOKEN_TTL = 600;
 
-	public function __construct(IDBConnection $db,
+	public function __construct(
+		IDBConnection $db,
 		protected ISecureRandom $random,
-		protected ITimeFactory $timeFactory) {
+		protected ITimeFactory $timeFactory,
+	) {
 		parent::__construct($db, 'richdocuments_direct', Direct::class);
 	}
 

diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
@@ -17,11 +17,13 @@
 
 /** @template-extends QBMapper<Wopi> */
 class WopiMapper extends QBMapper {
-	public function __construct(IDBConnection $db,
+	public function __construct(
+		IDBConnection $db,
 		private ISecureRandom $random,
 		private LoggerInterface $logger,
 		private ITimeFactory $timeFactory,
-		private AppConfig $appConfig) {
+		private AppConfig $appConfig,
+	) {
 		parent::__construct($db, 'richdocuments_wopi', Wopi::class);
 	}
 
@@ -89,7 +91,7 @@ public function generateInitiatorToken($uid, $remoteServer) {
 	 */
 	public function getPathForToken(
 		#[\SensitiveParameter]
-		$token
+		$token,
 	): Wopi {
 		return $this->getWopiForToken($token);
 	}
@@ -106,7 +108,7 @@ public function getPathForToken(
 	 */
 	public function getWopiForToken(
 		#[\SensitiveParameter]
-		string $token
+		string $token,
 	): Wopi {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')

diff --git a/lib/Events/BeforeFederationRedirectEvent.php b/lib/Events/BeforeFederationRedirectEvent.php
@@ -17,7 +17,11 @@ class BeforeFederationRedirectEvent extends Event {
 	 * @param string $relativePath
 	 * @param string $remote
 	 */
-	public function __construct(private $node, private $relativePath, private $remote) {
+	public function __construct(
+		private $node,
+		private $relativePath,
+		private $remote,
+	) {
 		parent::__construct();
 	}
 

diff --git a/lib/Events/DocumentOpenedEvent.php b/lib/Events/DocumentOpenedEvent.php
@@ -11,7 +11,10 @@
 use OCP\Files\Node;
 
 class DocumentOpenedEvent extends \OCP\EventDispatcher\Event {
-	public function __construct(private ?string $userId, private Node $node) {
+	public function __construct(
+		private ?string $userId,
+		private Node $node,
+	) {
 	}
 
 	public function getUserId(): ?string {

diff --git a/lib/Helper.php b/lib/Helper.php
@@ -13,7 +13,9 @@ class Helper {
 	/**
 	 * @param string|null $userId
 	 */
-	public function __construct(private $userId) {
+	public function __construct(
+		private $userId,
+	) {
 	}
 
 	/**

diff --git a/lib/Listener/BeforeFetchPreviewListener.php b/lib/Listener/BeforeFetchPreviewListener.php
@@ -24,7 +24,12 @@
 
 /** @template-implements IEventListener<Event|BeforePreviewFetchedEvent> */
 class BeforeFetchPreviewListener implements IEventListener {
-	public function __construct(private PermissionManager $permissionManager, private IUserSession $userSession, private IRequest $request, private IManager $shareManager) {
+	public function __construct(
+		private PermissionManager $permissionManager,
+		private IUserSession $userSession,
+		private IRequest $request,
+		private IManager $shareManager,
+	) {
 	}
 
 	public function handle(Event $event): void {

diff --git a/lib/Listener/BeforeGetTemplatesListener.php b/lib/Listener/BeforeGetTemplatesListener.php
@@ -15,7 +15,7 @@
 /** @template-implements IEventListener<BeforeGetTemplatesEvent|Event> */
 class BeforeGetTemplatesListener implements IEventListener {
 	public function __construct(
-		private TemplateFieldService $templateFieldService
+		private TemplateFieldService $templateFieldService,
 	) {
 	}
 
@@ -24,7 +24,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		foreach($event->getTemplates() as $template) {
+		foreach ($event->getTemplates() as $template) {
 			$templateFileId = $template->jsonSerialize()['fileid'];
 			$fields = $this->templateFieldService->extractFields($templateFileId);
 

diff --git a/lib/Listener/BeforeTemplateRenderedListener.php b/lib/Listener/BeforeTemplateRenderedListener.php
@@ -14,7 +14,9 @@
 
 /** @template-implements IEventListener<BeforeTemplateRenderedEvent|Event> */
 class BeforeTemplateRenderedListener implements IEventListener {
-	public function __construct(private CapabilitiesService $capabilitiesService) {
+	public function __construct(
+		private CapabilitiesService $capabilitiesService,
+	) {
 	}
 
 	public function handle(Event $event): void {

diff --git a/lib/Listener/LoadViewerListener.php b/lib/Listener/LoadViewerListener.php
@@ -20,7 +20,11 @@
 
 /** @template-implements IEventListener<Event|LoadViewer> */
 class LoadViewerListener implements IEventListener {
-	public function __construct(private PermissionManager $permissionManager, private InitialStateService $initialStateService, private ?string $userId) {
+	public function __construct(
+		private PermissionManager $permissionManager,
+		private InitialStateService $initialStateService,
+		private ?string $userId,
+	) {
 	}
 
 	public function handle(Event $event): void {

diff --git a/lib/Listener/ShareLinkListener.php b/lib/Listener/ShareLinkListener.php
@@ -21,7 +21,10 @@
 
 /** @template-implements IEventListener<Event|ShareLinkAccessedEvent> */
 class ShareLinkListener implements \OCP\EventDispatcher\IEventListener {
-	public function __construct(private PermissionManager $permissionManager, private InitialStateService $initialStateService) {
+	public function __construct(
+		private PermissionManager $permissionManager,
+		private InitialStateService $initialStateService,
+	) {
 	}
 
 	public function handle(Event $event): void {

diff --git a/lib/Middleware/WOPIMiddleware.php b/lib/Middleware/WOPIMiddleware.php
@@ -32,7 +32,7 @@ public function __construct(
 		private IConfig $config,
 		private IRequest $request,
 		private WopiMapper $wopiMapper,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 	}