chore: stop using deprecated class OC_OCS_Result (#1228)

Author: DeepDiver1975

lib/Api.php

@@ -66,7 +66,7 @@ public static function get() {
 		}
 
 		/* @phan-suppress-next-line PhanDeprecatedClass */
-		return new \OC_OCS_Result($entries);
+		return new \OC\OCS\Result($entries);
 	}
 
 	/**

lib/Controller/EndPoint.php

@@ -70,10 +70,10 @@ public function getFilter($filter) {
 	}
 
 	/**
-	 * @param \OC_OCS_Result $ocsResult
+	 * @param \OC\OCS\Result $ocsResult
 	 * @return JSONResponse
 	 */
-	protected function ocsToJsonResponse(\OC_OCS_Result $ocsResult) {
+	protected function ocsToJsonResponse(\OC\OCS\Result $ocsResult) {
 		$response = new JSONResponse(
 			[
 				'ocs' => [

lib/Controller/OCSEndPoint.php

@@ -164,7 +164,7 @@ protected function readParameters(array $parameters) {
 
 	/**
 	 * @param array $parameters
-	 * @return \OC_OCS_Result
+	 * @return \OC\OCS\Result
 	 */
 	public function getDefault(array $parameters) {
 		return $this->get(\array_merge($parameters, [
@@ -174,25 +174,25 @@ public function getDefault(array $parameters) {
 
 	/**
 	 * @param array $parameters
-	 * @return \OC_OCS_Result
+	 * @return \OC\OCS\Result
 	 */
 	public function getFilter(array $parameters) {
 		return $this->get($parameters);
 	}
 
 	/**
 	 * @param array $parameters
-	 * @return \OC_OCS_Result
+	 * @return \OC\OCS\Result
 	 */
 	protected function get(array $parameters) {
 		try {
 			$this->readParameters($parameters);
 		} catch (InvalidFilterException $e) {
 			/* @phan-suppress-next-line PhanDeprecatedClass */
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND);
+			return new \OC\OCS\Result(null, Http::STATUS_NOT_FOUND);
 		} catch (\OutOfBoundsException $e) {
 			/* @phan-suppress-next-line PhanDeprecatedClass */
-			return new \OC_OCS_Result(null, Http::STATUS_FORBIDDEN);
+			return new \OC\OCS\Result(null, Http::STATUS_FORBIDDEN);
 		}
 
 		try {
@@ -210,17 +210,17 @@ protected function get(array $parameters) {
 		} catch (\OutOfBoundsException $e) {
 			// Invalid since argument
 			/* @phan-suppress-next-line PhanDeprecatedClass */
-			return new \OC_OCS_Result(null, Http::STATUS_FORBIDDEN);
+			return new \OC\OCS\Result(null, Http::STATUS_FORBIDDEN);
 		} catch (\BadMethodCallException $e) {
 			// No activity settings enabled
 			/* @phan-suppress-next-line PhanDeprecatedClass */
-			return new \OC_OCS_Result(null, Http::STATUS_NO_CONTENT);
+			return new \OC\OCS\Result(null, Http::STATUS_NO_CONTENT);
 		}
 
 		$headers = $this->generateHeaders($response['headers'], $response['has_more']);
 		if (empty($response['data'])) {
 			/* @phan-suppress-next-line PhanDeprecatedClass */
-			return new \OC_OCS_Result([], Http::STATUS_NOT_MODIFIED, null, $headers);
+			return new \OC\OCS\Result([], Http::STATUS_NOT_MODIFIED, null, $headers);
 		}
 
 		$preparedActivities = [];
@@ -248,7 +248,7 @@ protected function get(array $parameters) {
 		}
 
 		/* @phan-suppress-next-line PhanDeprecatedClass */
-		return new \OC_OCS_Result($preparedActivities, 100, null, $headers);
+		return new \OC\OCS\Result($preparedActivities, 100, null, $headers);
 	}
 
 	/**

tests/unit/Controller/OCSEndPointTest.php

@@ -418,10 +418,10 @@ public function testGetInvalid($readParamsThrows, $dataGetThrows, $expected) {
 				->method('generateHeaders');
 		}
 
-		/** @var \OC_OCS_Result $result */
+		/** @var \OC\OCS\Result $result */
 		$result = $this->invokePrivate($controller, 'get', [[]]);
 
-		$this->assertInstanceOf('\OC_OCS_Result', $result);
+		$this->assertInstanceOf('\OC\OCS\Result', $result);
 		$this->assertSame($expected, $result->getStatusCode());
 	}
 
@@ -477,10 +477,10 @@ public function testGet($time, $objectType, $objectId, array $additionalArgs, $l
 				'has_more' => false,
 			]);
 
-		/** @var \OC_OCS_Result $result */
+		/** @var \OC\OCS\Result $result */
 		$result = $this->invokePrivate($controller, 'get', [[]]);
 
-		$this->assertInstanceOf('\OC_OCS_Result', $result);
+		$this->assertInstanceOf('\OC\OCS\Result', $result);
 		$this->assertSame(100, $result->getStatusCode());
 		$this->assertSame([
 			$expected,