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>

16 files changed, 49 insertions, 78 deletions

diff --git a/lib/public/FullTextSearch/IFullTextSearchManager.php b/lib/public/FullTextSearch/IFullTextSearchManager.php
index e420e91f3a1..c66712dbe1f 100644
--- a/lib/public/FullTextSearch/IFullTextSearchManager.php
+++ b/lib/public/FullTextSearch/IFullTextSearchManager.php
@@ -184,6 +184,4 @@ interface IFullTextSearchManager {
 	 * @return ISearchResult[]
 	 */
 	public function search(array $request, string $userId = ''): array;
-
-
 }
diff --git a/lib/public/FullTextSearch/IFullTextSearchPlatform.php b/lib/public/FullTextSearch/IFullTextSearchPlatform.php
index 797c179082e..4fea8aba173 100644
--- a/lib/public/FullTextSearch/IFullTextSearchPlatform.php
+++ b/lib/public/FullTextSearch/IFullTextSearchPlatform.php
@@ -215,6 +215,4 @@ interface IFullTextSearchPlatform {
 	 * @return IIndexDocument
 	 */
 	public function getDocument(string $providerId, string $documentId): IIndexDocument;
-
-
 }
diff --git a/lib/public/FullTextSearch/IFullTextSearchProvider.php b/lib/public/FullTextSearch/IFullTextSearchProvider.php
index 4a37001754a..34b9bdfc512 100644
--- a/lib/public/FullTextSearch/IFullTextSearchProvider.php
+++ b/lib/public/FullTextSearch/IFullTextSearchProvider.php
@@ -315,5 +315,4 @@ interface IFullTextSearchProvider {
 	 * @since 15.0.0
 	 */
 	public function unloadProvider();
-
 }
diff --git a/lib/public/FullTextSearch/Model/IDocumentAccess.php b/lib/public/FullTextSearch/Model/IDocumentAccess.php
index 478072593aa..93fd7ae6e75 100644
--- a/lib/public/FullTextSearch/Model/IDocumentAccess.php
+++ b/lib/public/FullTextSearch/Model/IDocumentAccess.php
@@ -254,5 +254,4 @@ interface IDocumentAccess {
 	 * @return array
 	 */
 	public function getLinks(): array;
-
 }
