diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-01-13 14:13:59 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-01-13 19:29:52 +0100 |
| commit | 704133d7328de0ed6b38df95f8cefec0ffdaf8ca (patch) | |
| tree | cdeeadc14e510151968aa1440c1b7855b504e902 | |
| parent | 1faef0c459a51a025f73f7eee46e5607ee6eedf5 (diff) | |
| download | nextcloud-server-704133d7328de0ed6b38df95f8cefec0ffdaf8ca.tar.gz nextcloud-server-704133d7328de0ed6b38df95f8cefec0ffdaf8ca.zip | |
Remove deprecated functions from DI Container
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | lib/private/AppFramework/DependencyInjection/DIContainer.php | 4 | ||||
| -rw-r--r-- | lib/public/AppFramework/IAppContainer.php | 30 |
2 files changed, 2 insertions, 32 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 612728d1356..47566e0381c 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -229,8 +229,8 @@ class DIContainer extends SimpleContainer implements IAppContainer { $server->getURLGenerator(), $server->getLogger(), $c['AppName'], - $app->isLoggedIn(), - $app->isAdminUser(), + $server->getUserSession()->isLoggedIn(), + $server->getGroupManager()->isAdmin($this->getUserId()), $server->getContentSecurityPolicyManager(), $server->getCsrfTokenManager(), $server->getContentSecurityPolicyNonceManager(), diff --git a/lib/public/AppFramework/IAppContainer.php b/lib/public/AppFramework/IAppContainer.php index 4aac6085d63..2fa0bcdd5aa 100644 --- a/lib/public/AppFramework/IAppContainer.php +++ b/lib/public/AppFramework/IAppContainer.php @@ -45,13 +45,6 @@ interface IAppContainer extends IContainer { public function getAppName(); /** - * @deprecated 8.0.0 implements only deprecated methods - * @return IApi - * @since 6.0.0 - */ - public function getCoreApi(); - - /** * @return \OCP\IServerContainer * @since 6.0.0 */ @@ -65,29 +58,6 @@ interface IAppContainer extends IContainer { public function registerMiddleWare($middleWare); /** - * @deprecated 8.0.0 use IUserSession->isLoggedIn() - * @return boolean - * @since 6.0.0 - */ - public function isLoggedIn(); - - /** - * @deprecated 8.0.0 use IGroupManager->isAdmin($userId) - * @return boolean - * @since 6.0.0 - */ - public function isAdminUser(); - - /** - * @deprecated 8.0.0 use the ILogger instead - * @param string $message - * @param string $level - * @return mixed - * @since 6.0.0 - */ - public function log($message, $level); - - /** * Register a capability * * @param string $serviceName e.g. 'OCA\Files\Capabilities' |