From 704133d7328de0ed6b38df95f8cefec0ffdaf8ca Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 13 Jan 2018 14:13:59 +0100
Subject: [PATCH] Remove deprecated functions from DI Container

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 .../DependencyInjection/DIContainer.php       |  4 +--
 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 612728d135..47566e0381 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 4aac6085d6..2fa0bcdd5a 100644
--- a/lib/public/AppFramework/IAppContainer.php
+++ b/lib/public/AppFramework/IAppContainer.php
@@ -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
 	 *