wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7839 from nextcloud/dep_dicontainer

Browse source 
Remove deprecated functions from DI Container
This commit is contained in:
Morris Jobke 2018-01-14 20:51:21 +01:00 committed by GitHub
commit 3ade5ccb27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -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(),

30
lib/public/AppFramework/IAppContainer.php
View file

@ -44,13 +44,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
@ -64,29 +57,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
*