4 files changed, 3 insertions, 109 deletions
diff --git a/lib/public/DB.php b/lib/public/DB.php
index 23ebdceccd0..85a34ff37a0 100644
--- a/lib/public/DB.php
+++ b/lib/public/DB.php
@@ -61,33 +61,4 @@ class DB {
 		return \OC_DB::prepare($query, $limit, $offset);
 	}
 
-	/**
-	 * Start a transaction
-	 * @deprecated 8.1.0 use beginTransaction() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function beginTransaction() {
-		\OC::$server->getDatabaseConnection()->beginTransaction();
-	}
-
-	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @deprecated 8.1.0 use commit() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function commit() {
-		\OC::$server->getDatabaseConnection()->commit();
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 * @deprecated 8.1.0 use getError() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 6.0.0
-	 */
-	public static function getErrorMessage() {
-		return \OC::$server->getDatabaseConnection()->getError();
-	}
-
 }
diff --git a/lib/public/Files/Folder.php b/lib/public/Files/Folder.php
index 52a4b303196..425813c7e21 100644
--- a/lib/public/Files/Folder.php
+++ b/lib/public/Files/Folder.php
@@ -145,6 +145,9 @@ interface Folder extends Node {
 	/**
 	 * get a file or folder inside the folder by it's internal id
 	 *
+	 * This method could return multiple entries. For example once the file/folder
+	 * is shared or mounted (files_external) to the user multiple times.
+	 *
 	 * @param int $id
 	 * @return \OCP\Files\Node[]
 	 * @since 6.0.0
diff --git a/lib/public/Response.php b/lib/public/Response.php
deleted file mode 100644
index 782dcb88626..00000000000
--- a/lib/public/Response.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Andreas Fischer <bantu@owncloud.com>
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Stefan Weil <sw@weilnetz.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @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.
- * Response 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 convenient functions to send the correct http response headers
- * @since 4.0.0
- * @deprecated 8.1.0 - Use AppFramework controllers instead and modify the response object
- */
-class Response {
-
-	/**
-	 * Sets the content disposition header (with possible workarounds)
-	 * @param string $filename file name
-	 * @param string $type disposition type, either 'attachment' or 'inline'
-	 * @since 7.0.0
-	 */
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
-		\OC_Response::setContentDispositionHeader( $filename, $type );
-	}
-
-	/**
-	 * Sets the content length header (with possible workarounds)
-	 * @param string|int|float $length Length to be sent
-	 * @since 8.1.0
-	 */
-	static public function setContentLengthHeader($length) {
-		\OC_Response::setContentLengthHeader($length);
-	}
-}
diff --git a/lib/public/User.php b/lib/public/User.php
index 2fdf540b958..14fdd6fb1ab 100644
--- a/lib/public/User.php
+++ b/lib/public/User.php
@@ -83,20 +83,6 @@ class User {
 	}
 
 	/**
-	 * Get a list of all display names and user ids.
-	 * @param string $search search pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array an array of all display names (value) and the correspondig uids (key)
-	 * @deprecated 8.1.0 use method searchDisplayName() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 * @since 5.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function getDisplayNames( $search = '', $limit = null, $offset = null ) {
-		return \OC_User::getDisplayNames( $search, $limit, $offset );
-	}
-
-	/**
 	 * Check if the user is logged in
 	 * @return boolean
 	 * @since 5.0.0