diff options
author | Robin Appelman <icewind@owncloud.com> | 2015-02-05 15:11:07 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2015-02-17 15:05:29 +0100 |
commit | 04628cf368983a87f9466e02aa569e4ff646880b (patch) | |
tree | cb9d80854ad3b35642a83d846c288ff36048c681 | |
parent | 434835b326bddcd2e53a9ee46734e4f358a9d1f1 (diff) | |
download | nextcloud-server-04628cf368983a87f9466e02aa569e4ff646880b.tar.gz nextcloud-server-04628cf368983a87f9466e02aa569e4ff646880b.zip |
better name for getAppsEnabledForUser
-rw-r--r-- | lib/private/app.php | 2 | ||||
-rw-r--r-- | lib/private/app/appmanager.php | 2 | ||||
-rw-r--r-- | lib/public/app/iappmanager.php | 2 | ||||
-rw-r--r-- | tests/lib/app/manager.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index c767ddaec99..2e640aa2a40 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -220,7 +220,7 @@ class OC_App { if (is_null($user)) { $apps = $appManager->getInstalledApps(); } else { - $apps = $appManager->getAppsEnabledForUser($user); + $apps = $appManager->getEnabledAppsForUser($user); } $apps = array_filter($apps, function ($app) { return $app !== 'files';//we add this manually diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php index c5006593e5d..860d9e70a45 100644 --- a/lib/private/app/appmanager.php +++ b/lib/private/app/appmanager.php @@ -76,7 +76,7 @@ class AppManager implements IAppManager { * @param \OCP\IUser $user * @return string[] */ - public function getAppsEnabledForUser(IUser $user) { + public function getEnabledAppsForUser(IUser $user) { $apps = $this->getInstalledAppsValues(); $appsForUser = array_filter($apps, function ($enabled) use ($user) { return $this->checkAppForUser($enabled, $user); diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php index c79dcf9a573..495b82e0bdf 100644 --- a/lib/public/app/iappmanager.php +++ b/lib/public/app/iappmanager.php @@ -57,7 +57,7 @@ interface IAppManager { * @param \OCP\IUser $user * @return string[] */ - public function getAppsEnabledForUser(IUser $user); + public function getEnabledAppsForUser(IUser $user); /** * List all installed apps diff --git a/tests/lib/app/manager.php b/tests/lib/app/manager.php index 4eaf4f08be9..cb41f737469 100644 --- a/tests/lib/app/manager.php +++ b/tests/lib/app/manager.php @@ -222,6 +222,6 @@ class Manager extends \PHPUnit_Framework_TestCase { $appConfig->setValue('test2', 'enabled', 'no'); $appConfig->setValue('test3', 'enabled', '["foo"]'); $appConfig->setValue('test4', 'enabled', '["asd"]'); - $this->assertEquals(['test1', 'test3'], $manager->getAppsEnabledForUser($user)); + $this->assertEquals(['test1', 'test3'], $manager->getEnabledAppsForUser($user)); } } |