Skip to content

Remove deprecated functions from DI Container #7839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jan 14, 2018
Merged

Remove deprecated functions from DI Container #7839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/AppFramework/DependencyInjection/DIContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser
$server->getURLGenerator(),
$server->getLogger(),
$c['AppName'],
$app->isLoggedIn(),
$app->isAdminUser(),
$server->getUserSession()->isLoggedIn(),
$server->getGroupManager()->isAdmin($this->getUserId()),
$server->getContentSecurityPolicyManager(),
$server->getCsrfTokenManager(),
$server->getContentSecurityPolicyNonceManager(),
Expand Down
30 changes: 0 additions & 30 deletions lib/public/AppFramework/IAppContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -64,29 +57,6 @@ public function getServer();
*/
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
*
Expand Down