Merge pull request #8918 from nextcloud/remove-deprecated-ocp-response

Remove deprecated and unused OCP\Response

4 files changed, 2 insertions, 70 deletions

diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 833077fbcce..c61e0461028 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -48,11 +48,11 @@ $view = new OC\Files\View('/');
 $ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename));
 
 header('Content-Type:'.$ftype);
-OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
+\OC_Response::setContentDispositionHeader(basename($filename), 'attachment');
 header('Pragma: public');// enable caching in IE
 header('Expires: 0');
 header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-OCP\Response::setContentLengthHeader($view->filesize($versionName));
+\OC_Response::setContentLengthHeader($view->filesize($versionName));
 
 OC_Util::obEnd();
 
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 3331d57e131..ecd7f155c0e 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -255,7 +255,6 @@ return array(
     'OCP\\Remote\\IInstance' => $baseDir . '/lib/public/Remote/IInstance.php',
     'OCP\\Remote\\IInstanceFactory' => $baseDir . '/lib/public/Remote/IInstanceFactory.php',
     'OCP\\Remote\\IUser' => $baseDir . '/lib/public/Remote/IUser.php',
-    'OCP\\Response' => $baseDir . '/lib/public/Response.php',
     'OCP\\RichObjectStrings\\Definitions' => $baseDir . '/lib/public/RichObjectStrings/Definitions.php',
     'OCP\\RichObjectStrings\\IValidator' => $baseDir . '/lib/public/RichObjectStrings/IValidator.php',
     'OCP\\RichObjectStrings\\InvalidObjectExeption' => $baseDir . '/lib/public/RichObjectStrings/InvalidObjectExeption.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index e35ef7d7a09..8fbff8a1e13 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -285,7 +285,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OCP\\Remote\\IInstance' => __DIR__ . '/../../..' . '/lib/public/Remote/IInstance.php',
         'OCP\\Remote\\IInstanceFactory' => __DIR__ . '/../../..' . '/lib/public/Remote/IInstanceFactory.php',
         'OCP\\Remote\\IUser' => __DIR__ . '/../../..' . '/lib/public/Remote/IUser.php',
-        'OCP\\Response' => __DIR__ . '/../../..' . '/lib/public/Response.php',
         'OCP\\RichObjectStrings\\Definitions' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/Definitions.php',
         'OCP\\RichObjectStrings\\IValidator' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/IValidator.php',
         'OCP\\RichObjectStrings\\InvalidObjectExeption' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/InvalidObjectExeption.php',
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);
-	}
-}