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>

4 files changed, 9 insertions, 14 deletions

diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php
index caad064a48b..d30cf1d980c 100644
--- a/lib/private/OCS/DiscoveryService.php
+++ b/lib/private/OCS/DiscoveryService.php
@@ -85,7 +85,7 @@ class DiscoveryService implements IDiscoveryService {
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);
-			if($response->getStatusCode() === Http::STATUS_OK) {
+			if ($response->getStatusCode() === Http::STATUS_OK) {
 				$decodedServices = json_decode($response->getBody(), true);
 				if (\is_array($decodedServices)) {
 					$discoveredServices = $this->getEndpoints($decodedServices, $service);
@@ -108,12 +108,11 @@ class DiscoveryService implements IDiscoveryService {
 	 * @return array
 	 */
 	protected function getEndpoints(array $decodedServices, string $service): array {
-
 		$discoveredServices = [];
 
-		if(isset($decodedServices['services'][$service]['endpoints'])) {
+		if (isset($decodedServices['services'][$service]['endpoints'])) {
 			foreach ($decodedServices['services'][$service]['endpoints'] as $endpoint => $url) {
-				if($this->isSafeUrl($url)) {
+				if ($this->isSafeUrl($url)) {
 					$discoveredServices[$endpoint] = $url;
 				}
 			}
@@ -132,5 +131,4 @@ class DiscoveryService implements IDiscoveryService {
 	protected function isSafeUrl(string $url): bool {
 		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
 	}
-
 }
diff --git a/lib/private/OCS/Exception.php b/lib/private/OCS/Exception.php
index 704b9160f32..63a7bdb54ea 100644
--- a/lib/private/OCS/Exception.php
+++ b/lib/private/OCS/Exception.php
@@ -36,5 +36,4 @@ class Exception extends \Exception {
 	public function getResult() {
 		return $this->result;
 	}
-
 }
diff --git a/lib/private/OCS/Provider.php b/lib/private/OCS/Provider.php
index f4322d23028..33386c0e946 100644
--- a/lib/private/OCS/Provider.php
+++ b/lib/private/OCS/Provider.php
@@ -55,7 +55,7 @@ class Provider extends \OCP\AppFramework\Controller {
 			],
 		];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -88,7 +88,7 @@ class Provider extends \OCP\AppFramework\Controller {
 			}
 		}
 
-		if($this->appManager->isEnabledForUser('activity')) {
+		if ($this->appManager->isEnabledForUser('activity')) {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -97,7 +97,7 @@ class Provider extends \OCP\AppFramework\Controller {
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [
diff --git a/lib/private/OCS/Result.php b/lib/private/OCS/Result.php
index b16d83e0410..0199783b47d 100644
--- a/lib/private/OCS/Result.php
+++ b/lib/private/OCS/Result.php
@@ -104,14 +104,13 @@ class Result {
 		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
 		$meta['statuscode'] = $this->statusCode;
 		$meta['message'] = $this->message;
-		if(isset($this->items)) {
+		if (isset($this->items)) {
 			$meta['totalitems'] = $this->items;
 		}
-		if(isset($this->perPage)) {
+		if (isset($this->perPage)) {
 			$meta['itemsperpage'] = $this->perPage;
 		}
 		return $meta;
-
 	}
 
 	/**
@@ -141,7 +140,7 @@ class Result {
 		// to be able to reliably check for security
 		// headers
 
-		if(is_null($value)) {
+		if (is_null($value)) {
 			unset($this->headers[$name]);
 		} else {
 			$this->headers[$name] = $value;
@@ -157,5 +156,4 @@ class Result {
 	public function getHeaders() {
 		return $this->headers;
 	}
-
 }