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>

10 files changed, 0 insertions, 14 deletions

diff --git a/apps/contactsinteraction/lib/AddressBook.php b/apps/contactsinteraction/lib/AddressBook.php
index 6e015780378..ac433c7ce73 100644
--- a/apps/contactsinteraction/lib/AddressBook.php
+++ b/apps/contactsinteraction/lib/AddressBook.php
@@ -40,7 +40,6 @@ use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
 
 class AddressBook extends ExternalAddressBook implements IACL {
-
 	public const URI = 'recent';
 
 	use ACLTrait;
@@ -174,5 +173,4 @@ class AddressBook extends ExternalAddressBook implements IACL {
 		list(, $uid) = \Sabre\Uri\split($this->principalUri);
 		return $uid;
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/AddressBookProvider.php b/apps/contactsinteraction/lib/AddressBookProvider.php
index 6d16d1da0a5..4a4d5235a33 100644
--- a/apps/contactsinteraction/lib/AddressBookProvider.php
+++ b/apps/contactsinteraction/lib/AddressBookProvider.php
@@ -77,5 +77,4 @@ class AddressBookProvider implements IAddressBookProvider {
 
 		return null;
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/AppInfo/Application.php b/apps/contactsinteraction/lib/AppInfo/Application.php
index 3a7e0111f6c..a3cb74f408b 100644
--- a/apps/contactsinteraction/lib/AppInfo/Application.php
+++ b/apps/contactsinteraction/lib/AppInfo/Application.php
@@ -31,7 +31,6 @@ use OCP\Contacts\Events\ContactInteractedWithEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 
 class Application extends App {
-
 	public const APP_ID = 'contactsinteraction';
 
 	public function __construct() {
@@ -43,5 +42,4 @@ class Application extends App {
 	private function registerListeners(IEventDispatcher $dispatcher): void {
 		$dispatcher->addServiceListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php b/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
index 0efc9d54e81..9e3ab5bf3ca 100644
--- a/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
+++ b/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
@@ -48,5 +48,4 @@ class CleanupJob extends TimedJob {
 		$time->modify('-7days');
 		$this->mapper->cleanUp($time->getTimestamp());
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Card.php b/apps/contactsinteraction/lib/Card.php
index 264f0ebe96f..56dca77b011 100644
--- a/apps/contactsinteraction/lib/Card.php
+++ b/apps/contactsinteraction/lib/Card.php
@@ -32,7 +32,6 @@ use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
 
 class Card implements ICard, IACL {
-
 	use ACLTrait;
 
 	/** @var RecentContact */
@@ -133,5 +132,4 @@ class Card implements ICard, IACL {
 	function getLastModified(): ?int {
 		return $this->contact->getLastContact();
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Db/CardSearchDao.php b/apps/contactsinteraction/lib/Db/CardSearchDao.php
index 8370203bb9e..391dca60fab 100644
--- a/apps/contactsinteraction/lib/Db/CardSearchDao.php
+++ b/apps/contactsinteraction/lib/Db/CardSearchDao.php
@@ -88,5 +88,4 @@ class CardSearchDao {
 
 		return $card;
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Db/RecentContact.php b/apps/contactsinteraction/lib/Db/RecentContact.php
index 71b58353efb..475de093419 100644
--- a/apps/contactsinteraction/lib/Db/RecentContact.php
+++ b/apps/contactsinteraction/lib/Db/RecentContact.php
@@ -69,5 +69,4 @@ class RecentContact extends Entity {
 		$this->addType('card', 'string');
 		$this->addType('lastContact', 'int');
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Db/RecentContactMapper.php b/apps/contactsinteraction/lib/Db/RecentContactMapper.php
index 7fe98e6e4ec..18a5bf6cedc 100644
--- a/apps/contactsinteraction/lib/Db/RecentContactMapper.php
+++ b/apps/contactsinteraction/lib/Db/RecentContactMapper.php
@@ -31,7 +31,6 @@ use OCP\IDBConnection;
 use OCP\IUser;
 
 class RecentContactMapper extends QBMapper {
-
 	public const TABLE_NAME = 'recent_contact';
 
 	public function __construct(IDBConnection $db) {
@@ -114,5 +113,4 @@ class RecentContactMapper extends QBMapper {
 
 		$delete->execute();
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php b/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
index 8e801f2e76e..2c1aced82e1 100644
--- a/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
+++ b/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
@@ -167,5 +167,4 @@ class ContactInteractionListener implements IEventListener {
 
 		return (new VCard($props))->serialize();
 	}
-
 }
diff --git a/apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php b/apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php
index fea763106ae..a2f01480562 100644
--- a/apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php
+++ b/apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php
@@ -89,5 +89,4 @@ class Version010000Date20200304152605 extends SimpleMigrationStep {
 
 		return $schema;
 	}
-
 }