Remove deprecated functions from DI Container

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-01-13 14:13:59 +01:00
parent 1faef0c459
commit 704133d732
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 2 additions and 32 deletions

View File

@ -229,8 +229,8 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$server->getURLGenerator(), $server->getURLGenerator(),
$server->getLogger(), $server->getLogger(),
$c['AppName'], $c['AppName'],
$app->isLoggedIn(), $server->getUserSession()->isLoggedIn(),
$app->isAdminUser(), $server->getGroupManager()->isAdmin($this->getUserId()),
$server->getContentSecurityPolicyManager(), $server->getContentSecurityPolicyManager(),
$server->getCsrfTokenManager(), $server->getCsrfTokenManager(),
$server->getContentSecurityPolicyNonceManager(), $server->getContentSecurityPolicyNonceManager(),

View File

@ -44,13 +44,6 @@ interface IAppContainer extends IContainer {
*/ */
public function getAppName(); public function getAppName();
/**
* @deprecated 8.0.0 implements only deprecated methods
* @return IApi
* @since 6.0.0
*/
public function getCoreApi();
/** /**
* @return \OCP\IServerContainer * @return \OCP\IServerContainer
* @since 6.0.0 * @since 6.0.0
@ -64,29 +57,6 @@ interface IAppContainer extends IContainer {
*/ */
public function registerMiddleWare($middleWare); 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 * Register a capability
* *