diff --git a/lib/public/FullTextSearch/Model/IIndex.php b/lib/public/FullTextSearch/Model/IIndex.php
index 7078962d99e..fb279336c55 100644
--- a/lib/public/FullTextSearch/Model/IIndex.php
+++ b/lib/public/FullTextSearch/Model/IIndex.php
@@ -45,8 +45,6 @@ namespace OCP\FullTextSearch\Model;
  * @package OCP\FullTextSearch\Model
  */
 interface IIndex {
-
-
 	const INDEX_OK = 1;
 	const INDEX_IGNORE = 2;
 
@@ -282,6 +280,4 @@ interface IIndex {
 	 * @return int
 	 */
 	public function getLastIndex(): int;
-
-
 }
diff --git a/lib/public/FullTextSearch/Model/IIndexDocument.php b/lib/public/FullTextSearch/Model/IIndexDocument.php
index 667d2c15c7f..c7af11d7472 100644
--- a/lib/public/FullTextSearch/Model/IIndexDocument.php
+++ b/lib/public/FullTextSearch/Model/IIndexDocument.php
@@ -43,8 +43,6 @@ namespace OCP\FullTextSearch\Model;
  * @package OC\FullTextSearch\Model
  */
 interface IIndexDocument {
-
-
 	const NOT_ENCODED = 0;
 	const ENCODED_BASE64 = 1;
 
@@ -67,7 +65,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getProviderId(): string;
+	public function getProviderId(): string;
 
 
 	/**
@@ -81,7 +79,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setIndex(IIndex $index): IIndexDocument;
+	public function setIndex(IIndex $index): IIndexDocument;
 
 	/**
 	 * Get the Index.
@@ -90,7 +88,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndex
 	 */
-	 public function getIndex(): IIndex;
+	public function getIndex(): IIndex;
 
 	/**
 	 * return if Index is defined.
@@ -111,7 +109,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setModifiedTime(int $modifiedTime): IIndexDocument;
+	public function setModifiedTime(int $modifiedTime): IIndexDocument;
 
 	/**
 	 * Get the modified time of the original document.
@@ -120,7 +118,7 @@ interface IIndexDocument {
 	 *
 	 * @return int
 	 */
-	 public function getModifiedTime(): int;
+	public function getModifiedTime(): int;
 
 	/**
 	 * Check if the original document of the IIndexDocument is older than $time.
@@ -131,7 +129,7 @@ interface IIndexDocument {
 	 *
 	 * @return bool
 	 */
-	 public function isOlderThan(int $time): bool;
+	public function isOlderThan(int $time): bool;
 
 
 	/**
@@ -145,7 +143,7 @@ interface IIndexDocument {
 	 *
 	 * @return $this
 	 */
-	 public function setAccess(IDocumentAccess $access): IIndexDocument;
+	public function setAccess(IDocumentAccess $access): IIndexDocument;
 
 	/**
 	 * Get the IDocumentAccess related to the original document.
@@ -154,7 +152,7 @@ interface IIndexDocument {
 	 *
 	 * @return IDocumentAccess
 	 */
-	 public function getAccess(): IDocumentAccess;
+	public function getAccess(): IDocumentAccess;
 
 
 	/**
@@ -166,7 +164,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function addTag(string $tag): IIndexDocument;
+	public function addTag(string $tag): IIndexDocument;
 
 	/**
 	 * Set the list of tags assigned to the original document.
@@ -177,7 +175,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setTags(array $tags): IIndexDocument;
+	public function setTags(array $tags): IIndexDocument;
 
 	/**
 	 * Get the list of tags assigned to the original document.
@@ -186,7 +184,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getTags(): array;
+	public function getTags(): array;
 
 
 	/**
@@ -198,7 +196,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function addMetaTag(string $tag): IIndexDocument;
+	public function addMetaTag(string $tag): IIndexDocument;
 
 	/**
 	 * Set the list of meta tags assigned to the original document.
@@ -209,7 +207,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setMetaTags(array $tags): IIndexDocument;
+	public function setMetaTags(array $tags): IIndexDocument;
 
 	/**
 	 * Get the list of meta tags assigned to the original document.
@@ -218,7 +216,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getMetaTags(): array;
+	public function getMetaTags(): array;
 
 
 	/**
@@ -231,7 +229,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function addSubTag(string $sub, string $tag): IIndexDocument;
+	public function addSubTag(string $sub, string $tag): IIndexDocument;
 
 	/**
 	 * Set the list of sub tags assigned to the original document.
@@ -242,7 +240,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setSubTags(array $tags): IIndexDocument;
+	public function setSubTags(array $tags): IIndexDocument;
 
 	/**
 	 * Get the list of sub tags assigned to the original document.
@@ -255,7 +253,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getSubTags(bool $formatted = false): array;
+	public function getSubTags(bool $formatted = false): array;
 
 
 	/**
@@ -267,7 +265,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setSource(string $source): IIndexDocument;
+	public function setSource(string $source): IIndexDocument;
 
 	/**
 	 * Get the source of the original document.
@@ -276,7 +274,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getSource(): string;
+	public function getSource(): string;
 
 
 	/**
@@ -288,7 +286,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setTitle(string $title): IIndexDocument;
+	public function setTitle(string $title): IIndexDocument;
 
 	/**
 	 * Get the title of the original document.
@@ -297,7 +295,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getTitle(): string;
+	public function getTitle(): string;
 
 
 	/**
@@ -312,7 +310,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setContent(string $content, int $encoded = 0): IIndexDocument;
+	public function setContent(string $content, int $encoded = 0): IIndexDocument;
 
 	/**
 	 * Get the content of the original document.
@@ -321,7 +319,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getContent(): string;
+	public function getContent(): string;
 
 	/**
 	 * Returns the type of the encoding on the content.
@@ -330,7 +328,7 @@ interface IIndexDocument {
 	 *
 	 * @return int
 	 */
-	 public function isContentEncoded(): int;
+	public function isContentEncoded(): int;
 
 	/**
 	 * Return the size of the content.
@@ -339,7 +337,7 @@ interface IIndexDocument {
 	 *
 	 * @return int
 	 */
-	 public function getContentSize(): int;
+	public function getContentSize(): int;
 
 
 	/**
@@ -349,7 +347,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function initHash(): IIndexDocument;
+	public function initHash(): IIndexDocument;
 
 	/**
 	 * Set the hash of the original document.
@@ -360,7 +358,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setHash(string $hash): IIndexDocument;
+	public function setHash(string $hash): IIndexDocument;
 
 	/**
 	 * Get the hash of the original document.
@@ -369,7 +367,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getHash(): string;
+	public function getHash(): string;
 
 
 	/**
@@ -385,7 +383,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function addPart(string $part, string $content): IIndexDocument;
+	public function addPart(string $part, string $content): IIndexDocument;
 
 	/**
 	 * Set all parts and their content.
@@ -396,7 +394,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setParts(array $parts): IIndexDocument;
+	public function setParts(array $parts): IIndexDocument;
 
 	/**
 	 * Get all parts of the IIndexDocument.
@@ -405,7 +403,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getParts(): array;
+	public function getParts(): array;
 
 
 	/**
@@ -417,7 +415,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setLink(string $link): IIndexDocument;
+	public function setLink(string $link): IIndexDocument;
 
 	/**
 	 * Get the link.
@@ -426,7 +424,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getLink(): string;
+	public function getLink(): string;
 
 
 	/**
@@ -438,7 +436,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setMore(array $more): IIndexDocument;
+	public function setMore(array $more): IIndexDocument;
 
 	/**
 	 * Get more information.
@@ -447,7 +445,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getMore(): array;
+	public function getMore(): array;
 
 
 	/**
@@ -461,7 +459,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function addExcerpt(string $source, string $excerpt): IIndexDocument;
+	public function addExcerpt(string $source, string $excerpt): IIndexDocument;
 
 	/**
 	 * Set all excerpts of the content of the original document.
@@ -472,7 +470,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setExcerpts(array $excerpts): IIndexDocument;
+	public function setExcerpts(array $excerpts): IIndexDocument;
 
 	/**
 	 * Get all excerpts of the content of the original document.
@@ -481,7 +479,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getExcerpts(): array;
+	public function getExcerpts(): array;
 
 
 	/**
@@ -494,7 +492,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setScore(string $score): IIndexDocument;
+	public function setScore(string $score): IIndexDocument;
 
 	/**
 	 * Get the score.
@@ -503,7 +501,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getScore(): string;
+	public function getScore(): string;
 
 
 	/**
@@ -520,7 +518,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setInfo(string $info, string $value): IIndexDocument;
+	public function setInfo(string $info, string $value): IIndexDocument;
 
 	/**
 	 * Get an information about a document. (string)
@@ -532,7 +530,7 @@ interface IIndexDocument {
 	 *
 	 * @return string
 	 */
-	 public function getInfo(string $info, string $default = ''): string;
+	public function getInfo(string $info, string $default = ''): string;
 
 	/**
 	 * Set some information about the original document that will be available
@@ -548,7 +546,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setInfoArray(string $info, array $value): IIndexDocument;
+	public function setInfoArray(string $info, array $value): IIndexDocument;
 
 	/**
 	 * Get an information about a document. (array)
@@ -560,7 +558,7 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getInfoArray(string $info, array $default = []): array;
+	public function getInfoArray(string $info, array $default = []): array;
 
 	/**
 	 * Set some information about the original document that will be available
@@ -576,7 +574,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setInfoInt(string $info, int $value): IIndexDocument;
+	public function setInfoInt(string $info, int $value): IIndexDocument;
 
 	/**
 	 * Get an information about a document. (int)
@@ -588,7 +586,7 @@ interface IIndexDocument {
 	 *
 	 * @return int
 	 */
-	 public function getInfoInt(string $info, int $default = 0): int;
+	public function getInfoInt(string $info, int $default = 0): int;
 
 	/**
 	 * Set some information about the original document that will be available
@@ -604,7 +602,7 @@ interface IIndexDocument {
 	 *
 	 * @return IIndexDocument
 	 */
-	 public function setInfoBool(string $info, bool $value): IIndexDocument;
+	public function setInfoBool(string $info, bool $value): IIndexDocument;
 
 	/**
 	 * Get an information about a document. (bool)
@@ -616,7 +614,7 @@ interface IIndexDocument {
 	 *
 	 * @return bool
 	 */
-	 public function getInfoBool(string $info, bool $default = false): bool;
+	public function getInfoBool(string $info, bool $default = false): bool;
 
 	/**
 	 * Get all info.
@@ -625,6 +623,5 @@ interface IIndexDocument {
 	 *
 	 * @return array
 	 */
-	 public function getInfoAll(): array;
-
+	public function getInfoAll(): array;
 }
diff --git a/lib/public/FullTextSearch/Model/IIndexOptions.php b/lib/public/FullTextSearch/Model/IIndexOptions.php
index 8719289d746..336456c9ae0 100644
--- a/lib/public/FullTextSearch/Model/IIndexOptions.php
+++ b/lib/public/FullTextSearch/Model/IIndexOptions.php
@@ -76,5 +76,4 @@ interface IIndexOptions {
 	 * @return bool
 	 */
 	public function getOptionBool(string $option, bool $default): bool;
-
 }
diff --git a/lib/public/FullTextSearch/Model/IRunner.php b/lib/public/FullTextSearch/Model/IRunner.php
index d92eb789d64..230e9932c46 100644
--- a/lib/public/FullTextSearch/Model/IRunner.php
+++ b/lib/public/FullTextSearch/Model/IRunner.php
@@ -41,8 +41,6 @@ namespace OCP\FullTextSearch\Model;
  * @package OCP\FullTextSearch\Model
  */
 interface IRunner {
-
-
 	const RESULT_TYPE_SUCCESS = 1;
 	const RESULT_TYPE_WARNING = 4;
 	const RESULT_TYPE_FAIL = 9;
@@ -131,6 +129,4 @@ interface IRunner {
 	 * @param int $type
 	 */
 	public function newIndexResult(IIndex $index, string $message, string $status, int $type);
-
-
 }
diff --git a/lib/public/FullTextSearch/Model/ISearchOption.php b/lib/public/FullTextSearch/Model/ISearchOption.php
index 3f893c516d9..7d57f9eb3f9 100644
--- a/lib/public/FullTextSearch/Model/ISearchOption.php
+++ b/lib/public/FullTextSearch/Model/ISearchOption.php
@@ -162,5 +162,4 @@ interface ISearchOption {
 	 * @return string
 	 */
 	public function getPlaceholder(): string;
-
 }
diff --git a/lib/public/FullTextSearch/Model/ISearchRequest.php b/lib/public/FullTextSearch/Model/ISearchRequest.php
index d48b74288fd..c45a58c8c0c 100644
--- a/lib/public/FullTextSearch/Model/ISearchRequest.php
+++ b/lib/public/FullTextSearch/Model/ISearchRequest.php
@@ -358,5 +358,4 @@ interface ISearchRequest {
 	 * @since 17.0.0
 	 */
 	public function getSimpleQueries(): array;
-
 }
diff --git a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php
index c72d15a6930..f9ddde86a0d 100644
--- a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php
+++ b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php
@@ -39,8 +39,6 @@ namespace OCP\FullTextSearch\Model;
  * @package OCP\FullTextSearch\Model
  */
 interface ISearchRequestSimpleQuery {
-
-
 	const COMPARE_TYPE_TEXT = 1;
 	const COMPARE_TYPE_KEYWORD = 2;
 	const COMPARE_TYPE_INT_EQ = 3;
@@ -129,5 +127,4 @@ interface ISearchRequestSimpleQuery {
 	 * @since 17.0.0
 	 */
 	public function addValueBool(bool $value): ISearchRequestSimpleQuery;
-
 }
diff --git a/lib/public/FullTextSearch/Model/ISearchResult.php b/lib/public/FullTextSearch/Model/ISearchResult.php
index 1d8cb5d8037..cde996bc37c 100644
--- a/lib/public/FullTextSearch/Model/ISearchResult.php
+++ b/lib/public/FullTextSearch/Model/ISearchResult.php
@@ -187,5 +187,4 @@ interface ISearchResult {
 	 * @return ISearchResult
 	 */
 	public function setTimedOut(bool $timedOut): ISearchResult;
-
 }
diff --git a/lib/public/FullTextSearch/Model/ISearchTemplate.php b/lib/public/FullTextSearch/Model/ISearchTemplate.php
index b63bae43a0a..f1579871482 100644
--- a/lib/public/FullTextSearch/Model/ISearchTemplate.php
+++ b/lib/public/FullTextSearch/Model/ISearchTemplate.php
@@ -168,5 +168,4 @@ interface ISearchTemplate {
 	 * @return array
 	 */
 	public function getNavigationOptions(): array;
-
 }
diff --git a/lib/public/FullTextSearch/Service/IIndexService.php b/lib/public/FullTextSearch/Service/IIndexService.php
index f660909c9ca..6cce5267b2c 100644
--- a/lib/public/FullTextSearch/Service/IIndexService.php
+++ b/lib/public/FullTextSearch/Service/IIndexService.php
@@ -102,5 +102,4 @@ interface IIndexService {
 	 * @param array $indexes
 	 */
 	public function updateIndexes(array $indexes);
-
 }
diff --git a/lib/public/FullTextSearch/Service/IProviderService.php b/lib/public/FullTextSearch/Service/IProviderService.php
index 50c32649357..2666511e60d 100644
--- a/lib/public/FullTextSearch/Service/IProviderService.php
+++ b/lib/public/FullTextSearch/Service/IProviderService.php
@@ -54,6 +54,4 @@ interface IProviderService {
 	 * @since 15.0.0
 	 */
 	public function addJavascriptAPI();
-
-
 }
diff --git a/lib/public/FullTextSearch/Service/ISearchService.php b/lib/public/FullTextSearch/Service/ISearchService.php
index 89fa1a444e2..abe7e4c5f9d 100644
--- a/lib/public/FullTextSearch/Service/ISearchService.php
+++ b/lib/public/FullTextSearch/Service/ISearchService.php
@@ -78,5 +78,4 @@ interface ISearchService {
 	 * @return ISearchResult[]
 	 */
 	public function search(string $userId, ISearchRequest $searchRequest): array;
-
 }