wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OC_OCS_Response is deprecated

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-09-21 17:56:00 +02:00
parent 4d556a3ade
commit 87e10f9e6a
No known key found for this signature in database
GPG key ID: F941078878347C0C
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/lib/Lib/Api.php
View file

@ -72,7 +72,7 @@ class Api {
* Returns the mount points visible for this user.
*
* @param array $params
* @return \OC_OCS_Result share information
* @return \OC\OCS\Result share information
*/
public static function getUserMounts($params) {
$entries = array();
@ -83,6 +83,6 @@ class Api {
$entries[] = self::formatMount($mountPoint, $mount);
}
return new \OC_OCS_Result($entries);
return new \OC\OCS\Result($entries);
}
}

14
lib/private/legacy/api.php
View file

@ -129,7 +129,7 @@ class OC_API {
if(!self::isAuthorised($action)) {
$responses[] = array(
'app' => $action['app'],
'response' => new OC_OCS_Result(null, API::RESPOND_UNAUTHORISED, 'Unauthorised'),
'response' => new \OC\OCS\Result(null, API::RESPOND_UNAUTHORISED, 'Unauthorised'),
'shipped' => $appManager->isShipped($action['app']),
);
continue;
@ -137,7 +137,7 @@ class OC_API {
if(!is_callable($action['action'])) {
$responses[] = array(
'app' => $action['app'],
'response' => new OC_OCS_Result(null, API::RESPOND_NOT_FOUND, 'Api method not found'),
'response' => new \OC\OCS\Result(null, API::RESPOND_NOT_FOUND, 'Api method not found'),
'shipped' => $appManager->isShipped($action['app']),
);
continue;
@ -161,7 +161,7 @@ class OC_API {
/**
* merge the returned result objects into one response
* @param array $responses
* @return OC_OCS_Result
* @return \OC\OCS\Result
*/
public static function mergeResponses($responses) {
// Sort into shipped and third-party
@ -205,7 +205,7 @@ class OC_API {
$code = $picked['response']->getStatusCode();
$meta = $picked['response']->getMeta();
$headers = $picked['response']->getHeaders();
$response = new OC_OCS_Result($data, $code, $meta['message'], $headers);
$response = new \OC\OCS\Result($data, $code, $meta['message'], $headers);
return $response;
} elseif(!empty($shipped['succeeded'])) {
$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
@ -219,7 +219,7 @@ class OC_API {
$code = $picked['response']->getStatusCode();
$meta = $picked['response']->getMeta();
$headers = $picked['response']->getHeaders();
$response = new OC_OCS_Result($data, $code, $meta['message'], $headers);
$response = new \OC\OCS\Result($data, $code, $meta['message'], $headers);
return $response;
} else {
$responses = $thirdparty['succeeded'];
@ -251,7 +251,7 @@ class OC_API {
}
}
return new OC_OCS_Result($data, $statusCode, $statusMessage, $header);
return new \OC\OCS\Result($data, $statusCode, $statusMessage, $header);
}
/**
@ -351,7 +351,7 @@ class OC_API {
/**
* respond to a call
* @param OC_OCS_Result $result
* @param \OC\OCS\Result $result
* @param string $format the format xml|json
*/
public static function respond($result, $format='xml') {

2
lib/public/AppFramework/Http/OCSResponse.php
View file

@ -83,7 +83,7 @@ class OCSResponse extends Response {
* @suppress PhanDeprecatedClass
*/
public function render() {
$r = new \OC_OCS_Result($this->data, $this->statuscode, $this->message);
$r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
$r->setTotalItems($this->itemscount);
$r->setItemsPerPage($this->itemsperpage);

8
ocs/v1.php
View file

@ -36,7 +36,7 @@ if (\OCP\Util::needUpgrade()
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
$response = new OC_OCS_Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable');
$response = new \OC\OCS\Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable');
OC_API::respond($response, OC_API::requestedFormat());
exit;
}
@ -81,14 +81,14 @@ try {
$format = \OC::$server->getRequest()->getParam('format', 'xml');
$txt='Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
OC_Response::setStatus(405);
} catch (\OC\OCS\Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
} catch (\OC\User\LoginException $e) {
OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'Unauthorised'));
OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'Unauthorised'));
} catch (\Exception $e) {
\OC::$server->getLogger()->logException($e);
OC_API::setContentType();
@ -96,6 +96,6 @@ try {
$format = \OC::$server->getRequest()->getParam('format', 'xml');
$txt='Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
}

8
tests/lib/APITest.php
View file

@ -16,7 +16,7 @@ class APITest extends \Test\TestCase {
* @param string $message
*/
function buildResponse($shipped, $data, $code, $message=null) {
$resp = new \OC_OCS_Result($data, $code, $message);
$resp = new \OC\OCS\Result($data, $code, $message);
$resp->addHeader('KEY', 'VALUE');
return [
'shipped' => $shipped,
@ -28,13 +28,13 @@ class APITest extends \Test\TestCase {
// Validate details of the result
/**
* @param \OC_OCS_Result $result
* @param \OC\OCS\Result $result
*/
function checkResult($result, $success) {
// Check response is of correct type
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertInstanceOf(\OC\OCS\Result::class, $result);
// Check if it succeeded
/** @var $result \OC_OCS_Result */
/** @var $result \OC\OCS\Result */
$this->assertEquals($success, $result->succeeded());
}