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>

7 files changed, 1 insertions, 17 deletions

diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index ba84d718df6..691b9fb19a4 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -158,7 +158,6 @@ class GetSharedSecretTest extends TestCase {
 		}
 
 		$getSharedSecret->execute($this->jobList);
-
 	}
 
 	public function dataTestExecute() {
diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index f35654b0895..2ef6fd4250d 100644
--- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -150,7 +150,6 @@ class RequestSharedSecretTest extends TestCase {
 		}
 
 		$requestSharedSecret->execute($this->jobList);
-
 	}
 
 	public function dataTestExecute() {
@@ -167,7 +166,6 @@ class RequestSharedSecretTest extends TestCase {
 	 * @param int $statusCode
 	 */
 	public function testRun($statusCode) {
-
 		$target = 'targetURL';
 		$source = 'sourceURL';
 		$token = 'token';
diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index c8a79748534..791928a8ccc 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -91,7 +91,6 @@ class OCSAuthAPIControllerTest extends TestCase {
 
 		$this->timeFactory->method('getTime')
 			->willReturn($this->currentTime);
-
 	}
 
 	/**
@@ -103,7 +102,6 @@ class OCSAuthAPIControllerTest extends TestCase {
 	 * @param bool $ok
 	 */
 	public function testRequestSharedSecret($token, $localToken, $isTrustedServer, $ok) {
-
 		$url = 'url';
 
 		$this->trustedServers
@@ -144,7 +142,6 @@ class OCSAuthAPIControllerTest extends TestCase {
 	 * @param bool $ok
 	 */
 	public function testGetSharedSecret($isTrustedServer, $isValidToken, $ok) {
-
 		$url = 'url';
 		$token = 'token';
 
@@ -169,7 +166,7 @@ class OCSAuthAPIControllerTest extends TestCase {
 		$ocsAuthApi->expects($this->any())
 			->method('isValidToken')->with($url, $token)->willReturn($isValidToken);
 
-		if($ok) {
+		if ($ok) {
 			$this->secureRandom->expects($this->once())->method('generate')->with(32)
 				->willReturn('secret');
 			$this->trustedServers->expects($this->once())
@@ -197,5 +194,4 @@ class OCSAuthAPIControllerTest extends TestCase {
 			[false, false, false],
 		];
 	}
-
 }
diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index 48c9b91268a..90db0b58035 100644
--- a/apps/federation/tests/Controller/SettingsControllerTest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
@@ -127,7 +127,6 @@ class SettingsControllerTest extends TestCase {
 		$this->assertTrue(
 			$this->invokePrivate($this->controller, 'checkServer', ['url'])
 		);
-
 	}
 
 	/**
@@ -153,7 +152,6 @@ class SettingsControllerTest extends TestCase {
 		$this->assertTrue(
 			$this->invokePrivate($this->controller, 'checkServer', ['url'])
 		);
-
 	}
 
 	/**
@@ -167,5 +165,4 @@ class SettingsControllerTest extends TestCase {
 			[false, false]
 		];
 	}
-
 }
diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
index 0bbf2bfb7ac..afb6b2408f9 100644
--- a/apps/federation/tests/HooksTest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -66,7 +66,6 @@ class HooksTest extends TestCase {
 		}
 
 		$this->hooks->addServerHook(['server' => 'url']);
-
 	}
 
 	public function dataTestAddServerHook() {
diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index a43ad557dae..a50f5e5851f 100644
--- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
@@ -70,7 +70,6 @@ class AddServerMiddlewareTest extends TestCase {
 	 * @param string $hint
 	 */
 	public function testAfterException($exception, $hint) {
-
 		$this->logger->expects($this->once())->method('logException');
 
 		$this->l10n->expects($this->any())->method('t')
@@ -99,5 +98,4 @@ class AddServerMiddlewareTest extends TestCase {
 			[new \Exception('message'), 'message'],
 		];
 	}
-
 }
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index 59b1c577e75..67814ee96ac 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -100,7 +100,6 @@ class TrustedServersTest extends TestCase {
 			$this->dispatcher,
 			$this->timeFactory
 		);
-
 	}
 
 	/**
@@ -267,7 +266,6 @@ class TrustedServersTest extends TestCase {
 	 * @param bool $expected
 	 */
 	public function testIsOwnCloudServer($statusCode, $isValidOwnCloudVersion, $expected) {
-
 		$server = 'server1';
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServers */
@@ -306,7 +304,6 @@ class TrustedServersTest extends TestCase {
 		$this->assertSame($expected,
 			$trustedServers->isOwnCloudServer($server)
 		);
-
 	}
 
 	public function dataTestIsOwnCloudServer() {