Merge pull request #7839 from nextcloud/dep_dicontainer

Remove deprecated functions from DI Container

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

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
 	 *