diff --git a/lib/BackgroundJob/DigestMail.php b/lib/BackgroundJob/DigestMail.php
index d53a3c4d..778fe648 100644
--- a/lib/BackgroundJob/DigestMail.php
+++ b/lib/BackgroundJob/DigestMail.php
@@ -28,7 +28,6 @@ use OCA\Activity\DigestSender;
 use OCP\AppFramework\Utility\ITimeFactory;
 
 class DigestMail extends TimedJob {
-
 	/** @var DigestSender */
 	protected $digestSender;
 	/** @var ITimeFactory */
diff --git a/lib/BackgroundJob/EmailNotification.php b/lib/BackgroundJob/EmailNotification.php
index 5ae43060..d915a30c 100644
--- a/lib/BackgroundJob/EmailNotification.php
+++ b/lib/BackgroundJob/EmailNotification.php
@@ -32,7 +32,6 @@ use OCA\Activity\MailQueueHandler;
  * @package OCA\Activity\BackgroundJob
  */
 class EmailNotification extends TimedJob {
-
 	/** @var MailQueueHandler */
 	protected $queueHandler;
 
diff --git a/lib/BackgroundJob/RemoteActivity.php b/lib/BackgroundJob/RemoteActivity.php
index 6d9852bc..6ef19bed 100644
--- a/lib/BackgroundJob/RemoteActivity.php
+++ b/lib/BackgroundJob/RemoteActivity.php
@@ -29,7 +29,6 @@ use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
 
 class RemoteActivity extends QueuedJob {
-
 	/** @var IClientService */
 	protected $clientService;
 
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index 6ff32c28..5de11d52 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -31,7 +31,6 @@ use OCP\Capabilities\ICapability;
  * @package OCA\Activity
  */
 class Capabilities implements ICapability {
-
 	/**
 	 * Return this classes capabilities
 	 *
diff --git a/lib/Command/SendEmails.php b/lib/Command/SendEmails.php
index c81e2d85..9fba603b 100644
--- a/lib/Command/SendEmails.php
+++ b/lib/Command/SendEmails.php
@@ -35,7 +35,6 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SendEmails extends Base {
-
 	/** @var MailQueueHandler */
 	protected $queueHandler;
 
diff --git a/lib/Consumer.php b/lib/Consumer.php
index abf385ff..6e69ed3b 100644
--- a/lib/Consumer.php
+++ b/lib/Consumer.php
@@ -28,7 +28,6 @@ use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 
 class Consumer implements IConsumer {
-
 	/** @var Data */
 	protected $data;
 	/** @var IManager */
diff --git a/lib/Controller/APIv1Controller.php b/lib/Controller/APIv1Controller.php
index 1cdd2579..495af0bd 100644
--- a/lib/Controller/APIv1Controller.php
+++ b/lib/Controller/APIv1Controller.php
@@ -30,7 +30,6 @@ use OCP\AppFramework\OCSController;
 use OCP\IRequest;
 
 class APIv1Controller extends OCSController {
-
 	/** @var Data */
 	protected $data;
 
diff --git a/lib/Controller/APIv2Controller.php b/lib/Controller/APIv2Controller.php
index 21110b2e..b4c54e3f 100644
--- a/lib/Controller/APIv2Controller.php
+++ b/lib/Controller/APIv2Controller.php
@@ -43,7 +43,6 @@ use OCP\IUser;
 use OCP\IUserSession;
 
 class APIv2Controller extends OCSController {
-
 	/** @var string */
 	protected $filter;
 
diff --git a/lib/Controller/ActivitiesController.php b/lib/Controller/ActivitiesController.php
index d2ef0e65..388bc048 100644
--- a/lib/Controller/ActivitiesController.php
+++ b/lib/Controller/ActivitiesController.php
@@ -32,7 +32,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class ActivitiesController extends Controller {
-
 	/** @var IConfig */
 	protected $config;
 
diff --git a/lib/Controller/RemoteActivityController.php b/lib/Controller/RemoteActivityController.php
index 220b3874..0b6ead7c 100644
--- a/lib/Controller/RemoteActivityController.php
+++ b/lib/Controller/RemoteActivityController.php
@@ -36,7 +36,6 @@ use OCP\IUser;
 use OCP\IUserManager;
 
 class RemoteActivityController extends OCSController {
-
 	/** @var IDBConnection */
 	protected $db;
 
diff --git a/lib/CurrentUser.php b/lib/CurrentUser.php
index 7e051233..8b171aa8 100644
--- a/lib/CurrentUser.php
+++ b/lib/CurrentUser.php
@@ -29,7 +29,6 @@ use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 
 class CurrentUser {
-
 	/** @var IUserSession */
 	protected $userSession;
 	/** @var IRequest */
diff --git a/lib/FilesHooksStatic.php b/lib/FilesHooksStatic.php
index c1c8bea7..77efd71d 100755
--- a/lib/FilesHooksStatic.php
+++ b/lib/FilesHooksStatic.php
@@ -31,7 +31,6 @@ use Symfony\Component\EventDispatcher\GenericEvent;
  * The class to handle the filesystem hooks
  */
 class FilesHooksStatic {
-
 	/**
 	 * @return FilesHooks
 	 */
diff --git a/lib/Filter/AllFilter.php b/lib/Filter/AllFilter.php
index d2cdaa55..6dd7c461 100644
--- a/lib/Filter/AllFilter.php
+++ b/lib/Filter/AllFilter.php
@@ -26,7 +26,6 @@ use OCP\IL10N;
 use OCP\IURLGenerator;
 
 class AllFilter implements IFilter {
-
 	/** @var IL10N */
 	protected $l;
 
diff --git a/lib/Filter/ByFilter.php b/lib/Filter/ByFilter.php
index dc8719d6..109d242a 100644
--- a/lib/Filter/ByFilter.php
+++ b/lib/Filter/ByFilter.php
@@ -26,7 +26,6 @@ use OCP\IL10N;
 use OCP\IURLGenerator;
 
 class ByFilter implements IFilter {
-
 	/** @var IL10N */
 	protected $l;
 
diff --git a/lib/Filter/SelfFilter.php b/lib/Filter/SelfFilter.php
index 2ba2f274..6038bbf5 100644
--- a/lib/Filter/SelfFilter.php
+++ b/lib/Filter/SelfFilter.php
@@ -26,7 +26,6 @@ use OCP\IL10N;
 use OCP\IURLGenerator;
 
 class SelfFilter implements IFilter {
-
 	/** @var IL10N */
 	protected $l;
 
diff --git a/lib/GroupHelperDisabled.php b/lib/GroupHelperDisabled.php
index 8a987298..b5cbd9d7 100644
--- a/lib/GroupHelperDisabled.php
+++ b/lib/GroupHelperDisabled.php
@@ -32,9 +32,9 @@ class GroupHelperDisabled extends GroupHelper {
 								IValidator $richObjectValidator,
 								ILogger $logger) {
 		parent::__construct($l,
-							$activityManager,
-							$richObjectValidator,
-							$logger);
+			$activityManager,
+			$richObjectValidator,
+			$logger);
 		$this->allowGrouping = false;
 	}
 }
diff --git a/lib/Migration/Version2006Date20170808154933.php b/lib/Migration/Version2006Date20170808154933.php
index 93d67ed9..435a0879 100644
--- a/lib/Migration/Version2006Date20170808154933.php
+++ b/lib/Migration/Version2006Date20170808154933.php
@@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
 
 class Version2006Date20170808154933 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/lib/Migration/Version2006Date20170808155040.php b/lib/Migration/Version2006Date20170808155040.php
index ee12aa9e..6b6c9d57 100644
--- a/lib/Migration/Version2006Date20170808155040.php
+++ b/lib/Migration/Version2006Date20170808155040.php
@@ -28,7 +28,6 @@ use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
 
 class Version2006Date20170808155040 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/lib/Migration/Version2006Date20170919095939.php b/lib/Migration/Version2006Date20170919095939.php
index 2b52d01c..36f26923 100644
--- a/lib/Migration/Version2006Date20170919095939.php
+++ b/lib/Migration/Version2006Date20170919095939.php
@@ -28,7 +28,6 @@ use OCP\Migration\BigIntMigration;
 use OCP\Migration\IOutput;
 
 class Version2006Date20170919095939 extends BigIntMigration {
-
 	/**
 	 * @return array Returns an array with the following structure
 	 * ['table1' => ['column1', 'column2'], ...]
diff --git a/lib/Migration/Version2008Date20181011095117.php b/lib/Migration/Version2008Date20181011095117.php
index 3f1c2d06..55304b8d 100644
--- a/lib/Migration/Version2008Date20181011095117.php
+++ b/lib/Migration/Version2008Date20181011095117.php
@@ -33,7 +33,6 @@ use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
 
 class Version2008Date20181011095117 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/lib/Migration/Version2010Date20190416112817.php b/lib/Migration/Version2010Date20190416112817.php
index bc2e62fd..c61734b4 100644
--- a/lib/Migration/Version2010Date20190416112817.php
+++ b/lib/Migration/Version2010Date20190416112817.php
@@ -13,7 +13,6 @@ use OCP\Migration\IOutput;
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version2010Date20190416112817 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
diff --git a/lib/Migration/Version2011Date20201006132544.php b/lib/Migration/Version2011Date20201006132544.php
index 02cf1900..600660e8 100644
--- a/lib/Migration/Version2011Date20201006132544.php
+++ b/lib/Migration/Version2011Date20201006132544.php
@@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
 class Version2011Date20201006132544 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 
diff --git a/lib/Migration/Version2011Date20201006132546.php b/lib/Migration/Version2011Date20201006132546.php
index 551f1f4b..364d87a9 100644
--- a/lib/Migration/Version2011Date20201006132546.php
+++ b/lib/Migration/Version2011Date20201006132546.php
@@ -31,7 +31,6 @@ use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
 class Version2011Date20201006132546 extends SimpleMigrationStep {
-
 	/** @var IDBConnection */
 	protected $connection;
 
diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php
index d0b5e229..9d75a023 100644
--- a/lib/Settings/AdminSection.php
+++ b/lib/Settings/AdminSection.php
@@ -26,7 +26,6 @@ use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection {
-
 	/** @var IL10N */
 	private $l;
 
diff --git a/lib/Settings/PersonalSection.php b/lib/Settings/PersonalSection.php
index de6f53db..b686530a 100644
--- a/lib/Settings/PersonalSection.php
+++ b/lib/Settings/PersonalSection.php
@@ -29,7 +29,6 @@ use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection {
-
 	/** @var IL10N */
 	private $l;
 
diff --git a/lib/ViewInfoCache.php b/lib/ViewInfoCache.php
index cc7f9f23..355d2088 100644
--- a/lib/ViewInfoCache.php
+++ b/lib/ViewInfoCache.php
@@ -28,7 +28,6 @@ use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 
 class ViewInfoCache {
-
 	/** @var array */
 	protected $cachePath;
 	/** @var array */
diff --git a/tests/CurrentUserTest.php b/tests/CurrentUserTest.php
index e74d4e42..7254ac59 100644
--- a/tests/CurrentUserTest.php
+++ b/tests/CurrentUserTest.php
@@ -36,7 +36,6 @@ use OCP\Share\IManager;
  * @package OCA\Activity\Tests
  */
 class CurrentUserTest extends TestCase {
-
 	/** @var IRequest|MockObject */
 	protected $request;
 
diff --git a/tests/DataTest.php b/tests/DataTest.php
index 583ae2f4..195b2b16 100644
--- a/tests/DataTest.php
+++ b/tests/DataTest.php
@@ -235,7 +235,7 @@ class DataTest extends TestCase {
 //					[$timestampWhere],
 //					[str_replace('{id}', $id, $idWhere)]
 //				)
-				;
+			;
 		} else {
 			$mock->expects($this->never())
 				->method('andWhere');
diff --git a/tests/mock/provider.php b/tests/mock/provider.php
index fb3498f4..2ddc8727 100644
--- a/tests/mock/provider.php
+++ b/tests/mock/provider.php
@@ -27,7 +27,6 @@ use OCP\Activity\IEvent;
 use OCP\Activity\IProvider;
 
 class Provider implements IProvider {
-
 	/**
 	 * @param string $language The language which should be used for translating, e.g. "en"
 	 * @param IEvent $event The current event which should be parsed
diff --git a/tests/mock/setting1.php b/tests/mock/setting1.php
index 01c2bab0..0bf7fcc1 100644
--- a/tests/mock/setting1.php
+++ b/tests/mock/setting1.php
@@ -25,7 +25,6 @@ namespace OCA\Activity\Tests\Mock;
 use OCP\Activity\ISetting;
 
 class Setting1 implements ISetting {
-
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
diff --git a/tests/mock/setting2.php b/tests/mock/setting2.php
index c220b98c..bf16f805 100644
--- a/tests/mock/setting2.php
+++ b/tests/mock/setting2.php
@@ -25,7 +25,6 @@ namespace OCA\Activity\Tests\Mock;
 use OCP\Activity\ISetting;
 
 class Setting2 implements ISetting {
-
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0