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, 41 insertions, 27 deletions

diff --git a/tests/lib/Comments/CommentTest.php b/tests/lib/Comments/CommentTest.php
index 733597c2b4c..245ca9693ea 100644
--- a/tests/lib/Comments/CommentTest.php
+++ b/tests/lib/Comments/CommentTest.php
@@ -174,11 +174,11 @@ class CommentTest extends TestCase {
 	public function testMentions(string $message, array $expectedUids, ?string $author = null, array $expectedGuests = []): void {
 		$comment = new Comment();
 		$comment->setMessage($message);
-		if(!is_null($author)) {
+		if (!is_null($author)) {
 			$comment->setActor('user', $author);
 		}
 		$mentions = $comment->getMentions();
-		while($mention = array_shift($mentions)) {
+		while ($mention = array_shift($mentions)) {
 			if ($mention['type'] === 'user') {
 				$id = array_shift($expectedUids);
 			} elseif ($mention['type'] === 'guest') {
@@ -192,7 +192,4 @@ class CommentTest extends TestCase {
 		$this->assertEmpty($mentions);
 		$this->assertEmpty($expectedUids);
 	}
-
-
-
 }
diff --git a/tests/lib/Comments/FakeFactory.php b/tests/lib/Comments/FakeFactory.php
index ff8dfd3a259..257e7dad93b 100644
--- a/tests/lib/Comments/FakeFactory.php
+++ b/tests/lib/Comments/FakeFactory.php
@@ -8,7 +8,6 @@ use OCP\IServerContainer;
  * Class FakeFactory
  */
 class FakeFactory implements \OCP\Comments\ICommentsManagerFactory {
-
 	public function __construct(IServerContainer $serverContainer) {
 	}
 
diff --git a/tests/lib/Comments/FakeManager.php b/tests/lib/Comments/FakeManager.php
index 5b74b54de50..b165b01c3c2 100644
--- a/tests/lib/Comments/FakeManager.php
+++ b/tests/lib/Comments/FakeManager.php
@@ -10,10 +10,11 @@ use OCP\IUser;
  * Class FakeManager
  */
 class FakeManager implements ICommentsManager {
+	public function get($id) {
+	}
 
-	public function get($id) {}
-
-	public function getTree($id, $limit = 0, $offset = 0) {}
+	public function getTree($id, $limit = 0, $offset = 0) {
+	}
 
 	public function getForObject(
 		$objectType,
@@ -21,7 +22,8 @@ class FakeManager implements ICommentsManager {
 		$limit = 0,
 		$offset = 0,
 		\DateTime $notOlderThan = null
-	) {}
+	) {
+	}
 
 	public function getForObjectSince(
 		string $objectType,
@@ -29,39 +31,56 @@ class FakeManager implements ICommentsManager {
 		int $lastKnownCommentId,
 		string $sortDirection = 'asc',
 		int $limit = 30
-	): array { return []; }
+	): array {
+		return [];
+	}
 
-	public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $notOlderThan = null, $verb = '') {}
+	public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $notOlderThan = null, $verb = '') {
+	}
 
 	public function search(string $search, string $objectType, string $objectId, string $verb, int $offset, int $limit = 50): array {
 		return [];
 	}
 
-	public function create($actorType, $actorId, $objectType, $objectId) {}
+	public function create($actorType, $actorId, $objectType, $objectId) {
+	}
 
-	public function delete($id) {}
+	public function delete($id) {
+	}
 
-	public function save(IComment $comment) {}
+	public function save(IComment $comment) {
+	}
 
-	public function deleteReferencesOfActor($actorType, $actorId) {}
+	public function deleteReferencesOfActor($actorType, $actorId) {
+	}
 
-	public function deleteCommentsAtObject($objectType, $objectId) {}
+	public function deleteCommentsAtObject($objectType, $objectId) {
+	}
 
-	public function setReadMark($objectType, $objectId, \DateTime $dateTime, IUser $user) {}
+	public function setReadMark($objectType, $objectId, \DateTime $dateTime, IUser $user) {
+	}
 
-	public function getReadMark($objectType, $objectId, IUser $user) {}
+	public function getReadMark($objectType, $objectId, IUser $user) {
+	}
 
-	public function deleteReadMarksFromUser(IUser $user) {}
+	public function deleteReadMarksFromUser(IUser $user) {
+	}
 
-	public function deleteReadMarksOnObject($objectType, $objectId) {}
+	public function deleteReadMarksOnObject($objectType, $objectId) {
+	}
 
-	public function registerEventHandler(\Closure $closure) {}
+	public function registerEventHandler(\Closure $closure) {
+	}
 
-	public function registerDisplayNameResolver($type, \Closure $closure) {}
+	public function registerDisplayNameResolver($type, \Closure $closure) {
+	}
 
-	public function resolveDisplayName($type, $id) {}
+	public function resolveDisplayName($type, $id) {
+	}
 
-	public function getNumberOfUnreadCommentsForFolder($folderId, IUser $user) {}
+	public function getNumberOfUnreadCommentsForFolder($folderId, IUser $user) {
+	}
 
-	public function getActorsInTree($id) {}
+	public function getActorsInTree($id) {
+	}
 }
diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php
index 9ae49d62f33..e2bf6180709 100644
--- a/tests/lib/Comments/ManagerTest.php
+++ b/tests/lib/Comments/ManagerTest.php
@@ -863,5 +863,4 @@ class ManagerTest extends TestCase {
 		$manager->registerDisplayNameResolver('planet', $planetClosure);
 		$this->assertTrue(is_string($manager->resolveDisplayName(1337, 'neptune')));
 	}
-
 }