Format control structures, classes, methods and function

To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

26 files changed, 3 insertions, 35 deletions

diff --git a/apps/files/lib/Activity/FavoriteProvider.php b/apps/files/lib/Activity/FavoriteProvider.php
index 38d40fde047..9cf1255765b 100644
--- a/apps/files/lib/Activity/FavoriteProvider.php
+++ b/apps/files/lib/Activity/FavoriteProvider.php
@@ -32,7 +32,6 @@ use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 
 class FavoriteProvider implements IProvider {
-
 	const SUBJECT_ADDED = 'added_favorite';
 	const SUBJECT_REMOVED = 'removed_favorite';
 
@@ -97,7 +96,6 @@ class FavoriteProvider implements IProvider {
 	 * @since 11.0.0
 	 */
 	public function parseShortVersion(IEvent $event) {
-
 		if ($event->getSubject() === self::SUBJECT_ADDED) {
 			$event->setParsedSubject($this->l->t('Added to favorites'));
 			if ($this->activityManager->getRequirePNG()) {
@@ -128,7 +126,6 @@ class FavoriteProvider implements IProvider {
 	 * @since 11.0.0
 	 */
 	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-
 		if ($event->getSubject() === self::SUBJECT_ADDED) {
 			$subject = $this->l->t('You added {file} to your favorites');
 			if ($this->activityManager->getRequirePNG()) {
diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
index dd7ea19ba4a..9ee705f11c3 100644
--- a/apps/files/lib/AppInfo/Application.php
+++ b/apps/files/lib/AppInfo/Application.php
@@ -47,7 +47,6 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IContainer;
 
 class Application extends App {
-
 	public const APP_ID = 'files';
 
 	public function __construct(array $urlParams=[]) {
diff --git a/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php b/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
index f3c473fb2fc..4b4f36663ab 100644
--- a/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
+++ b/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
@@ -27,7 +27,6 @@ use OC\BackgroundJob\TimedJob;
 use OCP\DirectEditing\IManager;
 
 class CleanupDirectEditingTokens extends TimedJob {
-
 	private const INTERVAL_MINUTES = 15 * 60;
 
 	/**
diff --git a/apps/files/lib/BackgroundJob/CleanupFileLocks.php b/apps/files/lib/BackgroundJob/CleanupFileLocks.php
index 45729fd1e36..a69ee51bfb1 100644
--- a/apps/files/lib/BackgroundJob/CleanupFileLocks.php
+++ b/apps/files/lib/BackgroundJob/CleanupFileLocks.php
@@ -53,7 +53,7 @@ class CleanupFileLocks extends TimedJob {
 	 */
 	public function run($argument) {
 		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
+		if ($lockingProvider instanceof DBLockingProvider) {
 			$lockingProvider->cleanExpiredLocks();
 		}
 	}
diff --git a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
index 5c0c92b6034..b0f91b70401 100644
--- a/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
+++ b/apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
@@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
  * Delete all share entries that have no matching entries in the file cache table.
  */
 class DeleteOrphanedItems extends TimedJob {
-
 	const CHUNK_SIZE = 200;
 
 	/** @var \OCP\IDBConnection */
@@ -150,5 +149,4 @@ class DeleteOrphanedItems extends TimedJob {
 		$this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
 		return $deletedEntries;
 	}
-
 }
diff --git a/apps/files/lib/BackgroundJob/TransferOwnership.php b/apps/files/lib/BackgroundJob/TransferOwnership.php
index ec89adafa86..2498cc865ff 100644
--- a/apps/files/lib/BackgroundJob/TransferOwnership.php
+++ b/apps/files/lib/BackgroundJob/TransferOwnership.php
@@ -122,7 +122,6 @@ class TransferOwnership extends QueuedJob {
 		}
 
 		$this->mapper->delete($transfer);
-
 	}
 
 	private function failedNotication(Transfer $transfer): void {
diff --git a/apps/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php
index ad5c4e1b773..c46ad01af71 100644
--- a/apps/files/lib/Capabilities.php
+++ b/apps/files/lib/Capabilities.php
@@ -75,6 +75,4 @@ class Capabilities implements ICapability {
 			],
 		];
 	}
-
-
 }
diff --git a/apps/files/lib/Collaboration/Resources/ResourceProvider.php b/apps/files/lib/Collaboration/Resources/ResourceProvider.php
index d747253f8ff..b4a97afbb56 100644
--- a/apps/files/lib/Collaboration/Resources/ResourceProvider.php
+++ b/apps/files/lib/Collaboration/Resources/ResourceProvider.php
@@ -37,7 +37,6 @@ use OCP\IURLGenerator;
 use OCP\IUser;
 
 class ResourceProvider implements IProvider {
-
 	public const RESOURCE_TYPE = 'file';
 
 	/** @var IRootFolder */
diff --git a/apps/files/lib/Command/DeleteOrphanedFiles.php b/apps/files/lib/Command/DeleteOrphanedFiles.php
index 2a63f344a92..c5072983ef4 100644
--- a/apps/files/lib/Command/DeleteOrphanedFiles.php
+++ b/apps/files/lib/Command/DeleteOrphanedFiles.php
@@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface;
  * Delete all file entries that have no matching entries in the storage table.
  */
 class DeleteOrphanedFiles extends Command {
-
 	const CHUNK_SIZE = 200;
 
 	/**
@@ -79,5 +78,4 @@ class DeleteOrphanedFiles extends Command {
 
 		$output->writeln("$deletedEntries orphaned file cache entries deleted");
 	}
-
 }
diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php
index 024899e5f5c..c75073e428f 100644
--- a/apps/files/lib/Command/Scan.php
+++ b/apps/files/lib/Command/Scan.php
@@ -321,5 +321,4 @@ class Scan extends Base {
 		}
 		return $connection;
 	}
-
 }
diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php
index 7ada9ce8820..b1d90452c23 100644
--- a/apps/files/lib/Command/TransferOwnership.php
+++ b/apps/files/lib/Command/TransferOwnership.php
@@ -115,5 +115,4 @@ class TransferOwnership extends Command {
 
 		return 0;
 	}
-
 }
diff --git a/apps/files/lib/Controller/AjaxController.php b/apps/files/lib/Controller/AjaxController.php
index 00637cc0936..52b774915ea 100644
--- a/apps/files/lib/Controller/AjaxController.php
+++ b/apps/files/lib/Controller/AjaxController.php
@@ -33,7 +33,6 @@ use OCP\Files\NotFoundException;
 use OCP\IRequest;
 
 class AjaxController extends Controller {
-
 	public function __construct(string $appName, IRequest $request) {
 		parent::__construct($appName, $request);
 	}
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index 3819e07909d..2aa3b777225 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -339,5 +339,4 @@ class ApiController extends Controller {
 		$node = $this->userFolder->get($folderpath);
 		return $node->getType();
 	}
-
 }
diff --git a/apps/files/lib/Controller/TransferOwnershipController.php b/apps/files/lib/Controller/TransferOwnershipController.php
index 43b198fe18b..fb3f3dffd6c 100644
--- a/apps/files/lib/Controller/TransferOwnershipController.php
+++ b/apps/files/lib/Controller/TransferOwnershipController.php
@@ -193,5 +193,4 @@ class TransferOwnershipController extends OCSController {
 
 		return new DataResponse([], Http::STATUS_OK);
 	}
-
 }
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 7c5d2a08b88..73ee589fdbc 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -205,7 +205,6 @@ class ViewController extends Controller {
 		$navBarPositionPosition = 6;
 		$currentCount           = 0;
 		foreach ($favElements['folders'] as $dir) {
-
 			$link         = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
 			$sortingValue = ++$currentCount;
 			$element      = [
diff --git a/apps/files/lib/Db/TransferOwnership.php b/apps/files/lib/Db/TransferOwnership.php
index 73c39ccebd2..acde06a977c 100644
--- a/apps/files/lib/Db/TransferOwnership.php
+++ b/apps/files/lib/Db/TransferOwnership.php
@@ -57,6 +57,4 @@ class TransferOwnership extends Entity {
 		$this->addType('fileId', 'integer');
 		$this->addType('nodeName', 'string');
 	}
-
-
 }
diff --git a/apps/files/lib/Db/TransferOwnershipMapper.php b/apps/files/lib/Db/TransferOwnershipMapper.php
index 2cca83ba178..e1e373eaab9 100644
--- a/apps/files/lib/Db/TransferOwnershipMapper.php
+++ b/apps/files/lib/Db/TransferOwnershipMapper.php
@@ -46,5 +46,4 @@ class TransferOwnershipMapper extends QBMapper {
 
 		return $this->findEntity($qb);
 	}
-
 }
diff --git a/apps/files/lib/Event/LoadAdditionalScriptsEvent.php b/apps/files/lib/Event/LoadAdditionalScriptsEvent.php
index 51682be6a41..d9c80a23207 100644
--- a/apps/files/lib/Event/LoadAdditionalScriptsEvent.php
+++ b/apps/files/lib/Event/LoadAdditionalScriptsEvent.php
@@ -29,7 +29,6 @@ namespace OCA\Files\Event;
 use OCP\EventDispatcher\Event;
 
 class LoadAdditionalScriptsEvent extends Event {
-
 	private $hiddenFields = [];
 
 	public function addHiddenField(string $name, string $value): void {
diff --git a/apps/files/lib/Event/LoadSidebar.php b/apps/files/lib/Event/LoadSidebar.php
index a16eb1439ee..8f3892c60c2 100644
--- a/apps/files/lib/Event/LoadSidebar.php
+++ b/apps/files/lib/Event/LoadSidebar.php
@@ -29,5 +29,4 @@ namespace OCA\Files\Event;
 use OCP\EventDispatcher\Event;
 
 class LoadSidebar extends Event {
-
 }
diff --git a/apps/files/lib/Exception/TransferOwnershipException.php b/apps/files/lib/Exception/TransferOwnershipException.php
index dad5dc13679..2fe7287f88f 100644
--- a/apps/files/lib/Exception/TransferOwnershipException.php
+++ b/apps/files/lib/Exception/TransferOwnershipException.php
@@ -29,5 +29,4 @@ namespace OCA\Files\Exception;
 use Exception;
 
 class TransferOwnershipException extends Exception {
-
 }
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
index b3a62aee1c5..3431fb2ffc7 100644
--- a/apps/files/lib/Helper.php
+++ b/apps/files/lib/Helper.php
@@ -73,7 +73,7 @@ class Helper {
 	 * @return string icon URL
 	 */
 	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
+		if ($file['type'] === 'dir') {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
 			// TODO: move this part to the client side, using mountType
 			if ($file->isShared()) {
@@ -81,7 +81,7 @@ class Helper {
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 
@@ -234,7 +234,6 @@ class Helper {
 
 		if (!empty($tags)) {
 			foreach ($tags as $fileId => $fileTags) {
-
 				foreach ($fileList as $key => $fileData) {
 					if ($fileId !== $fileData[$fileIdentifier]) {
 						continue;
diff --git a/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php b/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
index 8dddb079eb0..298d7194cde 100644
--- a/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
+++ b/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
@@ -55,5 +55,4 @@ class LegacyLoadAdditionalScriptsAdapter implements IEventListener {
 			$event->addHiddenField($name, $value);
 		}
 	}
-
 }
diff --git a/apps/files/lib/Listener/LoadSidebarListener.php b/apps/files/lib/Listener/LoadSidebarListener.php
index cc99c102081..902b6bd387a 100644
--- a/apps/files/lib/Listener/LoadSidebarListener.php
+++ b/apps/files/lib/Listener/LoadSidebarListener.php
@@ -43,5 +43,4 @@ class LoadSidebarListener implements IEventListener {
 		// TODO: remove when all tabs migrated to the new api
 		Util::addScript('files', 'fileinfomodel');
 	}
-
 }
diff --git a/apps/files/lib/Service/DirectEditingService.php b/apps/files/lib/Service/DirectEditingService.php
index c33fbe5d883..91e6a0acbb2 100644
--- a/apps/files/lib/Service/DirectEditingService.php
+++ b/apps/files/lib/Service/DirectEditingService.php
@@ -82,5 +82,4 @@ class DirectEditingService {
 		}
 		return $capabilities;
 	}
-
 }
diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
index 3415a2fd9e7..a838eb45eab 100644
--- a/apps/files/lib/Service/OwnershipTransferService.php
+++ b/apps/files/lib/Service/OwnershipTransferService.php
@@ -317,5 +317,4 @@ class OwnershipTransferService {
 		$progress->finish();
 		$output->writeln('');
 	}
-
 }
diff --git a/apps/files/lib/Settings/PersonalSettings.php b/apps/files/lib/Settings/PersonalSettings.php
index 40f12b830ad..ff5bf164dea 100644
--- a/apps/files/lib/Settings/PersonalSettings.php
+++ b/apps/files/lib/Settings/PersonalSettings.php
@@ -31,7 +31,6 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
 
 class PersonalSettings implements ISettings {
-
 	public function getForm(): TemplateResponse {
 		return new TemplateResponse(Application::APP_ID, 'settings-personal');
 	}
@@ -43,5 +42,4 @@ class PersonalSettings implements ISettings {
 	public function getPriority(): int {
 		return 90;
 	}
-
 }