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>

6 files changed, 16 insertions, 18 deletions

diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
index b4d30b4bf50..5964220958c 100644
--- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
+++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
@@ -78,5 +78,4 @@ class BundleFetcherTest extends TestCase {
 
 		$this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
 	}
-
 }
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
index 3390e08881b..f0204b7bcd1 100644
--- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -38,7 +38,7 @@ use OCP\ILogger;
 use PHPUnit_Framework_MockObject_MockObject;
 use Test\TestCase;
 
-class AppFetcherTest extends TestCase  {
+class AppFetcherTest extends TestCase {
 	/** @var IAppData|PHPUnit_Framework_MockObject_MockObject */
 	protected $appData;
 	/** @var IClientService|PHPUnit_Framework_MockObject_MockObject */
@@ -1918,16 +1918,16 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
 		$dataToPut['data'] = array_values($dataToPut['data']);
 		$originalArray = json_decode(self::$responseJson, true);
 		$mappedOriginalArray = [];
-		foreach($originalArray as $key => $value) {
-			foreach($value as $releaseKey => $releaseValue) {
-				if($releaseKey === 'id') {
+		foreach ($originalArray as $key => $value) {
+			foreach ($value as $releaseKey => $releaseValue) {
+				if ($releaseKey === 'id') {
 					$mappedOriginalArray[$releaseValue] = $originalArray[$key];
 				}
 			}
 		}
-		foreach($dataToPut['data'] as $key => $appValue) {
-			foreach($appValue as $appKey => $value) {
-				if($appKey === 'certificate' || $appKey === 'description') {
+		foreach ($dataToPut['data'] as $key => $appValue) {
+			foreach ($appValue as $appKey => $value) {
+				if ($appKey === 'certificate' || $appKey === 'description') {
 					$dataToPut['data'][$key][$appKey] = $mappedOriginalArray[$appValue['id']][$appKey];
 				}
 			}
@@ -2037,16 +2037,16 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
 		$dataToPut['data'] = array_values($dataToPut['data']);
 		$originalArray = json_decode(self::$responseJson, true);
 		$mappedOriginalArray = [];
-		foreach($originalArray as $key => $value) {
-			foreach($value as $releaseKey => $releaseValue) {
-				if($releaseKey === 'id') {
+		foreach ($originalArray as $key => $value) {
+			foreach ($value as $releaseKey => $releaseValue) {
+				if ($releaseKey === 'id') {
 					$mappedOriginalArray[$releaseValue] = $originalArray[$key];
 				}
 			}
 		}
-		foreach($dataToPut['data'] as $key => $appValue) {
-			foreach($appValue as $appKey => $value) {
-				if($appKey === 'certificate' || $appKey === 'description') {
+		foreach ($dataToPut['data'] as $key => $appValue) {
+			foreach ($appValue as $appKey => $value) {
+				if ($appKey === 'certificate' || $appKey === 'description') {
 					$dataToPut['data'][$key][$appKey] = $mappedOriginalArray[$appValue['id']][$appKey];
 				}
 			}
diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/lib/App/AppStore/Version/VersionParserTest.php
index 327c8cac779..edb48dc4130 100644
--- a/tests/lib/App/AppStore/Version/VersionParserTest.php
+++ b/tests/lib/App/AppStore/Version/VersionParserTest.php
@@ -25,7 +25,7 @@ use OC\App\AppStore\Version\Version;
 use OC\App\AppStore\Version\VersionParser;
 use Test\TestCase;
 
-class VersionParserTest extends TestCase  {
+class VersionParserTest extends TestCase {
 	/** @var VersionParser */
 	private $versionParser;
 
diff --git a/tests/lib/App/CodeChecker/NodeVisitorTest.php b/tests/lib/App/CodeChecker/NodeVisitorTest.php
index 2383b56b676..cfc6951c614 100644
--- a/tests/lib/App/CodeChecker/NodeVisitorTest.php
+++ b/tests/lib/App/CodeChecker/NodeVisitorTest.php
@@ -14,7 +14,6 @@ use Test\App\CodeChecker\Mock\TestList;
 use Test\TestCase;
 
 class NodeVisitorTest extends TestCase {
-
 	public function providesFilesToCheck() {
 		return [
 			[[['OCP\AppFramework\IApi', 1006]], 'test-deprecated-use.php'],
diff --git a/tests/lib/App/CompareVersionTest.php b/tests/lib/App/CompareVersionTest.php
index af04691f276..6db31d0ee6f 100644
--- a/tests/lib/App/CompareVersionTest.php
+++ b/tests/lib/App/CompareVersionTest.php
@@ -87,5 +87,4 @@ class CompareVersionTest extends TestCase {
 
 		$this->compare->isCompatible($actualVersion, '13.0.0.9');
 	}
-
 }
diff --git a/tests/lib/App/PlatformRepositoryTest.php b/tests/lib/App/PlatformRepositoryTest.php
index 9063dffa646..6bc256c20b0 100644
--- a/tests/lib/App/PlatformRepositoryTest.php
+++ b/tests/lib/App/PlatformRepositoryTest.php
@@ -62,4 +62,5 @@ class PlatformRepositoryTest extends \Test\TestCase {
 			//			'semver metadata/3' => array('1.0.0+foo', '1.0.0.0'),
 			//			'metadata w/ alias' => array('1.0.0+foo as 2.0', '1.0.0.0'),
 		];
-	}}
+	}
+}