Run cs:fix

Signed-off-by: Louis Chemineau <louis@chmn.me>

lib/AppInfo/Application.php

@@ -29,6 +29,7 @@ use OC\Files\View;
 use OC\SystemConfig;
 use OCA\Activity\Capabilities;
 use OCA\Activity\Consumer;
+use OCA\Activity\Dashboard\ActivityWidget;
 use OCA\Activity\Data;
 use OCA\Activity\FilesHooksStatic;
 use OCA\Activity\Listener\LoadSidebarScripts;
@@ -36,7 +37,6 @@ use OCA\Activity\Listener\SetUserDefaults;
 use OCA\Activity\Listener\UserDeleted;
 use OCA\Activity\MailQueueHandler;
 use OCA\Activity\NotificationGenerator;
-use OCA\Activity\Dashboard\ActivityWidget;
 use OCA\Files\Event\LoadSidebar;
 use OCP\Activity\IManager;
 use OCP\AppFramework\App;

lib/BackgroundJob/EmailNotification.php

@@ -39,7 +39,7 @@ class EmailNotification extends TimedJob {
 	protected $isCLI;
 
 	public function __construct(MailQueueHandler $mailQueueHandler,
-								bool $isCLI) {
+		bool $isCLI) {
 		// Run everytime cron is executed, so the batching doesn't delay too much
 		$this->setInterval(1);
 

lib/BackgroundJob/ExpireActivities.php

@@ -36,8 +36,8 @@ class ExpireActivities extends TimedJob {
 	protected $config;
 
 	public function __construct(ITimeFactory $time,
-								Data $data,
-								IConfig $config) {
+		Data $data,
+		IConfig $config) {
 		parent::__construct($time);
 
 		// Run once per day

lib/Command/SendEmails.php

@@ -50,8 +50,8 @@ class SendEmails extends Base {
 	 * @param ILogger $logger
 	 */
 	public function __construct(MailQueueHandler $queueHandler,
-								IConfig $config,
-								ILogger $logger) {
+		IConfig $config,
+		ILogger $logger) {
 		parent::__construct();
 
 		$this->queueHandler = $queueHandler;

lib/Controller/APIv1Controller.php

@@ -51,11 +51,11 @@ class APIv1Controller extends OCSController {
 	 * @param CurrentUser $currentUser
 	 */
 	public function __construct($appName,
-								IRequest $request,
-								Data $data,
-								GroupHelper $groupHelper,
-								UserSettings $userSettings,
-								CurrentUser $currentUser) {
+		IRequest $request,
+		Data $data,
+		GroupHelper $groupHelper,
+		UserSettings $userSettings,
+		CurrentUser $currentUser) {
 		parent::__construct($appName, $request);
 
 		$this->data = $data;

lib/Controller/APIv2Controller.php

@@ -95,16 +95,16 @@ class APIv2Controller extends OCSController {
 	protected $infoCache;
 
 	public function __construct($appName,
-								IRequest $request,
-								IManager $activityManager,
-								Data $data,
-								GroupHelper $helper,
-								UserSettings $settings,
-								IURLGenerator $urlGenerator,
-								IUserSession $userSession,
-								IPreview $preview,
-								IMimeTypeDetector $mimeTypeDetector,
-								ViewInfoCache $infoCache) {
+		IRequest $request,
+		IManager $activityManager,
+		Data $data,
+		GroupHelper $helper,
+		UserSettings $settings,
+		IURLGenerator $urlGenerator,
+		IUserSession $userSession,
+		IPreview $preview,
+		IMimeTypeDetector $mimeTypeDetector,
+		ViewInfoCache $infoCache) {
 		parent::__construct($appName, $request);
 		$this->activityManager = $activityManager;
 		$this->data = $data;

lib/Controller/ActivitiesController.php

@@ -58,12 +58,12 @@ class ActivitiesController extends Controller {
 	 * @param IL10N $l10n
 	 */
 	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								Data $data,
-								Navigation $navigation,
-								EventDispatcherInterface $eventDispatcher,
-								IL10N $l10n) {
+		IRequest $request,
+		IConfig $config,
+		Data $data,
+		Navigation $navigation,
+		EventDispatcherInterface $eventDispatcher,
+		IL10N $l10n) {
 		parent::__construct($appName, $request);
 		$this->data = $data;
 		$this->config = $config;

lib/Controller/FeedController.php

@@ -75,14 +75,14 @@ class FeedController extends Controller {
 	 * @param IConfig $config
 	 */
 	public function __construct($appName,
-								IRequest $request,
-								Data $data,
-								GroupHelper $helper,
-								UserSettings $settings,
-								IURLGenerator $urlGenerator,
-								IManager $activityManager,
-								IFactory $l10nFactory,
-								IConfig $config) {
+		IRequest $request,
+		Data $data,
+		GroupHelper $helper,
+		UserSettings $settings,
+		IURLGenerator $urlGenerator,
+		IManager $activityManager,
+		IFactory $l10nFactory,
+		IConfig $config) {
 		parent::__construct($appName, $request);
 		$this->data = $data;
 		$this->helper = $helper;

lib/Controller/RemoteActivityController.php

@@ -22,6 +22,7 @@
 namespace OCA\Activity\Controller;
 
 use OCA\Activity\Extension\Files;
+use OCP\Activity\IManager as IActivityManager;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -31,7 +32,6 @@ use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IDBConnection;
 use OCP\IRequest;
-use OCP\Activity\IManager as IActivityManager;
 use OCP\IUser;
 use OCP\IUserManager;
 
@@ -52,12 +52,12 @@ class RemoteActivityController extends OCSController {
 	protected $activityManager;
 
 	public function __construct($appName,
-								IRequest $request,
-								IDBConnection $db,
-								IUserManager $userManager,
-								IAppManager $appManager,
-								IRootFolder $rootFolder,
-								IActivityManager $activityManager) {
+		IRequest $request,
+		IDBConnection $db,
+		IUserManager $userManager,
+		IAppManager $appManager,
+		IRootFolder $rootFolder,
+		IActivityManager $activityManager) {
 		parent::__construct($appName, $request);
 		$this->db = $db;
 		$this->userManager = $userManager;

lib/Controller/SettingsController.php

@@ -70,14 +70,14 @@ class SettingsController extends Controller {
 	 * @param CurrentUser $currentUser
 	 */
 	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								ISecureRandom $random,
-								IURLGenerator $urlGenerator,
-								IManager $manager,
-								UserSettings $userSettings,
-								IL10N $l10n,
-								CurrentUser $currentUser) {
+		IRequest $request,
+		IConfig $config,
+		ISecureRandom $random,
+		IURLGenerator $urlGenerator,
+		IManager $manager,
+		UserSettings $userSettings,
+		IL10N $l10n,
+		CurrentUser $currentUser) {
 		parent::__construct($appName, $request);
 		$this->config = $config;
 		$this->random = $random;
@@ -98,10 +98,10 @@ class SettingsController extends Controller {
 	 * @return DataResponse
 	 */
 	public function personal(
-			$notify_setting_batchtime = UserSettings::EMAIL_SEND_HOURLY,
-			$notify_setting_self = false,
-			$notify_setting_selfemail = false,
-			$activity_digest = false
+		$notify_setting_batchtime = UserSettings::EMAIL_SEND_HOURLY,
+		$notify_setting_self = false,
+		$notify_setting_selfemail = false,
+		$activity_digest = false
 	) {
 		$settings = $this->manager->getSettings();
 		foreach ($settings as $setting) {
@@ -164,9 +164,9 @@ class SettingsController extends Controller {
 	 * @return DataResponse
 	 */
 	public function admin(
-			$notify_setting_batchtime = UserSettings::EMAIL_SEND_HOURLY,
-			$notify_setting_self = false,
-			$notify_setting_selfemail = false) {
+		$notify_setting_batchtime = UserSettings::EMAIL_SEND_HOURLY,
+		$notify_setting_self = false,
+		$notify_setting_selfemail = false) {
 		$settings = $this->manager->getSettings();
 		foreach ($settings as $setting) {
 			$this->config->setAppValue(

lib/CurrentUser.php

@@ -24,9 +24,9 @@ namespace OCA\Activity;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
-use OCP\Share\IShare;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 
 class CurrentUser {
 	/** @var IUserSession */

lib/Dashboard/ActivityWidget.php

@@ -48,11 +48,11 @@ class ActivityWidget implements IAPIWidget, IButtonWidget, IIconWidget {
 	private IURLGenerator $urlGenerator;
 
 	public function __construct(IL10N $l10n,
-								Data $data,
-								GroupHelper $helper,
-								UserSettings $settings,
-								IURLGenerator $urlGenerator,
-								IDateTimeFormatter $dateTimeFormatter) {
+		Data $data,
+		GroupHelper $helper,
+		UserSettings $settings,
+		IURLGenerator $urlGenerator,
+		IDateTimeFormatter $dateTimeFormatter) {
 		$this->data = $data;
 		$this->l10n = $l10n;
 		$this->helper = $helper;

lib/GroupHelper.php

@@ -51,9 +51,9 @@ class GroupHelper {
 	protected $logger;
 
 	public function __construct(IL10N $l,
-								IManager $activityManager,
-								IValidator $richObjectValidator,
-								ILogger $logger) {
+		IManager $activityManager,
+		IValidator $richObjectValidator,
+		ILogger $logger) {
 		$this->allowGrouping = true;
 
 		$this->l = $l;

lib/GroupHelperDisabled.php

@@ -28,9 +28,9 @@ use OCP\RichObjectStrings\IValidator;
 
 class GroupHelperDisabled extends GroupHelper {
 	public function __construct(IL10N $l,
-								IManager $activityManager,
-								IValidator $richObjectValidator,
-								ILogger $logger) {
+		IManager $activityManager,
+		IValidator $richObjectValidator,
+		ILogger $logger) {
 		parent::__construct($l,
 			$activityManager,
 			$richObjectValidator,

lib/MailQueueHandler.php

@@ -95,15 +95,15 @@ class MailQueueHandler {
 	protected $logger;
 
 	public function __construct(IDateTimeFormatter $dateFormatter,
-								IDBConnection $connection,
-								IMailer $mailer,
-								IURLGenerator $urlGenerator,
-								IUserManager $userManager,
-								IFactory $lFactory,
-								IManager $activityManager,
-								IValidator $richObjectValidator,
-								IConfig $config,
-								ILogger $logger) {
+		IDBConnection $connection,
+		IMailer $mailer,
+		IURLGenerator $urlGenerator,
+		IUserManager $userManager,
+		IFactory $lFactory,
+		IManager $activityManager,
+		IValidator $richObjectValidator,
+		IConfig $config,
+		ILogger $logger) {
 		$this->dateFormatter = $dateFormatter;
 		$this->connection = $connection;
 		$this->mailer = $mailer;

lib/Migration/Version2006Date20170808154933.php

@@ -25,8 +25,8 @@ namespace OCA\Activity\Migration;
 
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version2006Date20170808154933 extends SimpleMigrationStep {
 	/**

lib/Migration/Version2006Date20170808155040.php

@@ -24,8 +24,8 @@
 namespace OCA\Activity\Migration;
 
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version2006Date20170808155040 extends SimpleMigrationStep {
 	/**

lib/Migration/Version2007Date20181107114613.php

@@ -28,8 +28,8 @@ namespace OCA\Activity\Migration;
 use Closure;
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version2007Date20181107114613 extends SimpleMigrationStep {
 	/**

lib/Migration/Version2008Date20181011095117.php

@@ -29,8 +29,8 @@ use Closure;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version2008Date20181011095117 extends SimpleMigrationStep {
 	/**

lib/Migration/Version2010Date20190416112817.php

@@ -6,8 +6,8 @@ namespace OCA\Activity\Migration;
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 /**
  * Auto-generated migration step: Please modify to your needs!

lib/Navigation.php

@@ -61,10 +61,10 @@ class Navigation {
 	 * @param CurrentUser $currentUser
 	 */
 	public function __construct(IL10N $l,
-								IManager $manager,
-								IURLGenerator $URLGenerator,
-								IConfig $config,
-								CurrentUser $currentUser) {
+		IManager $manager,
+		IURLGenerator $URLGenerator,
+		IConfig $config,
+		CurrentUser $currentUser) {
 		$this->l = $l;
 		$this->activityManager = $manager;
 		$this->URLGenerator = $URLGenerator;

lib/NotificationGenerator.php

@@ -25,8 +25,8 @@ namespace OCA\Activity;
 
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager as ActivityManager;
-use OCP\Notification\IManager as NotificationManager;
 use OCP\IL10N;
+use OCP\Notification\IManager as NotificationManager;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
 

tests/BackgroundJob/EmailNotificationTest.php

@@ -28,8 +28,8 @@ use OC\BackgroundJob\JobList;
 use OCA\Activity\BackgroundJob\EmailNotification;
 use OCA\Activity\MailQueueHandler;
 use OCA\Activity\Tests\TestCase;
-use OCP\ILogger;
 use OCP\BackgroundJob\IJobList;
+use OCP\ILogger;
 
 /**
  * Class EmailNotificationTest

tests/BackgroundJob/ExpireActivitiesTest.php

@@ -29,8 +29,8 @@ use OCA\Activity\BackgroundJob\ExpireActivities;
 use OCA\Activity\Data;
 use OCA\Activity\Tests\TestCase;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\IConfig;
 use OCP\BackgroundJob\IJobList;
+use OCP\IConfig;
 
 /**
  * Class ExpireActivitiesTest

tests/ConsumerTest.php

@@ -25,13 +25,13 @@ declare(strict_types=1);
 namespace OCA\Activity\Tests;
 
 use OCA\Activity\Consumer;
-use OCA\Activity\NotificationGenerator;
-use OCP\Activity\IManager;
-use PHPUnit\Framework\MockObject\MockObject;
 use OCA\Activity\Data;
+use OCA\Activity\NotificationGenerator;
 use OCA\Activity\UserSettings;
+use OCP\Activity\IManager;
 use OCP\IL10N;
 use OCP\L10N\IFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class ConsumerTest

tests/Controller/APIv2ControllerTest.php

@@ -25,23 +25,23 @@ declare(strict_types=1);
 namespace OCA\Activity\Tests\Controller;
 
 use OCA\Activity\Controller\APIv2Controller;
+use OCA\Activity\Data;
 use OCA\Activity\Exception\InvalidFilterException;
+use OCA\Activity\GroupHelper;
 use OCA\Activity\Tests\TestCase;
+use OCA\Activity\UserSettings;
+use OCA\Activity\ViewInfoCache;
 use OCP\Activity\IFilter;
 use OCP\Activity\IManager;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\IL10N;
-use OCP\IUser;
-use OCP\IRequest;
-use OCA\Activity\ViewInfoCache;
 use OCP\Files\IMimeTypeDetector;
-use OCP\IUserSession;
-use OCP\IURLGenerator;
+use OCP\IL10N;
 use OCP\IPreview;
-use OCA\Activity\UserSettings;
-use OCA\Activity\GroupHelper;
-use OCA\Activity\Data;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserSession;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**

tests/Controller/ActivitiesControllerTest.php

@@ -23,17 +23,17 @@
 namespace OCA\Activity\Tests\Controller;
 
 use OCA\Activity\Controller\ActivitiesController;
+use OCA\Activity\Data;
+use OCA\Activity\Navigation;
 use OCA\Activity\Tests\TestCase;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
+use OCP\IRequest;
 use OCP\Template;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use OCP\IRequest;
-use OCA\Activity\Data;
-use OCP\IConfig;
-use OCA\Activity\Navigation;
-use OCP\AppFramework\Http\TemplateResponse;
 
 /**
  * Class ActivitiesTest

tests/Controller/FeedControllerTest.php

@@ -25,18 +25,18 @@ declare(strict_types=1);
 namespace OCA\Activity\Tests\Controller;
 
 use OCA\Activity\Controller\FeedController;
-use OCA\Activity\Tests\TestCase;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\Util;
-use OCP\IURLGenerator;
-use OCP\Activity\IManager;
-use OCP\IUserSession;
-use OCP\IRequest;
-use OCP\IConfig;
-use OCA\Activity\UserSettings;
-use OCA\Activity\GroupHelper;
 use OCA\Activity\Data;
+use OCA\Activity\GroupHelper;
+use OCA\Activity\Tests\TestCase;
+use OCA\Activity\UserSettings;
+use OCP\Activity\IManager;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Util;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class FeedControllerTest extends TestCase {

tests/CurrentUserTest.php

@@ -24,11 +24,11 @@ namespace OCA\Activity\Tests;
 use OCA\Activity\CurrentUser;
 use OCP\IRequest;
 use OCP\IUser;
+use OCP\IUserSession;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IManager;
 use OCP\Share\IShare;
 use PHPUnit\Framework\MockObject\MockObject;
-use OCP\IUserSession;
-use OCP\Share\IManager;
 
 /* We have to use this to add a property to the mocked request and avoid warnings about dynamic properties on PHP>=8.2 */
 abstract class RequestMock implements IRequest {

tests/DataDeleteActivitiesTest.php

@@ -27,12 +27,12 @@ namespace OCA\Activity\Tests;
 use OCA\Activity\BackgroundJob\ExpireActivities;
 use OCA\Activity\Data;
 use OCP\Activity\IExtension;
+use OCP\Activity\IManager;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
 use OCP\DB\IPreparedStatement;
 use OCP\IConfig;
 use OCP\IUserSession;
-use OCP\Activity\IManager;
-use OCP\BackgroundJob\IJobList;
 
 /**
  * Class DataDeleteActivitiesTest

tests/FilesHooksTest.php

@@ -25,27 +25,27 @@ declare(strict_types=1);
 namespace OCA\Activity;
 
 use OC\Files\Config\CachedMountFileInfo;
+use OC\Files\View;
 use OC\TagManager;
 use OC\Tags;
 use OCA\Activity\Extension\Files;
 use OCA\Activity\Extension\Files_Sharing;
 use OCA\Activity\Tests\TestCase;
+use OCA\Files_Sharing\SharedStorage;
+use OCP\Activity\IEvent;
+use OCP\Activity\IManager;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\IRootFolder;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
 use OCP\IConfig;
+use OCP\IGroup;
+use OCP\IGroupManager;
 use OCP\ILogger;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Share\IShare;
 use OCP\Share\IShareHelper;
-use OCP\Activity\IManager;
-use OCP\IGroupManager;
-use OC\Files\View;
-use OCP\IURLGenerator;
-use OCP\IGroup;
-use OCA\Files_Sharing\SharedStorage;
-use OCP\Files\Mount\IMountPoint;
-use OCP\Activity\IEvent;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**

tests/MailQueueHandlerTest.php

@@ -26,20 +26,20 @@ declare(strict_types=1);
 
 namespace OCA\Activity\Tests;
 
+use OC\Mail\Message;
 use OCA\Activity\MailQueueHandler;
+use OCP\Activity\IEvent;
+use OCP\Activity\IManager;
 use OCP\IConfig;
+use OCP\IDateTimeFormatter;
 use OCP\IL10N;
 use OCP\ILogger;
-use OCP\L10N\IFactory;
-use OCP\Activity\IEvent;
+use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserManager;
-use OCP\Activity\IManager;
+use OCP\L10N\IFactory;
 use OCP\Mail\IEMailTemplate;
 use OCP\Mail\IMailer;
-use OC\Mail\Message;
-use OCP\IURLGenerator;
-use OCP\IDateTimeFormatter;
-use OCP\IUser;
 use OCP\RichObjectStrings\IValidator;
 use PHPUnit\Framework\MockObject\MockObject;