Merge pull request #25679 from nextcloud/drop/ocp-user

Drop \OCP\User

5 files changed, 2 insertions, 89 deletions

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 7d200489bcf..d90785e08d3 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -522,7 +522,6 @@ return array(
     'OCP\\SystemTag\\TagAlreadyExistsException' => $baseDir . '/lib/public/SystemTag/TagAlreadyExistsException.php',
     'OCP\\SystemTag\\TagNotFoundException' => $baseDir . '/lib/public/SystemTag/TagNotFoundException.php',
     'OCP\\Template' => $baseDir . '/lib/public/Template.php',
-    'OCP\\User' => $baseDir . '/lib/public/User.php',
     'OCP\\UserInterface' => $baseDir . '/lib/public/UserInterface.php',
     'OCP\\UserStatus\\IManager' => $baseDir . '/lib/public/UserStatus/IManager.php',
     'OCP\\UserStatus\\IProvider' => $baseDir . '/lib/public/UserStatus/IProvider.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 6fd64c89b92..702b47eb4cf 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -551,7 +551,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OCP\\SystemTag\\TagAlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagAlreadyExistsException.php',
         'OCP\\SystemTag\\TagNotFoundException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagNotFoundException.php',
         'OCP\\Template' => __DIR__ . '/../../..' . '/lib/public/Template.php',
-        'OCP\\User' => __DIR__ . '/../../..' . '/lib/public/User.php',
         'OCP\\UserInterface' => __DIR__ . '/../../..' . '/lib/public/UserInterface.php',
         'OCP\\UserStatus\\IManager' => __DIR__ . '/../../..' . '/lib/public/UserStatus/IManager.php',
         'OCP\\UserStatus\\IProvider' => __DIR__ . '/../../..' . '/lib/public/UserStatus/IProvider.php',
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 2223858b7a9..a59f735c102 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -2171,7 +2171,7 @@ class View {
 			throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
 		}
 		$uid = $info->getOwner()->getUID();
-		if ($uid != \OCP\User::getUser()) {
+		if ($uid != \OC_User::getUser()) {
 			Filesystem::initMountPoints($uid);
 			$ownerView = new View('/' . $uid . '/files');
 			try {
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 2d0d4f1cf87..703bc282972 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -614,7 +614,7 @@ class Share extends Constants {
 		}
 
 		// group items if we are looking for items shared with the current user
-		if (isset($shareWith) && $shareWith === \OCP\User::getUser()) {
+		if (isset($shareWith) && $shareWith === \OC_User::getUser()) {
 			$items = self::groupItems($items, $itemType);
 		}
 
diff --git a/lib/public/User.php b/lib/public/User.php
deleted file mode 100644
index 9bbc2c20cca..00000000000
--- a/lib/public/User.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Georg Ehrke <oc.list@georgehrke.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Sebastian Wessalowski <sebastian@wessalowski.org>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * Public interface of ownCloud for apps to use.
- * User Class
- *
- */
-
-// use OCP namespace for all classes that are considered public.
-// This means that they should be used by apps instead of the internal ownCloud classes
-
-namespace OCP;
-
-/**
- * This class provides access to the user management. You can get information
- * about the currently logged in user and the permissions for example
- * @since 5.0.0
- * @deprecated 13.0.0
- */
-class User {
-	/**
-	 * Get the user id of the user currently logged in.
-	 * @return string uid or false
-	 * @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
-	 * @since 5.0.0
-	 */
-	public static function getUser() {
-		return \OC_User::getUser();
-	}
-
-	/**
-	 * Check if the user is logged in
-	 * @return boolean
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * Check if the user is a admin, redirects to home if not
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function checkAdminUser() {
-		\OC_Util::checkAdminUser();
-	}
-
-	/**
-	 * Check if the user is logged in, redirects to home if not. With
-	 * redirect URL parameter to the request URI.
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function checkLoggedIn() {
-		\OC_Util::checkLoggedIn();
-	}
-}