diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-10 14:19:56 +0200 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-10 14:19:56 +0200 |
commit | caff1023ea72bb2ea94130e18a2a6e2ccf819e5f (patch) | |
tree | 186d494c2aea5dea7255d3584ef5d595fc6e6194 /apps/cloud_federation_api | |
parent | edf8ce32cffdb920e8171207b342abbd7f1fbe73 (diff) | |
download | nextcloud-server-caff1023ea72bb2ea94130e18a2a6e2ccf819e5f.tar.gz nextcloud-server-caff1023ea72bb2ea94130e18a2a6e2ccf819e5f.zip |
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>
Diffstat (limited to 'apps/cloud_federation_api')
-rw-r--r-- | apps/cloud_federation_api/lib/AppInfo/Application.php | 1 | ||||
-rw-r--r-- | apps/cloud_federation_api/lib/Config.php | 1 | ||||
-rw-r--r-- | apps/cloud_federation_api/lib/Controller/RequestHandlerController.php | 10 |
3 files changed, 3 insertions, 9 deletions
diff --git a/apps/cloud_federation_api/lib/AppInfo/Application.php b/apps/cloud_federation_api/lib/AppInfo/Application.php index 0f808a88c04..0082217acc0 100644 --- a/apps/cloud_federation_api/lib/AppInfo/Application.php +++ b/apps/cloud_federation_api/lib/AppInfo/Application.php @@ -27,7 +27,6 @@ use OCA\CloudFederationAPI\Capabilities; use OCP\AppFramework\App; class Application extends App { - public function __construct() { parent::__construct('cloud_federation_api'); diff --git a/apps/cloud_federation_api/lib/Config.php b/apps/cloud_federation_api/lib/Config.php index 6553ae7d9b2..86f39f7f177 100644 --- a/apps/cloud_federation_api/lib/Config.php +++ b/apps/cloud_federation_api/lib/Config.php @@ -55,5 +55,4 @@ class Config { return []; } } - } diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php index 3b8b29a49cd..17d2bea323f 100644 --- a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php +++ b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php @@ -166,7 +166,7 @@ class RequestHandlerController extends Controller { } if ($shareType === 'group') { - if(!$this->groupManager->groupExists($shareWith)) { + if (!$this->groupManager->groupExists($shareWith)) { return new JSONResponse( ['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()], Http::STATUS_BAD_REQUEST @@ -208,14 +208,13 @@ class RequestHandlerController extends Controller { $user = $this->userManager->get($shareWith); $recipientDisplayName = ''; - if($user) { + if ($user) { $recipientDisplayName = $user->getDisplayName(); } return new JSONResponse( ['recipientDisplayName' => $recipientDisplayName], Http::STATUS_CREATED); - } /** @@ -267,8 +266,7 @@ class RequestHandlerController extends Controller { return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST); } catch (AuthenticationFailedException $e) { return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN); - } - catch (\Exception $e) { + } catch (\Exception $e) { return new JSONResponse( ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()], Http::STATUS_BAD_REQUEST @@ -276,7 +274,6 @@ class RequestHandlerController extends Controller { } return new JSONResponse($result,Http::STATUS_CREATED); - } /** @@ -297,5 +294,4 @@ class RequestHandlerController extends Controller { return $uid; } - } |