diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-26 09:30:18 +0100 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-26 16:34:56 +0100 |
commit | b80ebc96748b45fd2e0ba9323308657c4b00b7ec (patch) | |
tree | ec20e0ffa2f86b9b54939a83a785407319f94559 /lib/private/Group | |
parent | 62403d0932be7d620c7bdadc6b4e13eb496fcd6f (diff) | |
download | nextcloud-server-b80ebc96748b45fd2e0ba9323308657c4b00b7ec.tar.gz nextcloud-server-b80ebc96748b45fd2e0ba9323308657c4b00b7ec.zip |
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/Group')
-rw-r--r-- | lib/private/Group/Backend.php | 6 | ||||
-rw-r--r-- | lib/private/Group/Group.php | 24 | ||||
-rw-r--r-- | lib/private/Group/Manager.php | 2 | ||||
-rw-r--r-- | lib/private/Group/MetaData.php | 16 |
4 files changed, 24 insertions, 24 deletions
diff --git a/lib/private/Group/Backend.php b/lib/private/Group/Backend.php index 06cc8ae846f..dca3a0ed042 100644 --- a/lib/private/Group/Backend.php +++ b/lib/private/Group/Backend.php @@ -94,7 +94,7 @@ abstract class Backend implements \OCP\GroupInterface { * if the user exists at all. */ public function getUserGroups($uid) { - return array(); + return []; } /** @@ -108,7 +108,7 @@ abstract class Backend implements \OCP\GroupInterface { */ public function getGroups($search = '', $limit = -1, $offset = 0) { - return array(); + return []; } /** @@ -129,6 +129,6 @@ abstract class Backend implements \OCP\GroupInterface { * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { - return array(); + return []; } } diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index 26e23e3b1b1..b14489fe0d9 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -51,7 +51,7 @@ class Group implements IGroup { private $gid; /** @var \OC\User\User[] */ - private $users = array(); + private $users = []; /** @var bool */ private $usersLoaded; @@ -127,7 +127,7 @@ class Group implements IGroup { return $this->users; } - $userIds = array(); + $userIds = []; foreach ($this->backends as $backend) { $diff = array_diff( $backend->usersInGroup($this->gid), @@ -177,7 +177,7 @@ class Group implements IGroup { ])); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user)); + $this->emitter->emit('\OC\Group', 'preAddUser', [$this, $user]); } foreach ($this->backends as $backend) { if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) { @@ -191,7 +191,7 @@ class Group implements IGroup { ])); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user)); + $this->emitter->emit('\OC\Group', 'postAddUser', [$this, $user]); } return; } @@ -209,7 +209,7 @@ class Group implements IGroup { 'user' => $user, ])); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user)); + $this->emitter->emit('\OC\Group', 'preRemoveUser', [$this, $user]); } foreach ($this->backends as $backend) { if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) { @@ -222,7 +222,7 @@ class Group implements IGroup { 'user' => $user, ])); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user)); + $this->emitter->emit('\OC\Group', 'postRemoveUser', [$this, $user]); } if ($this->users) { foreach ($this->users as $index => $groupUser) { @@ -244,7 +244,7 @@ class Group implements IGroup { * @return \OC\User\User[] */ public function searchUsers($search, $limit = null, $offset = null) { - $users = array(); + $users = []; foreach ($this->backends as $backend) { $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); $users += $this->getVerifiedUsers($userIds); @@ -305,7 +305,7 @@ class Group implements IGroup { * @return \OC\User\User[] */ public function searchDisplayName($search, $limit = null, $offset = null) { - $users = array(); + $users = []; foreach ($this->backends as $backend) { $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); $users = $this->getVerifiedUsers($userIds); @@ -330,7 +330,7 @@ class Group implements IGroup { $result = false; $this->dispatcher->dispatch(IGroup::class . '::preDelete', new GenericEvent($this)); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'preDelete', array($this)); + $this->emitter->emit('\OC\Group', 'preDelete', [$this]); } foreach ($this->backends as $backend) { if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) { @@ -341,7 +341,7 @@ class Group implements IGroup { if ($result) { $this->dispatcher->dispatch(IGroup::class . '::postDelete', new GenericEvent($this)); if ($this->emitter) { - $this->emitter->emit('\OC\Group', 'postDelete', array($this)); + $this->emitter->emit('\OC\Group', 'postDelete', [$this]); } } return $result; @@ -354,9 +354,9 @@ class Group implements IGroup { */ private function getVerifiedUsers($userIds) { if (!is_array($userIds)) { - return array(); + return []; } - $users = array(); + $users = []; foreach ($userIds as $userId) { $user = $this->userManager->get($userId); if (!is_null($user)) { diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index 0879138619c..f789e0d358f 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -342,7 +342,7 @@ class Manager extends PublicEmitter implements IGroupManager { */ public function getUserGroupNames(IUser $user) { return array_map(function ($group) { - return array('displayName' => $group->getDisplayName()); + return ['displayName' => $group->getDisplayName()]; }, $this->getUserGroups($user)); } diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index 2a0198bc451..a48baa15cfe 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -43,7 +43,7 @@ class MetaData { /** @var bool */ protected $isAdmin; /** @var array */ - protected $metaData = array(); + protected $metaData = []; /** @var IGroupManager */ protected $groupManager; /** @var bool */ @@ -86,12 +86,12 @@ class MetaData { return $this->metaData[$key]; } - $adminGroups = array(); - $groups = array(); + $adminGroups = []; + $groups = []; $sortGroupsIndex = 0; - $sortGroupsKeys = array(); + $sortGroupsKeys = []; $sortAdminGroupsIndex = 0; - $sortAdminGroupsKeys = array(); + $sortAdminGroupsKeys = []; foreach($this->getGroups($groupSearch) as $group) { $groupMetaData = $this->generateGroupMetaData($group, $userSearch); @@ -117,7 +117,7 @@ class MetaData { $this->sort($groups, $sortGroupsKeys); $this->sort($adminGroups, $sortAdminGroupsKeys); - $this->metaData[$key] = array($adminGroups, $groups); + $this->metaData[$key] = [$adminGroups, $groups]; return $this->metaData[$key]; } @@ -163,14 +163,14 @@ class MetaData { * @return array with the keys 'id', 'name', 'usercount' and 'disabled' */ private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) { - return array( + return [ 'id' => $group->getGID(), 'name' => $group->getDisplayName(), 'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0, 'disabled' => $group->countDisabled(), 'canAdd' => $group->canAddUser(), 'canRemove' => $group->canRemoveUser(), - ); + ]; } /** |