Bump CS Fixer rules to follow latest Nextcloud standards

.php-cs-fixer.dist.php

@@ -20,6 +20,7 @@
 	->notPath('composer')
 	->notPath('node_modules')
 	->notPath('vendor')
+	->in('apps')
 	->in(__DIR__);
 
 // Ignore additional app directories

apps/admin_audit/lib/Actions/Action.php

@@ -34,7 +34,8 @@
 
 	public function __construct(
 		private IAuditLogger $logger,
-	) {}
+	) {
+	}
 
 	/**
 	 * Log a single action with a log level of info
@@ -45,9 +46,9 @@
 	 * @param bool $obfuscateParameters
 	 */
 	public function log(string $text,
-						array $params,
-						array $elements,
-						bool $obfuscateParameters = false): void {
+		array $params,
+		array $elements,
+		bool $obfuscateParameters = false): void {
 		foreach ($elements as $element) {
 			if (!isset($params[$element])) {
 				if ($obfuscateParameters) {
@@ -59,7 +60,7 @@
 					$this->logger->critical(
 						sprintf(
 							'$params["'.$element.'"] was missing. Transferred value: %s',
 							print_r($params, true)
 						),
 						['app' => 'admin_audit']
 					);

apps/admin_audit/lib/Actions/UserManagement.php

@@ -61,7 +61,7 @@ public function create(array $params): void {
 	 */
 	public function assign(string $uid): void {
 		$this->log(
-		'UserID assigned: "%s"',
+			'UserID assigned: "%s"',
 			[ 'uid' => $uid ],
 			[ 'uid' ]
 		);

apps/admin_audit/lib/AppInfo/Application.php

@@ -101,7 +101,7 @@ public function boot(IBootContext $context): void {
 	 * Register hooks in order to log them
 	 */
 	private function registerHooks(IAuditLogger $logger,
-								   ContainerInterface $serverContainer): void {
+		ContainerInterface $serverContainer): void {
 		$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
 		$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
 		$this->authHooks($logger);
@@ -122,7 +122,7 @@ private function registerHooks(IAuditLogger $logger,
 	}
 
 	private function userManagementHooks(IAuditLogger $logger,
-										 IUserSession $userSession): void {
+		IUserSession $userSession): void {
 		$userActions = new UserManagement($logger);
 
 		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
@@ -136,7 +136,7 @@ private function userManagementHooks(IAuditLogger $logger,
 	}
 
 	private function groupHooks(IAuditLogger $logger,
-								IGroupManager $groupManager): void {
+		IGroupManager $groupManager): void {
 		$groupActions = new GroupManagement($logger);
 
 		assert($groupManager instanceof GroupManager);
@@ -167,7 +167,7 @@ private function authHooks(IAuditLogger $logger): void {
 	}
 
 	private function appHooks(IAuditLogger $logger,
-							  IEventDispatcher $eventDispatcher): void {
+		IEventDispatcher $eventDispatcher): void {
 		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
@@ -183,15 +183,15 @@ private function appHooks(IAuditLogger $logger,
 	}
 
 	private function consoleHooks(IAuditLogger $logger,
-								  IEventDispatcher $eventDispatcher): void {
+		IEventDispatcher $eventDispatcher): void {
 		$eventDispatcher->addListener(ConsoleEvent::class, function (ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
 	}
 
 	private function fileHooks(IAuditLogger $logger,
-							   IEventDispatcher $eventDispatcher): void {
+		IEventDispatcher $eventDispatcher): void {
 		$fileActions = new Files($logger);
 		$eventDispatcher->addListener(
 			BeforePreviewFetchedEvent::class,
@@ -264,7 +264,7 @@ private function trashbinHooks(IAuditLogger $logger): void {
 	}
 
 	private function securityHooks(IAuditLogger $logger,
-								   IEventDispatcher $eventDispatcher): void {
+		IEventDispatcher $eventDispatcher): void {
 		$eventDispatcher->addListener(TwoFactorProviderChallengePassed::class, function (TwoFactorProviderChallengePassed $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getUser(), $event->getProvider());

apps/admin_audit/lib/BackgroundJobs/Rotate.php

@@ -27,8 +27,8 @@
  */
 namespace OCA\AdminAudit\BackgroundJobs;
 
-use OCP\BackgroundJob\TimedJob;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 use OCP\IConfig;
 use OCP\Log\RotationTrait;
 

apps/cloud_federation_api/appinfo/routes.php

@@ -38,11 +38,11 @@
 			'verb' => 'POST',
 			'root' => '/ocm',
 		],
-//		[
-//			'name' => 'RequestHandler#inviteAccepted',
-//			'url' => '/invite-accepted',
-//			'verb' => 'POST',
-//			'root' => '/ocm',
-//		]
+		//		[
+		//			'name' => 'RequestHandler#inviteAccepted',
+		//			'url' => '/invite-accepted',
+		//			'verb' => 'POST',
+		//			'root' => '/ocm',
+		//		]
 	],
 ];

apps/cloud_federation_api/lib/ResponseDefinitions.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**

apps/comments/lib/AppInfo/Application.php

@@ -34,18 +34,18 @@
 use OCA\Comments\Listener\LoadSidebarScripts;
 use OCA\Comments\MaxAutoCompleteResultsInitialState;
 use OCA\Comments\Notification\Notifier;
-use OCA\Comments\Search\LegacyProvider;
 use OCA\Comments\Search\CommentsSearchProvider;
+use OCA\Comments\Search\LegacyProvider;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Comments\CommentsEntityEvent;
+use OCP\Comments\ICommentsManager;
 use OCP\ISearch;
 use OCP\IServerContainer;
-use OCP\Comments\ICommentsManager;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'comments';

apps/comments/lib/Controller/NotificationsController.php

@@ -25,10 +25,10 @@
 namespace OCA\Comments\Controller;
 
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\RedirectResponse;
-use OCP\AppFramework\Http;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Files\IRootFolder;

apps/comments/lib/Search/LegacyProvider.php

@@ -26,12 +26,12 @@
 namespace OCA\Comments\Search;
 
 use OCP\Comments\IComment;
+use OCP\Comments\ICommentsManager;
 use OCP\Files\Folder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IUser;
 use OCP\Search\Provider;
-use OCP\Comments\ICommentsManager;
 use function count;
 
 class LegacyProvider extends Provider {

apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -39,9 +39,9 @@ public function __construct(IDBConnection $db) {
 	}
 
 	public function findExisting(IUser $user,
-								 ?string $uid,
-								 ?string $email,
-								 ?string $cloudId): ?string {
+		?string $uid,
+		?string $email,
+		?string $cloudId): ?string {
 		$addressbooksQuery = $this->db->getQueryBuilder();
 		$cardQuery = $this->db->getQueryBuilder();
 		$propQuery = $this->db->getQueryBuilder();

apps/contactsinteraction/lib/Db/RecentContactMapper.php

@@ -74,9 +74,9 @@ public function find(string $uid, int $id): RecentContact {
 	 * @return RecentContact[]
 	 */
 	public function findMatch(IUser $user,
-							  ?string $uid,
-							  ?string $email,
-							  ?string $cloudId): array {
+		?string $uid,
+		?string $email,
+		?string $cloudId): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$or = $qb->expr()->orX();

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

@@ -38,9 +38,7 @@
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 use Sabre\VObject\Component\VCard;
-use Sabre\VObject\Reader;
 use Sabre\VObject\UUIDUtil;
-use Throwable;
 
 class ContactInteractionListener implements IEventListener {
 

apps/dashboard/lib/Controller/DashboardApiController.php

@@ -29,25 +29,24 @@
 namespace OCA\Dashboard\Controller;
 
 use OCA\Dashboard\ResponseDefinitions;
-use OCP\AppFramework\OCSController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+use OCP\Dashboard\IAPIWidget;
+use OCP\Dashboard\IAPIWidgetV2;
 use OCP\Dashboard\IButtonWidget;
 use OCP\Dashboard\IIconWidget;
-use OCP\Dashboard\IOptionWidget;
 use OCP\Dashboard\IManager;
+use OCP\Dashboard\IOptionWidget;
 use OCP\Dashboard\IReloadableWidget;
 use OCP\Dashboard\IWidget;
 use OCP\Dashboard\Model\WidgetButton;
+use OCP\Dashboard\Model\WidgetItem;
+
 use OCP\Dashboard\Model\WidgetOptions;
 use OCP\IConfig;
 use OCP\IRequest;
 
-use OCP\Dashboard\IAPIWidget;
-use OCP\Dashboard\IAPIWidgetV2;
-use OCP\Dashboard\Model\WidgetItem;
-use OCP\Dashboard\Model\WidgetItems;
-
 /**
  * @psalm-import-type DashboardWidget from ResponseDefinitions
  * @psalm-import-type DashboardWidgetItem from ResponseDefinitions

apps/dashboard/lib/ResponseDefinitions.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**

apps/dav/appinfo/v1/caldav.php

@@ -28,8 +28,8 @@
 // Backends
 use OC\KnownUser\KnownUserService;
 use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\Connector\LegacyDAVACL;
 use OCA\DAV\CalDAV\CalendarRoot;
+use OCA\DAV\Connector\LegacyDAVACL;
 use OCA\DAV\Connector\Sabre\Auth;
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use OCA\DAV\Connector\Sabre\MaintenancePlugin;

apps/dav/lib/AppInfo/Application.php

@@ -69,10 +69,6 @@
 use OCA\DAV\Events\CardUpdatedEvent;
 use OCA\DAV\Events\SubscriptionCreatedEvent;
 use OCA\DAV\Events\SubscriptionDeletedEvent;
-use OCA\DAV\Listener\OutOfOfficeListener;
-use OCP\Accounts\UserUpdatedEvent;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Federation\Events\TrustedServerRemovedEvent;
 use OCA\DAV\HookManager;
 use OCA\DAV\Listener\ActivityUpdaterListener;
 use OCA\DAV\Listener\AddressbookListener;
@@ -84,6 +80,7 @@
 use OCA\DAV\Listener\CalendarShareUpdateListener;
 use OCA\DAV\Listener\CardListener;
 use OCA\DAV\Listener\ClearPhotoCacheListener;
+use OCA\DAV\Listener\OutOfOfficeListener;
 use OCA\DAV\Listener\SubscriptionListener;
 use OCA\DAV\Listener\TrustedServerRemovedListener;
 use OCA\DAV\Listener\UserPreferenceListener;
@@ -93,6 +90,7 @@
 use OCA\DAV\SetupChecks\NeedsSystemAddressBookSync;
 use OCA\DAV\UserMigration\CalendarMigrator;
 use OCA\DAV\UserMigration\ContactsMigrator;
+use OCP\Accounts\UserUpdatedEvent;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -102,6 +100,8 @@
 use OCP\Config\BeforePreferenceDeletedEvent;
 use OCP\Config\BeforePreferenceSetEvent;
 use OCP\Contacts\IManager as IContactsManager;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Federation\Events\TrustedServerRemovedEvent;
 use OCP\Files\AppData\IAppDataFactory;
 use OCP\IUser;
 use OCP\User\Events\OutOfOfficeChangedEvent;
@@ -224,8 +224,8 @@
 	}
 
 	public function registerHooks(HookManager $hm,
-								   IEventDispatcher $dispatcher,
-								   IAppContainer $container) {
+		IEventDispatcher $dispatcher,
+		IAppContainer $container) {
 		$hm->setup();
 
 		// first time login event setup
@@ -268,24 +268,24 @@
 	}
 
 	private function setupContactsProvider(IContactsManager $contactsManager,
-										   IAppContainer $container,
-										   string $userID): void {
+		IAppContainer $container,
+		string $userID): void {
 		/** @var ContactsManager $cm */
 		$cm = $container->query(ContactsManager::class);
 		$urlGenerator = $container->getServer()->getURLGenerator();
 		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
 	}
 
 	private function setupSystemContactsProvider(IContactsManager $contactsManager,
-												 IAppContainer $container): void {
+		IAppContainer $container): void {
 		/** @var ContactsManager $cm */
 		$cm = $container->query(ContactsManager::class);
 		$urlGenerator = $container->getServer()->getURLGenerator();
 		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
 	}
 
 	public function registerCalendarManager(ICalendarManager $calendarManager,
-											 IAppContainer $container): void {
+		IAppContainer $container): void {
 		$calendarManager->register(function () use ($container, $calendarManager) {
 			$user = \OC::$server->getUserSession()->getUser();
 			if ($user !== null) {
@@ -295,14 +295,14 @@
 	}
 
 	private function setupCalendarProvider(ICalendarManager $calendarManager,
-										   IAppContainer $container,
-										   $userId) {
+		IAppContainer $container,
+		$userId) {
 		$cm = $container->query(CalendarManager::class);
 		$cm->setupCalendarProvider($calendarManager, $userId);
 	}
 
 	public function registerCalendarReminders(NotificationProviderManager $manager,
-											   LoggerInterface $logger): void {
+		LoggerInterface $logger): void {
 		try {
 			$manager->registerProvider(AudioProvider::class);
 			$manager->registerProvider(EmailProvider::class);

apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php

@@ -59,10 +59,10 @@ class BuildReminderIndexBackgroundJob extends QueuedJob {
 	 * BuildReminderIndexBackgroundJob constructor.
 	 */
 	public function __construct(IDBConnection $db,
-								ReminderService $reminderService,
-								LoggerInterface $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
+		ReminderService $reminderService,
+		LoggerInterface $logger,
+		IJobList $jobList,
+		ITimeFactory $timeFactory) {
 		parent::__construct($timeFactory);
 		$this->db = $db;
 		$this->reminderService = $reminderService;

apps/dav/lib/BackgroundJob/CalendarRetentionJob.php

@@ -34,7 +34,7 @@ class CalendarRetentionJob extends TimedJob {
 	private $service;
 
 	public function __construct(ITimeFactory $time,
-								RetentionService $service) {
+		RetentionService $service) {
 		parent::__construct($time);
 		$this->service = $service;
 

apps/dav/lib/BackgroundJob/EventReminderJob.php

@@ -40,8 +40,8 @@ class EventReminderJob extends TimedJob {
 	private $config;
 
 	public function __construct(ITimeFactory $time,
-								ReminderService $reminderService,
-								IConfig $config) {
+		ReminderService $reminderService,
+		IConfig $config) {
 		parent::__construct($time);
 		$this->reminderService = $reminderService;
 		$this->config = $config;