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>

2 files changed, 8 insertions, 9 deletions

diff --git a/apps/workflowengine/lib/Helper/LogContext.php b/apps/workflowengine/lib/Helper/LogContext.php
index 231294d8c74..405d8ceb4ee 100644
--- a/apps/workflowengine/lib/Helper/LogContext.php
+++ b/apps/workflowengine/lib/Helper/LogContext.php
@@ -41,8 +41,8 @@ class LogContext {
 	public function setScopes(array $scopes): LogContext {
 		$this->details['scopes'] = [];
 		foreach ($scopes as $scope) {
-			if($scope instanceof ScopeContext) {
-				switch($scope->getScope()) {
+			if ($scope instanceof ScopeContext) {
+				switch ($scope->getScope()) {
 					case IManager::SCOPE_ADMIN:
 						$this->details['scopes'][] = ['scope' => 'admin'];
 						break;
@@ -61,7 +61,7 @@ class LogContext {
 	}
 
 	public function setOperation(?IOperation $operation): LogContext {
-		if($operation instanceof IOperation) {
+		if ($operation instanceof IOperation) {
 			$this->details['operation'] = [
 				'class' => get_class($operation),
 				'name' => $operation->getDisplayName(),
@@ -71,7 +71,7 @@ class LogContext {
 	}
 
 	public function setEntity(?IEntity $entity): LogContext {
-		if($entity instanceof IEntity) {
+		if ($entity instanceof IEntity) {
 			$this->details['entity'] = [
 				'class' => get_class($entity),
 				'name' => $entity->getName(),
diff --git a/apps/workflowengine/lib/Helper/ScopeContext.php b/apps/workflowengine/lib/Helper/ScopeContext.php
index e0251131a01..2ddea398f6b 100644
--- a/apps/workflowengine/lib/Helper/ScopeContext.php
+++ b/apps/workflowengine/lib/Helper/ScopeContext.php
@@ -41,16 +41,15 @@ class ScopeContext {
 	}
 
 	private function evaluateScope(int $scope): int {
-		if(in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true)) {
+		if (in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true)) {
 			return $scope;
 		}
 		throw new \InvalidArgumentException('Invalid scope');
 	}
 
 	private function evaluateScopeId(string $scopeId = null): string {
-		if($this->scope === IManager::SCOPE_USER
-			&& trim((string)$scopeId) === '')
-		{
+		if ($this->scope === IManager::SCOPE_USER
+			&& trim((string)$scopeId) === '') {
 			throw new \InvalidArgumentException('user scope requires a user id');
 		}
 		return trim((string)$scopeId);
@@ -71,7 +70,7 @@ class ScopeContext {
 	}
 
 	public function getHash(): string {
-		if($this->hash === null) {
+		if ($this->hash === null) {
 			$this->hash = \hash('sha256', $this->getScope() . '::' . $this->getScopeId());
 		}
 		return $this->hash;