chore: Update nextcloud/coding-standard

Signed-off-by: Louis Chemineau <[email protected]>

lib/Command/SendEmails.php

@@ -23,9 +23,11 @@ class SendEmails extends Base {
 	 * @param IConfig $config
 	 * @param LoggerInterface $logger
 	 */
-	public function __construct(protected MailQueueHandler $queueHandler,
+	public function __construct(
+		protected MailQueueHandler $queueHandler,
 		protected IConfig $config,
-		protected LoggerInterface $logger) {
+		protected LoggerInterface $logger,
+	) {
 		parent::__construct();
 
 		$this->queueHandler = $queueHandler;

lib/Consumer.php

@@ -16,7 +16,8 @@ public function __construct(
 		protected Data $data,
 		protected IManager $manager,
 		protected UserSettings $userSettings,
-		protected NotificationGenerator $notificationGenerator) {
+		protected NotificationGenerator $notificationGenerator,
+	) {
 	}
 
 	/**

lib/Controller/APIv1Controller.php

@@ -24,7 +24,8 @@ class APIv1Controller extends OCSController {
 	 * @param UserSettings $userSettings
 	 * @param CurrentUser $currentUser
 	 */
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		protected Data $data,
 		protected GroupHelper $groupHelper,

lib/Controller/APIv2Controller.php

@@ -51,7 +51,8 @@ class APIv2Controller extends OCSController {
 	/** @var bool */
 	protected $loadPreviews;
 
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		protected IManager $activityManager,
 		protected Data $data,

lib/Controller/RemoteActivityController.php

@@ -21,13 +21,15 @@
 use OCP\IUserManager;
 
 class RemoteActivityController extends OCSController {
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
 		protected IDBConnection $db,
 		protected IUserManager $userManager,
 		protected IAppManager $appManager,
 		protected IRootFolder $rootFolder,
-		protected IActivityManager $activityManager) {
+		protected IActivityManager $activityManager,
+	) {
 		parent::__construct($appName, $request);
 	}
 
@@ -164,7 +166,7 @@ public function receiveActivity($token, array $to, array $actor, $type, $updated
 	/**
 	 * @param null|string $path2
 	 */
-	protected function getSubject(string $type, string $path, string|null $path2) {
+	protected function getSubject(string $type, string $path, ?string $path2) {
 		switch ($type) {
 			case 'Create':
 				return 'created_by';

lib/Controller/SettingsController.php

@@ -30,7 +30,8 @@ public function __construct(
 		protected IManager $manager,
 		protected UserSettings $userSettings,
 		protected IL10N $l10n,
-		CurrentUser $currentUser) {
+		CurrentUser $currentUser,
+	) {
 		parent::__construct($appName, $request);
 		$this->user = (string)$currentUser->getUID();
 	}
@@ -48,7 +49,7 @@ public function personal(
 		$notify_setting_batchtime = UserSettings::EMAIL_SEND_HOURLY,
 		$notify_setting_self = false,
 		$notify_setting_selfemail = false,
-		$activity_digest = false
+		$activity_digest = false,
 	) {
 		$settings = $this->manager->getSettings();
 		foreach ($settings as $setting) {

lib/CurrentUser.php

@@ -30,7 +30,8 @@ class CurrentUser {
 	public function __construct(
 		protected IUserSession $userSession,
 		protected IRequest $request,
-		protected IManager $shareManager) {
+		protected IManager $shareManager,
+	) {
 		$this->cloudId = false;
 		$this->sessionUser = false;
 	}

lib/Data.php

@@ -31,7 +31,8 @@ class Data {
 	public function __construct(
 		protected IManager $activityManager,
 		protected IDBConnection $connection,
-		protected LoggerInterface $logger) {
+		protected LoggerInterface $logger,
+	) {
 	}
 
 	/**

lib/DigestSender.php

@@ -36,7 +36,7 @@ public function __construct(
 		private Defaults $defaults,
 		private IFactory $l10nFactory,
 		private IDateTimeFormatter $dateTimeFormatter,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 	}
 

lib/Event/LoadAdditionalScriptsEvent.php

@@ -16,7 +16,9 @@ class LoadAdditionalScriptsEvent extends Event {
 	 */
 	public const EVENT_ENTITY = 'OCA\Activity::loadAdditionalScripts';
 
-	public function __construct(public string $filter) {
+	public function __construct(
+		public string $filter,
+	) {
 		parent::__construct();
 	}
 }

lib/GroupHelper.php

@@ -24,7 +24,7 @@ public function __construct(
 		protected IL10N $l,
 		protected IManager $activityManager,
 		protected IValidator $richObjectValidator,
-		protected LoggerInterface $logger
+		protected LoggerInterface $logger,
 	) {
 	}
 

lib/Settings/Personal.php

@@ -33,7 +33,7 @@ public function __construct(
 		UserSettings $userSettings,
 		IL10N $l10n,
 		CurrentUser $currentUser,
-		IInitialState $initialState
+		IInitialState $initialState,
 	) {
 		$this->config = $config;
 		$this->manager = $manager;

lib/UserSettings.php

@@ -28,7 +28,10 @@ class UserSettings {
 	 * @param IManager $manager
 	 * @param IConfig $config
 	 */
-	public function __construct(protected IManager $manager, protected IConfig $config) {
+	public function __construct(
+		protected IManager $manager,
+		protected IConfig $config,
+	) {
 	}
 
 	/**

lib/ViewInfoCache.php

@@ -18,7 +18,9 @@ class ViewInfoCache {
 	protected $cacheId;
 
 
-	public function __construct(protected IRootFolder $rootFolder) {
+	public function __construct(
+		protected IRootFolder $rootFolder,
+	) {
 	}
 
 	/**

tests/MailQueueHandlerTest.php

@@ -340,7 +340,7 @@ protected function assertRemainingMailEntries(array $users, int $maxTime, string
 			[$data,] = self::invokePrivate($this->mailQueueHandler, 'getItemsForUser', [$user, $maxTime]);
 			$this->assertNotEmpty(
 				$data,
-				'Failed asserting that the remaining user ' . $user. ' still has mails in the queue ' . $explain
+				'Failed asserting that the remaining user ' . $user . ' still has mails in the queue ' . $explain
 			);
 		}
 	}

tests/bootstrap.php

@@ -24,7 +24,7 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once __DIR__.'/../../../lib/base.php';
+require_once __DIR__ . '/../../../lib/base.php';
 
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
 \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');

vendor-bin/cs-fixer/composer.json

@@ -4,6 +4,7 @@
 	},
 	"sort-packages": true,
 	"require-dev": {
-		"nextcloud/coding-standard": "^1.2"
+		"nextcloud/coding-standard": "^1.3",
+		"friendsofphp/php-cs-fixer": "*"
 	}
 }