Remove deprecated \OCP\API

Time to remove this forgood now.
Remaining constant moved over
The world is a tiny bit better

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

5 files changed, 16 insertions, 17 deletions

diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php
index 5016fc3eec8..f701f17a48e 100644
--- a/lib/private/AppFramework/Middleware/OCSMiddleware.php
+++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php
@@ -29,7 +29,6 @@ use OC\AppFramework\Http;
 use OC\AppFramework\OCS\BaseResponse;
 use OC\AppFramework\OCS\V1Response;
 use OC\AppFramework\OCS\V2Response;
-use OCP\API;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
@@ -80,7 +79,7 @@ class OCSMiddleware extends Middleware {
 		if ($controller instanceof OCSController && $exception instanceof OCSException) {
 			$code = $exception->getCode();
 			if ($code === 0) {
-				$code = API::RESPOND_UNKNOWN_ERROR;
+				$code = \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR;
 			}
 
 			return $this->buildNewResponse($controller, $code, $exception->getMessage());
@@ -109,7 +108,7 @@ class OCSMiddleware extends Middleware {
 					$message = $response->getData()['message'];
 				}
 
-				return $this->buildNewResponse($controller, API::RESPOND_UNAUTHORISED, $message);
+				return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message);
 			}
 		}
 
diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php
index 97a3acce681..9ccff9ac98c 100644
--- a/lib/private/AppFramework/OCS/V1Response.php
+++ b/lib/private/AppFramework/OCS/V1Response.php
@@ -24,8 +24,8 @@
 
 namespace OC\AppFramework\OCS;
 
-use OCP\API;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\OCSController;
 
 class V1Response extends BaseResponse {
 
@@ -37,7 +37,7 @@ class V1Response extends BaseResponse {
 	 */
 	public function getStatus() {
 		$status = parent::getStatus();
-		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
+		if ($status === Http::STATUS_FORBIDDEN || $status === OCSController::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
 		}
 
diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php
index 3d1868857ce..5a253adf676 100644
--- a/lib/private/AppFramework/OCS/V2Response.php
+++ b/lib/private/AppFramework/OCS/V2Response.php
@@ -24,8 +24,8 @@
 
 namespace OC\AppFramework\OCS;
 
-use OCP\API;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\OCSController;
 
 class V2Response extends BaseResponse {
 
@@ -37,11 +37,11 @@ class V2Response extends BaseResponse {
 	 */
 	public function getStatus() {
 		$status = parent::getStatus();
-		if ($status === API::RESPOND_UNAUTHORISED) {
+		if ($status === OCSController::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
-		} elseif ($status === API::RESPOND_NOT_FOUND) {
+		} elseif ($status === OCSController::RESPOND_NOT_FOUND) {
 			return Http::STATUS_NOT_FOUND;
-		} elseif ($status === API::RESPOND_SERVER_ERROR || $status === API::RESPOND_UNKNOWN_ERROR) {
+		} elseif ($status === OCSController::RESPOND_SERVER_ERROR || $status === OCSController::RESPOND_UNKNOWN_ERROR) {
 			return Http::STATUS_INTERNAL_SERVER_ERROR;
 		} elseif ($status < 200 || $status > 600) {
 			return Http::STATUS_BAD_REQUEST;
diff --git a/lib/private/Remote/Api/OCS.php b/lib/private/Remote/Api/OCS.php
index 770dce3545f..d6bed57f561 100644
--- a/lib/private/Remote/Api/OCS.php
+++ b/lib/private/Remote/Api/OCS.php
@@ -27,7 +27,7 @@ namespace OC\Remote\Api;
 use GuzzleHttp\Exception\ClientException;
 use OC\ForbiddenException;
 use OC\Remote\User;
-use OCP\API;
+use OCP\AppFramework\OCSController;
 use OCP\Remote\Api\ICapabilitiesApi;
 use OCP\Remote\Api\IUserApi;
 
@@ -58,10 +58,10 @@ class OCS extends ApiBase implements ICapabilitiesApi, IUserApi {
 		if (!isset($response['ocs']) || !isset($response['ocs']['meta'])) {
 			throw new \Exception('Invalid ocs response');
 		}
-		if ($response['ocs']['meta']['statuscode'] === API::RESPOND_UNAUTHORISED) {
+		if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_UNAUTHORISED) {
 			throw new ForbiddenException();
 		}
-		if ($response['ocs']['meta']['statuscode'] === API::RESPOND_NOT_FOUND) {
+		if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_NOT_FOUND) {
 			throw new NotFoundException();
 		}
 		if ($response['ocs']['meta']['status'] !== 'ok') {
diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php
index 16a144269b3..9e9c28e2dba 100644
--- a/lib/private/legacy/OC_API.php
+++ b/lib/private/legacy/OC_API.php
@@ -48,7 +48,7 @@ class OC_API {
 		$request = \OC::$server->getRequest();
 
 		// Send 401 headers if unauthorised
-		if ($result->getStatusCode() === API::RESPOND_UNAUTHORISED) {
+		if ($result->getStatusCode() === \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED) {
 			// If request comes from JS return dummy auth request
 			if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') {
 				header('WWW-Authenticate: DummyBasic realm="Authorisation Required"');
@@ -143,13 +143,13 @@ class OC_API {
 	 */
 	public static function mapStatusCodes($sc) {
 		switch ($sc) {
-			case API::RESPOND_NOT_FOUND:
+			case \OCP\AppFramework\OCSController::RESPOND_NOT_FOUND:
 				return Http::STATUS_NOT_FOUND;
-			case API::RESPOND_SERVER_ERROR:
+			case \OCP\AppFramework\OCSController::RESPOND_SERVER_ERROR:
 				return Http::STATUS_INTERNAL_SERVER_ERROR;
-			case API::RESPOND_UNKNOWN_ERROR:
+			case \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR:
 				return Http::STATUS_INTERNAL_SERVER_ERROR;
-			case API::RESPOND_UNAUTHORISED:
+			case \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED:
 				// already handled for v1
 				return null;
 			case 100: