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>

1 files changed, 7 insertions, 10 deletions

diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 5f2ea465ed7..8b0cb972c59 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -191,7 +191,6 @@ class AccountManager implements IAccountManager {
 	 * @return array
 	 */
 	protected function addMissingDefaultValues(array $userData) {
-
 		foreach ($userData as $key => $value) {
 			if (!isset($userData[$key]['verified'])) {
 				$userData[$key]['verified'] = self::NOT_VERIFIED;
@@ -216,45 +215,44 @@ class AccountManager implements IAccountManager {
 		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
 
 		// keep old verification status if we don't have a new one
-		if(!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
+		if (!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
 			$newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
+		if (!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
 			$newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
+		if (!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
 			$newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
 		}
 
 		// reset verification status if a value from a previously verified data was changed
-		if($twitterVerified &&
+		if ($twitterVerified &&
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
 		) {
 			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($websiteVerified &&
+		if ($websiteVerified &&
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
 		) {
 			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($emailVerified &&
+		if ($emailVerified &&
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
 		) {
 			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
 		}
 
 		return $newData;
-
 	}
 
 	/**
@@ -346,7 +344,7 @@ class AccountManager implements IAccountManager {
 
 	private function parseAccountData(IUser $user, $data): Account {
 		$account = new Account($user);
-		foreach($data as $property => $accountData) {
+		foreach ($data as $property => $accountData) {
 			$account->setProperty($property, $accountData['value'] ?? '', $accountData['scope'] ?? self::VISIBILITY_PRIVATE, $accountData['verified'] ?? self::NOT_VERIFIED);
 		}
 		return $account;
@@ -355,5 +353,4 @@ class AccountManager implements IAccountManager {
 	public function getAccount(IUser $user): IAccount {
 		return $this->parseAccountData($user, $this->getUser($user));
 	}
-
 }