mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16450 from nextcloud/tech-debt/noid/cleanup-unused-OC_API-methods 

Removes unused OC_API::register
This commit is contained in:
Morris Jobke 2019-07-22 16:04:01 +02:00 committed by GitHub
parent 9563c78674 54bcd86db7
commit 3a6d8174a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/App/CodeChecker/DeprecationCheck.php
View File

@ -38,6 +38,7 @@ class DeprecationCheck extends AbstractCheck {
return [
'OC_JSON' => '8.2.0',
'OCP\API' => '9.1.0',
'OCP\Contacts' => '8.1.0',
'OCP\DB' => '8.1.0',
'OCP\JSON' => '8.1.0',
@ -55,6 +56,15 @@ class DeprecationCheck extends AbstractCheck {
*/
protected function getLocalConstants() {
return [
'OCP\API::GUEST_AUTH' => '9.1.0',
'OCP\API::USER_AUTH' => '9.1.0',
'OCP\API::SUBADMIN_AUTH' => '9.1.0',
'OCP\API::ADMIN_AUTH' => '9.1.0',
'OCP\API::RESPOND_UNAUTHORISED' => '9.1.0',
'OCP\API::RESPOND_SERVER_ERROR' => '9.1.0',
'OCP\API::RESPOND_NOT_FOUND' => '9.1.0',
'OCP\API::RESPOND_UNKNOWN_ERROR' => '9.1.0',
'OC_API::GUEST_AUTH' => '8.2.0',
'OC_API::USER_AUTH' => '8.2.0',
'OC_API::SUBADMIN_AUTH' => '8.2.0',

30
lib/private/legacy/api.php
View File

@ -42,36 +42,6 @@ class OC_API {
*/
protected static $actions = array();
/**
* registers an api call
* @param string $method the http method
* @param string $url the url to match
* @param callable $action the function to run
* @param string $app the id of the app registering the call
* @param int $authLevel the level of authentication required for the call
* @param array $defaults
* @param array $requirements
*/
public static function register($method, $url, $action, $app,
$authLevel = API::USER_AUTH,
$defaults = array(),
$requirements = array()) {
$name = strtolower($method).$url;
$name = str_replace(array('/', '{', '}'), '_', $name);
if(!isset(self::$actions[$name])) {
$oldCollection = OC::$server->getRouter()->getCurrentCollection();
OC::$server->getRouter()->useCollection('ocs');
OC::$server->getRouter()->create($name, $url)
->method($method)
->defaults($defaults)
->requirements($requirements)
->action('OC_API', 'call');
self::$actions[$name] = array();
OC::$server->getRouter()->useCollection($oldCollection);
}
self::$actions[$name][] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
}
/**
* respond to a call
* @param \OC\OCS\Result $result

28
lib/public/API.php
View File

@ -40,16 +40,6 @@ namespace OCP;
* @deprecated 9.1.0 Use the AppFramework
*/
class API {
/**
* API authentication levels
* @since 8.1.0
*/
const GUEST_AUTH = 0;
const USER_AUTH = 1;
const SUBADMIN_AUTH = 2;
const ADMIN_AUTH = 3;
/**
* API Response Codes
* @since 8.1.0
@ -58,22 +48,4 @@ class API {
const RESPOND_SERVER_ERROR = 996;
const RESPOND_NOT_FOUND = 998;
const RESPOND_UNKNOWN_ERROR = 999;
/**
* registers an api call
* @param string $method the http method
* @param string $url the url to match
* @param callable $action the function to run
* @param string $app the id of the app registering the call
* @param int $authLevel the level of authentication required for the call (See `self::*_AUTH` constants)
* @param array $defaults
* @param array $requirements
* @since 5.0.0
* @deprecated 9.1.0 Use the AppFramework
*/
public static function register($method, $url, $action, $app, $authLevel = self::USER_AUTH,
$defaults = array(), $requirements = array()){
\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
}
}