Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 11:35:09 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-10 11:35:09 +0300
commit14c996d98256de958da367297c3313e0fa7ef9a8 (patch)
tree27074d5403b67cbaf59d7b7181481ebe70af5d9e /apps/provisioning_api
parentd6e17fb01777866674129a5883c03642f4bfd4a5 (diff)
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/provisioning_api')
-rw-r--r--apps/provisioning_api/lib/Controller/GroupsController.php2
-rw-r--r--apps/provisioning_api/lib/Controller/UsersController.php6
-rw-r--r--apps/provisioning_api/tests/Controller/AppConfigControllerTest.php8
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
index aa774506853..435f0410217 100644
--- a/apps/provisioning_api/lib/Controller/GroupsController.php
+++ b/apps/provisioning_api/lib/Controller/GroupsController.php
@@ -285,7 +285,7 @@ class GroupsController extends AUserData {
// Check it exists
if(!$this->groupManager->groupExists($groupId)){
throw new OCSException('', 101);
- } else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+ } elseif($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
// Cannot delete admin group
throw new OCSException('', 102);
}
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index 6ed5a1217c5..ff67a880c13 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -142,7 +142,7 @@ class UsersController extends AUserData {
$subAdminManager = $this->groupManager->getSubAdmin();
if ($this->groupManager->isAdmin($uid)){
$users = $this->userManager->search($search, $limit, $offset);
- } else if ($subAdminManager->isSubAdmin($user)) {
+ } elseif ($subAdminManager->isSubAdmin($user)) {
$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
foreach ($subAdminOfGroups as $key => $group) {
$subAdminOfGroups[$key] = $group->getGID();
@@ -176,7 +176,7 @@ class UsersController extends AUserData {
if ($this->groupManager->isAdmin($uid)){
$users = $this->userManager->search($search, $limit, $offset);
$users = array_keys($users);
- } else if ($subAdminManager->isSubAdmin($currentUser)) {
+ } elseif ($subAdminManager->isSubAdmin($currentUser)) {
$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
foreach ($subAdminOfGroups as $key => $group) {
$subAdminOfGroups[$key] = $group->getGID();
@@ -836,7 +836,7 @@ class UsersController extends AUserData {
throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
}
- } else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
+ } elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
/** @var IGroup[] $subAdminGroups */
$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
index eb5ed1900b7..a87f69a25b3 100644
--- a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
@@ -214,7 +214,7 @@ class AppConfigControllerTest extends TestCase {
->method('verifyConfigKey');
$this->config->expects($this->never())
->method('setAppValue');
- } else if ($keyThrows instanceof \Exception) {
+ } elseif ($keyThrows instanceof \Exception) {
$api->expects($this->once())
->method('verifyAppId')
->with($app);
@@ -243,7 +243,7 @@ class AppConfigControllerTest extends TestCase {
$this->assertSame($status, $result->getStatus());
if ($appThrows instanceof \Exception) {
$this->assertEquals(['data' => ['message' => $appThrows->getMessage()]], $result->getData());
- } else if ($keyThrows instanceof \Exception) {
+ } elseif ($keyThrows instanceof \Exception) {
$this->assertEquals(['data' => ['message' => $keyThrows->getMessage()]], $result->getData());
} else {
$this->assertEquals([], $result->getData());
@@ -279,7 +279,7 @@ class AppConfigControllerTest extends TestCase {
->method('verifyConfigKey');
$this->config->expects($this->never())
->method('deleteAppValue');
- } else if ($keyThrows instanceof \Exception) {
+ } elseif ($keyThrows instanceof \Exception) {
$api->expects($this->once())
->method('verifyAppId')
->with($app);
@@ -308,7 +308,7 @@ class AppConfigControllerTest extends TestCase {
$this->assertSame($status, $result->getStatus());
if ($appThrows instanceof \Exception) {
$this->assertEquals(['data' => ['message' => $appThrows->getMessage()]], $result->getData());
- } else if ($keyThrows instanceof \Exception) {
+ } elseif ($keyThrows instanceof \Exception) {
$this->assertEquals(['data' => ['message' => $keyThrows->getMessage()]], $result->getData());
} else {
$this->assertEquals([], $result->getData());