diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-12-01 11:41:54 +0100 |
|---|---|---|
| committer | Côme Chilliet (Rebase PR Action) <come-nc@users.noreply.github.com> | 2022-12-19 09:10:41 +0000 |
| commit | 3cce9aa547d44cdb9ead142bb792a67be789b0e9 (patch) | |
| tree | 81766a1f737798b24d4918d86c41c3a11da251d5 /lib/private | |
| parent | 7996a12aef25b7ac8bd9a61f7b09f6806cef5ec4 (diff) | |
| download | nextcloud-server-3cce9aa547d44cdb9ead142bb792a67be789b0e9.tar.gz nextcloud-server-3cce9aa547d44cdb9ead142bb792a67be789b0e9.zip | |
Just use string for groups in enableAppForGroups
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/App/AppManager.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 6d2fe51d0ed..3b352001dac 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -52,7 +52,6 @@ use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AppManager implements IAppManager { - /** * Apps with these types can not be enabled for certain groups only * @var string[] @@ -184,7 +183,7 @@ class AppManager implements IAppManager { /** * @param string $appId - * @return array + * @return string[] */ public function getAppRestriction(string $appId): array { $values = $this->getInstalledAppsValues(); @@ -346,7 +345,7 @@ class AppManager implements IAppManager { * Enable an app only for specific groups * * @param string $appId - * @param \OCP\IGroup[] $groups + * @param string[] $groups * @param bool $forceEnable * @throws \InvalidArgumentException if app can't be enabled for groups * @throws AppPathNotFoundException @@ -364,15 +363,8 @@ class AppManager implements IAppManager { $this->ignoreNextcloudRequirementForApp($appId); } - $groupIds = array_map(function ($group) { - /** @var \OCP\IGroup $group */ - return ($group instanceof IGroup) - ? $group->getGID() - : $group; - }, $groups); - - $this->installedAppsCache[$appId] = json_encode($groupIds); - $this->appConfig->setValue($appId, 'enabled', json_encode($groupIds)); + $this->installedAppsCache[$appId] = json_encode($groups); + $this->appConfig->setValue($appId, 'enabled', json_encode($groups)); $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent( ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups )); |