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>

Author: ChristophWurst

apps/accessibility/lib/AccessibilityProvider.php

@@ -91,5 +91,4 @@ public function getFonts() {
 			]
 		];
 	}
-
 }

apps/accessibility/lib/Controller/ConfigController.php

@@ -107,7 +107,6 @@ public function getConfig(): DataResponse {
 	 */
 	public function setConfig(string $key, $value): DataResponse {
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
 			if ($value === false || $value === '') {
 				throw new OCSBadRequestException('Invalid value: ' . $value);
 			}
@@ -142,7 +141,6 @@ public function setConfig(string $key, $value): DataResponse {
 	 */
 	public function deleteConfig(string $key): DataResponse {
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
 			$this->config->deleteUserValue($this->userId, $this->appName, $key);
 			$userValues = $this->config->getUserKeys($this->userId, $this->appName);
 
@@ -156,5 +154,4 @@ public function deleteConfig(string $key): DataResponse {
 
 		throw new OCSBadRequestException('Invalid key: ' . $key);
 	}
-
 }

apps/accessibility/lib/Migration/RepairUserConfig.php

@@ -86,5 +86,4 @@ public function run(IOutput $output) {
 		});
 		$output->finishProgress();
 	}
-
 }

apps/admin_audit/lib/Actions/Action.php

@@ -53,8 +53,8 @@ public function log(string $text,
 						array $params,
 						array $elements,
 						bool $obfuscateParameters = false) {
-		foreach($elements as $element) {
-			if(!isset($params[$element])) {
+		foreach ($elements as $element) {
+			if (!isset($params[$element])) {
 				if ($obfuscateParameters) {
 					$this->logger->critical(
 						'$params["'.$element.'"] was missing.',
@@ -74,8 +74,8 @@ public function log(string $text,
 		}
 
 		$replaceArray = [];
-		foreach($elements as $element) {
-			if($params[$element] instanceof \DateTime) {
+		foreach ($elements as $element) {
+			if ($params[$element] instanceof \DateTime) {
 				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
 			}
 			$replaceArray[] = $params[$element];

apps/admin_audit/lib/Actions/Sharing.php

@@ -43,7 +43,7 @@ class Sharing extends Action {
 	 * @param array $params
 	 */
 	public function shared(array $params) {
-		if($params['shareType'] === Share::SHARE_TYPE_LINK) {
+		if ($params['shareType'] === Share::SHARE_TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
 				$params,
@@ -55,7 +55,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_USER) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s"  (Share ID: %s)',
 				$params,
@@ -68,7 +68,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_GROUP) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s"  (Share ID: %s)',
 				$params,
@@ -81,7 +81,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_ROOM) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the room "%s" with permissions "%s" (Share ID: %s)',
 				$params,
@@ -94,7 +94,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_EMAIL) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_EMAIL) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the email recipient "%s" with permissions "%s" (Share ID: %s)',
 				$params,
@@ -107,7 +107,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_CIRCLE) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_CIRCLE) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the circle "%s" with permissions "%s" (Share ID: %s)',
 				$params,
@@ -120,7 +120,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_REMOTE) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_REMOTE) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the remote user "%s" with permissions "%s" (Share ID: %s)',
 				$params,
@@ -133,7 +133,7 @@ public function shared(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_REMOTE_GROUP) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_REMOTE_GROUP) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared to the remote group "%s" with permissions "%s" (Share ID: %s)',
 				$params,
@@ -155,7 +155,7 @@ public function shared(array $params) {
 	 * @param array $params
 	 */
 	public function unshare(array $params) {
-		if($params['shareType'] === Share::SHARE_TYPE_LINK) {
+		if ($params['shareType'] === Share::SHARE_TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
 				$params,
@@ -166,7 +166,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_USER) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
 				$params,
@@ -178,7 +178,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_GROUP) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
 				$params,
@@ -190,7 +190,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_ROOM) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the room "%s" (Share ID: %s)',
 				$params,
@@ -202,7 +202,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_EMAIL) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_EMAIL) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the email recipient "%s" (Share ID: %s)',
 				$params,
@@ -214,7 +214,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_CIRCLE) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_CIRCLE) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the circle "%s" (Share ID: %s)',
 				$params,
@@ -226,7 +226,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_REMOTE) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_REMOTE) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the remote user "%s" (Share ID: %s)',
 				$params,
@@ -238,7 +238,7 @@ public function unshare(array $params) {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_REMOTE_GROUP) {
+		} elseif ($params['shareType'] === Share::SHARE_TYPE_REMOTE_GROUP) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared from the remote group "%s" (Share ID: %s)',
 				$params,

apps/admin_audit/lib/Actions/Trashbin.php

@@ -29,7 +29,6 @@
 namespace OCA\AdminAudit\Actions;
 
 class Trashbin extends Action {
-
 	public function delete(array $params) {
 		$this->log('File "%s" deleted from trash bin.',
 			['path' => $params['path']], ['path']
@@ -41,5 +40,4 @@ public function restore(array $params) {
 			['path' => $params['filePath']], ['path']
 		);
 	}
-
 }

apps/admin_audit/lib/Actions/UserManagement.php

@@ -100,7 +100,7 @@ public function unassign(string $uid) {
 	 * @param array $params
 	 */
 	public function change(array $params) {
-		switch($params['feature']) {
+		switch ($params['feature']) {
 			case 'enabled':
 				$this->log(
 					$params['value'] === true
@@ -130,7 +130,7 @@ public function change(array $params) {
 	 * @param IUser $user
 	 */
 	public function setPassword(IUser $user) {
-		if($user->getBackendClassName() === 'Database') {
+		if ($user->getBackendClassName() === 'Database') {
 			$this->log(
 				'Password of user "%s" has been changed',
 				[

apps/admin_audit/lib/Actions/Versions.php

@@ -29,7 +29,6 @@
 namespace OCA\AdminAudit\Actions;
 
 class Versions extends Action {
-
 	public function rollback(array $params) {
 		$this->log('Version "%s" of "%s" was restored.',
 			[
@@ -46,5 +45,4 @@ public function delete(array $params) {
 			['path']
 		);
 	}
-
 }

apps/admin_audit/lib/AppInfo/Application.php

@@ -74,12 +74,11 @@ public function initLogger() {
 
 		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
 		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		if($logFile === null) {
+		if ($logFile === null) {
 			$this->logger = $c->getLogger();
 			return;
 		}
 		$this->logger = $c->getLogFactory()->getCustomLogger($logFile);
-
 	}
 
 	public function register() {
@@ -152,7 +151,6 @@ protected function authHooks() {
 	}
 
 	protected function appHooks() {
-
 		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
 		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) {
 			$appActions = new AppManagement($this->logger);
@@ -166,7 +164,6 @@ protected function appHooks() {
 			$appActions = new AppManagement($this->logger);
 			$appActions->disableApp($event->getAppID());
 		});
-
 	}
 
 	protected function consoleHooks() {

apps/admin_audit/lib/BackgroundJobs/Rotate.php

@@ -38,14 +38,14 @@ protected function run($argument) {
 		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
 		$this->filePath = $config->getAppValue('admin_audit', 'logfile', $default);
 
-		if($this->filePath === '') {
+		if ($this->filePath === '') {
 			// default log file, nothing to do
 			return;
 		}
 
 		$this->maxSize = $config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 
-		if($this->shouldRotateBySize()) {
+		if ($this->shouldRotateBySize()) {
 			$this->rotate();
 		}
 	}