Skip to content

Remove unused and deprecated methods from files_external MountConfig #24038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Nov 11, 2020
Merged

Remove unused and deprecated methods from files_external MountConfig #24038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions apps/files_external/lib/MountConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
use OCA\Files_External\AppInfo\Application;
use OCA\Files_External\Config\IConfigHandler;
use OCA\Files_External\Config\UserContext;
use OCA\Files_External\Config\UserPlaceholderHandler;
use OCA\Files_External\Lib\Auth\Builtin;
use OCA\Files_External\Lib\Backend\Backend;
use OCA\Files_External\Lib\Backend\LegacyBackend;
use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\Service\BackendService;
use OCA\Files_External\Service\GlobalStoragesService;
Expand All @@ -73,21 +70,6 @@ class MountConfig {
/** @var Application */
public static $app;

/**
* @param string $class
* @param array $definition
* @return bool
* @deprecated 8.2.0 use \OCA\Files_External\Service\BackendService::registerBackend()
*/
public static function registerBackend($class, $definition) {
$backendService = self::$app->getContainer()->query(BackendService::class);
$auth = self::$app->getContainer()->query(Builtin::class);

$backendService->registerBackend(new LegacyBackend($class, $definition, $auth));

return true;
}

/**
* Returns the mount points for the given user.
* The mount point is relative to the data directory.
Expand Down Expand Up @@ -150,24 +132,6 @@ public static function getSystemMountPoints() {
return $mountPoints;
}

/**
* Get the personal mount points of the current user
*
* @return array
*
* @deprecated 8.2.0 use UserStoragesService::getStorages()
*/
public static function getPersonalMountPoints() {
$mountPoints = [];
$service = self::$app->getContainer()->query(UserStoragesService::class);

foreach ($service->getStorages() as $storage) {
$mountPoints[] = self::prepareMountPointEntry($storage, true);
}

return $mountPoints;
}

/**
* Convert a StorageConfig to the legacy mountPoints array format
* There's a lot of extra information in here, to satisfy all of the legacy functions
Expand Down Expand Up @@ -201,19 +165,6 @@ private static function prepareMountPointEntry(StorageConfig $storage, $isPerson
return $mountEntry;
}

/**
* fill in the correct values for $user
*
* @param string $user user value
* @param string|array $input
* @return string
* @deprecated use self::substitutePlaceholdersInConfig($input)
*/
public static function setUserVars($user, $input) {
$handler = self::$app->getContainer()->query(UserPlaceholderHandler::class);
return $handler->handle($input);
}

/**
* @param mixed $input
* @param string|null $userId
Expand Down