diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-14 20:51:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-14 20:51:21 +0100 |
| commit | 3ade5ccb2713b6fee2f176ae8280afda98d918a9 (patch) | |
| tree | 05fba941216505280ed98557c451c76916c170bb /lib | |
| parent | 50e4abb46b7402b2216ec461f1aff8016b56b8dc (diff) | |
| parent | 704133d7328de0ed6b38df95f8cefec0ffdaf8ca (diff) | |
| download | nextcloud-server-3ade5ccb2713b6fee2f176ae8280afda98d918a9.tar.gz nextcloud-server-3ade5ccb2713b6fee2f176ae8280afda98d918a9.zip | |
Merge pull request #7839 from nextcloud/dep_dicontainer
Remove deprecated functions from DI Container
Diffstat (limited to 'lib')
| -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' |