diff options
| author | Maxence Lange <maxence@nextcloud.com> | 2017-05-31 15:11:22 +0300 |
|---|---|---|
| committer | Maxence Lange <maxence@nextcloud.com> | 2017-05-31 15:11:22 +0300 |
| commit | 14a15467d10a3950b5e6b6e466df3ccf08070306 (patch) | |
| tree | f5cc8825ffd1c60704310985dab854d9c3a1806c /lib | |
| parent | b84305c2e7abbb1ee0e78d19c083570f25c52407 (diff) | |
API version
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Api/v1/Circles.php | 4 | ||||
| -rw-r--r-- | lib/Controller/FederatedController.php | 9 | ||||
| -rw-r--r-- | lib/Db/CirclesRequest.php | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php index b85a6fdd..3981bb8a 100644 --- a/lib/Api/v1/Circles.php +++ b/lib/Api/v1/Circles.php @@ -35,7 +35,7 @@ use OCA\Circles\Model\SharingFrame; class Circles { - const API_VERSION = '0.9.0'; + const API_VERSION = [0, 9, 1]; protected static function getContainer() { $app = new Application(); @@ -49,7 +49,7 @@ class Circles { * * returns the current version of the API * - * @return string + * @return int[] */ public static function version() { return self::API_VERSION; diff --git a/lib/Controller/FederatedController.php b/lib/Controller/FederatedController.php index b787bd32..7b931e9a 100644 --- a/lib/Controller/FederatedController.php +++ b/lib/Controller/FederatedController.php @@ -77,6 +77,7 @@ class FederatedController extends BaseController { * @PublicPage * @NoCSRFRequired * + * @param array $apiVersion * @param string $token * @param string $uniqueId * @param string $sourceName @@ -85,7 +86,7 @@ class FederatedController extends BaseController { * * @return DataResponse */ - public function requestedLink($token, $uniqueId, $sourceName, $linkTo, $address) { + public function requestedLink($apiVersion, $token, $uniqueId, $sourceName, $linkTo, $address) { if ($uniqueId === '' || !$this->configService->isFederatedAllowed()) { return $this->federatedFail('federated_not_allowed'); @@ -127,12 +128,13 @@ class FederatedController extends BaseController { * @PublicPage * @NoCSRFRequired * + * @param $apiVersion * @param $circleId * @param $uniqueId * * @return DataResponse */ - public function initFederatedDelivery($circleId, $uniqueId) { + public function initFederatedDelivery($apiVersion, $circleId, $uniqueId) { if ($uniqueId === '' || !$this->configService->isFederatedAllowed()) { return $this->federatedFail('federated_not_allowed'); @@ -169,13 +171,14 @@ class FederatedController extends BaseController { * @PublicPage * @NoCSRFRequired * + * @param $apiVersion * @param $token * @param $uniqueId * @param $item * * @return DataResponse */ - public function receiveFederatedDelivery($token, $uniqueId, $item) { + public function receiveFederatedDelivery($apiVersion, $token, $uniqueId, $item) { if ($uniqueId === '' || !$this->configService->isFederatedAllowed()) { return $this->federatedFail('federated_not_allowed'); diff --git a/lib/Db/CirclesRequest.php b/lib/Db/CirclesRequest.php index 7d6be363..5ceaba11 100644 --- a/lib/Db/CirclesRequest.php +++ b/lib/Db/CirclesRequest.php @@ -158,6 +158,7 @@ class CirclesRequest extends CirclesRequestBuilder { /** * return the FederatedLink identified by a remote Circle UniqueId and the Token of the link + * * @param string $token * @param string $uniqueId * |