From aee765f020cd2eb4e8e8fc85603c3fa339d10728 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 19 Aug 2016 18:29:34 +0200 Subject: [PATCH] Move files_external storage services to core --- .../appinfo/register_command.php | 5 +- .../files_external/lib/Command/Applicable.php | 4 +- apps/files_external/lib/Command/Config.php | 4 +- apps/files_external/lib/Command/Create.php | 4 +- apps/files_external/lib/Command/Delete.php | 6 +- apps/files_external/lib/Command/Import.php | 8 +- .../lib/Command/ListCommand.php | 4 +- apps/files_external/lib/Command/Verify.php | 10 +-- .../lib/Config/ConfigAdapter.php | 4 +- .../lib/Migration/StorageMigrator.php | 14 ++-- .../External}/Service/DBConfigService.php | 2 +- .../Service/GlobalLegacyStoragesService.php | 0 .../Service/GlobalStoragesService.php | 23 +++--- .../Service/ImportLegacyStoragesService.php | 2 +- .../Service/LegacyStoragesService.php | 2 +- .../External}/Service/StoragesService.php | 7 +- .../Service/UserGlobalStoragesService.php | 2 +- .../Service/UserLegacyStoragesService.php | 2 +- .../External}/Service/UserStoragesService.php | 11 +-- .../Files/External}/Service/UserTrait.php | 2 +- lib/private/Server.php | 18 ++++- lib/public/Files/External/IStorageConfig.php | 5 ++ .../Files/External}/NotFoundException.php | 4 +- .../External/Service/CleaningDBConfig.php | 39 ++++++++++ .../External}/Service/DBConfigServiceTest.php | 4 +- .../Service/GlobalStoragesServiceTest.php | 78 +++++++++---------- .../External}/Service/StoragesServiceTest.php | 32 ++------ .../Service/UserGlobalStoragesServiceTest.php | 12 +-- .../Service/UserStoragesServiceTest.php | 25 +++--- 29 files changed, 191 insertions(+), 142 deletions(-) rename {apps/files_external/lib => lib/private/Files/External}/Service/DBConfigService.php (99%) rename {apps/files_external/lib => lib/private/Files/External}/Service/GlobalLegacyStoragesService.php (100%) rename {apps/files_external/lib => lib/private/Files/External}/Service/GlobalStoragesService.php (93%) rename {apps/files_external/lib => lib/private/Files/External}/Service/ImportLegacyStoragesService.php (97%) rename {apps/files_external/lib => lib/private/Files/External}/Service/LegacyStoragesService.php (99%) rename {apps/files_external/lib => lib/private/Files/External}/Service/StoragesService.php (99%) rename {apps/files_external/lib => lib/private/Files/External}/Service/UserGlobalStoragesService.php (99%) rename {apps/files_external/lib => lib/private/Files/External}/Service/UserLegacyStoragesService.php (97%) rename {apps/files_external/lib => lib/private/Files/External}/Service/UserStoragesService.php (96%) rename {apps/files_external/lib => lib/private/Files/External}/Service/UserTrait.php (97%) rename {apps/files_external/lib => lib/public/Files/External}/NotFoundException.php (94%) create mode 100644 tests/lib/Files/External/Service/CleaningDBConfig.php rename {apps/files_external/tests => tests/lib/Files/External}/Service/DBConfigServiceTest.php (99%) rename {apps/files_external/tests => tests/lib/Files/External}/Service/GlobalStoragesServiceTest.php (89%) rename {apps/files_external/tests => tests/lib/Files/External}/Service/StoragesServiceTest.php (95%) rename {apps/files_external/tests => tests/lib/Files/External}/Service/UserGlobalStoragesServiceTest.php (97%) rename {apps/files_external/tests => tests/lib/Files/External}/Service/UserStoragesServiceTest.php (90%) diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php index 9e8035951a2a..e2ad209213df 100644 --- a/apps/files_external/appinfo/register_command.php +++ b/apps/files_external/appinfo/register_command.php @@ -38,8 +38,9 @@ $app = \OC_Mount_Config::$app; -$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService'); -$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService'); +$globalStorageService = OC::$server->getGlobalStoragesService(); +$userStorageService = OC::$server->getUserStoragesService(); +// TODO $importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService'); $backendService = OC::$server->getStoragesBackendService(); diff --git a/apps/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php index 6f99e1b92251..e0d90be5595c 100644 --- a/apps/files_external/lib/Command/Applicable.php +++ b/apps/files_external/lib/Command/Applicable.php @@ -24,8 +24,8 @@ use OC\Core\Command\Base; use OCP\Files\External\IStorageConfig; -use OCA\Files_External\NotFoundException; -use OCA\Files_External\Service\GlobalStoragesService; +use OCP\Files\External\NotFoundException; +use OC\Files\External\Service\GlobalStoragesService; use OCP\IGroupManager; use OCP\IUserManager; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/files_external/lib/Command/Config.php b/apps/files_external/lib/Command/Config.php index d942c369251b..7cea626ac1bb 100644 --- a/apps/files_external/lib/Command/Config.php +++ b/apps/files_external/lib/Command/Config.php @@ -24,8 +24,8 @@ use OC\Core\Command\Base; use OCP\Files\External\IStorageConfig; -use OCA\Files_External\NotFoundException; -use OCA\Files_External\Service\GlobalStoragesService; +use OCP\Files\External\NotFoundException; +use OC\Files\External\Service\GlobalStoragesService; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Helper\TableHelper; diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php index a10b49d46556..51fdb173f96e 100644 --- a/apps/files_external/lib/Command/Create.php +++ b/apps/files_external/lib/Command/Create.php @@ -30,8 +30,8 @@ use OCP\Files\External\DefinitionParameter; use OCP\Files\External\IStorageConfig; use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\UserStoragesService; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; use Symfony\Component\Console\Input\ArrayInput; diff --git a/apps/files_external/lib/Command/Delete.php b/apps/files_external/lib/Command/Delete.php index 7d9f69d8676b..4a9be35867f1 100644 --- a/apps/files_external/lib/Command/Delete.php +++ b/apps/files_external/lib/Command/Delete.php @@ -23,9 +23,9 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_External\NotFoundException; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\UserStoragesService; +use OCP\Files\External\NotFoundException; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; use Symfony\Component\Console\Input\ArrayInput; diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php index bc1edfe54558..26035ada7868 100644 --- a/apps/files_external/lib/Command/Import.php +++ b/apps/files_external/lib/Command/Import.php @@ -24,12 +24,12 @@ use OC\Core\Command\Base; use OC\User\NoUserException; -use OCA\Files_External\Lib\StorageConfig; +use OC\Files\External\Lib\StorageConfig; use OCP\Files\External\IStorageConfig; use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\ImportLegacyStoragesService; -use OCA\Files_External\Service\UserStoragesService; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\ImportLegacyStoragesService; +use OC\Files\External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; use Symfony\Component\Console\Input\ArrayInput; diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index 48bdff03ba1a..6594a931819f 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -25,8 +25,8 @@ use OC\Core\Command\Base; use OC\User\NoUserException; use OCP\Files\External\IStorageConfig; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\UserStoragesService; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; use Symfony\Component\Console\Helper\Table; diff --git a/apps/files_external/lib/Command/Verify.php b/apps/files_external/lib/Command/Verify.php index abf279756620..42ca4bb36889 100644 --- a/apps/files_external/lib/Command/Verify.php +++ b/apps/files_external/lib/Command/Verify.php @@ -23,12 +23,12 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_External\Lib\Auth\AuthMechanism; -use OCA\Files_External\Lib\Backend\Backend; -use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCP\Files\External\Auth\AuthMechanism; +use OCP\Files\External\Backend\Backend; +use OCP\Files\External\Lib\InsufficientDataForMeaningfulAnswerException; use OCP\Files\External\IStorageConfig; -use OCA\Files_External\NotFoundException; -use OCA\Files_External\Service\GlobalStoragesService; +use OCP\Files\External\NotFoundException; +use OC\Files\External\Service\GlobalStoragesService; use OCP\Files\StorageNotAvailableException; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php index 2ca568002934..3fc240b74fa0 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -33,8 +33,8 @@ use OCA\Files_External\Lib\PersonalMount; use OCP\Files\Config\IMountProvider; use OCP\IUser; -use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\Service\UserGlobalStoragesService; +use OC\Files\External\Service\UserStoragesService; +use OC\Files\External\Service\UserGlobalStoragesService; use OCP\Files\External\IStorageConfig; use OC\Files\Storage\FailedStorage; use OCP\Files\StorageNotAvailableException; diff --git a/apps/files_external/lib/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php index 00e2db8fe104..8c5dd5949f3e 100644 --- a/apps/files_external/lib/Migration/StorageMigrator.php +++ b/apps/files_external/lib/Migration/StorageMigrator.php @@ -24,13 +24,13 @@ namespace OCA\Files_External\Migration; use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Service\DBConfigService; -use OCA\Files_External\Service\GlobalLegacyStoragesService; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\LegacyStoragesService; -use OCA\Files_External\Service\StoragesService; -use OCA\Files_External\Service\UserLegacyStoragesService; -use OCA\Files_External\Service\UserStoragesService; +use OC\Files\External\Service\DBConfigService; +use OC\Files\External\Service\GlobalLegacyStoragesService; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\LegacyStoragesService; +use OC\Files\External\Service\StoragesService; +use OC\Files\External\Service\UserLegacyStoragesService; +use OC\Files\External\Service\UserStoragesService; use OCP\Files\Config\IUserMountCache; use OCP\IConfig; use OCP\IDBConnection; diff --git a/apps/files_external/lib/Service/DBConfigService.php b/lib/private/Files/External/Service/DBConfigService.php similarity index 99% rename from apps/files_external/lib/Service/DBConfigService.php rename to lib/private/Files/External/Service/DBConfigService.php index 3e38f4aed94d..e883e11502c6 100644 --- a/apps/files_external/lib/Service/DBConfigService.php +++ b/lib/private/Files/External/Service/DBConfigService.php @@ -21,7 +21,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; diff --git a/apps/files_external/lib/Service/GlobalLegacyStoragesService.php b/lib/private/Files/External/Service/GlobalLegacyStoragesService.php similarity index 100% rename from apps/files_external/lib/Service/GlobalLegacyStoragesService.php rename to lib/private/Files/External/Service/GlobalLegacyStoragesService.php diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/lib/private/Files/External/Service/GlobalStoragesService.php similarity index 93% rename from apps/files_external/lib/Service/GlobalStoragesService.php rename to lib/private/Files/External/Service/GlobalStoragesService.php index d579a14e13c4..e55d717cb1d8 100644 --- a/apps/files_external/lib/Service/GlobalStoragesService.php +++ b/lib/private/Files/External/Service/GlobalStoragesService.php @@ -24,10 +24,11 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; + use OCP\Files\External\IStorageConfig; use OCP\Files\External\IStoragesBackendService; @@ -51,7 +52,7 @@ protected function triggerHooks(IStorageConfig $storage, $signal) { $this->triggerApplicableHooks( $signal, $storage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, ['all'] ); return; @@ -60,13 +61,13 @@ protected function triggerHooks(IStorageConfig $storage, $signal) { $this->triggerApplicableHooks( $signal, $storage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $applicableUsers ); $this->triggerApplicableHooks( $signal, $storage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, $applicableGroups ); } @@ -100,7 +101,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_delete_mount, $oldStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, ['all'] ); } @@ -109,7 +110,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_delete_mount, $oldStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $userDeletions ); @@ -117,7 +118,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_delete_mount, $oldStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, $groupDeletions ); @@ -125,7 +126,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_create_mount, $newStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $userAdditions ); @@ -133,7 +134,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_create_mount, $newStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, $groupAdditions ); @@ -145,7 +146,7 @@ protected function triggerChangeHooks(IStorageConfig $oldStorage, IStorageConfig $this->triggerApplicableHooks( Filesystem::signal_create_mount, $newStorage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, ['all'] ); } diff --git a/apps/files_external/lib/Service/ImportLegacyStoragesService.php b/lib/private/Files/External/Service/ImportLegacyStoragesService.php similarity index 97% rename from apps/files_external/lib/Service/ImportLegacyStoragesService.php rename to lib/private/Files/External/Service/ImportLegacyStoragesService.php index 0e7d154d67b0..eff33094a054 100644 --- a/apps/files_external/lib/Service/ImportLegacyStoragesService.php +++ b/lib/private/Files/External/Service/ImportLegacyStoragesService.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OCP\Files\External\IStoragesBackendService; diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/lib/private/Files/External/Service/LegacyStoragesService.php similarity index 99% rename from apps/files_external/lib/Service/LegacyStoragesService.php rename to lib/private/Files/External/Service/LegacyStoragesService.php index f18651641e3e..aef5dc8b20a3 100644 --- a/apps/files_external/lib/Service/LegacyStoragesService.php +++ b/lib/private/Files/External/Service/LegacyStoragesService.php @@ -21,7 +21,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OCP\Files\External\IStorageConfig; use OCP\Files\External\IStoragesBackendService; diff --git a/apps/files_external/lib/Service/StoragesService.php b/lib/private/Files/External/Service/StoragesService.php similarity index 99% rename from apps/files_external/lib/Service/StoragesService.php rename to lib/private/Files/External/Service/StoragesService.php index dd90abbf04a6..a49d97e8bb6f 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/lib/private/Files/External/Service/StoragesService.php @@ -25,17 +25,18 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OC\Files\Filesystem; +use OC\Files\External\StorageConfig; + use OCP\Files\External\IStorageConfig; use OCP\Files\External\Backend\Backend; use OCP\Files\External\Auth\AuthMechanism; use OCP\Files\Config\IUserMountCache; use OCP\Files\StorageNotAvailableException; use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Lib\StorageConfig; -use OCA\Files_External\NotFoundException; +use OCP\Files\External\NotFoundException; /** * Service class to manage external storages diff --git a/apps/files_external/lib/Service/UserGlobalStoragesService.php b/lib/private/Files/External/Service/UserGlobalStoragesService.php similarity index 99% rename from apps/files_external/lib/Service/UserGlobalStoragesService.php rename to lib/private/Files/External/Service/UserGlobalStoragesService.php index 9249c4e96414..9cf8a946f3df 100644 --- a/apps/files_external/lib/Service/UserGlobalStoragesService.php +++ b/lib/private/Files/External/Service/UserGlobalStoragesService.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OCP\Files\Config\IUserMountCache; use OCP\IUserSession; diff --git a/apps/files_external/lib/Service/UserLegacyStoragesService.php b/lib/private/Files/External/Service/UserLegacyStoragesService.php similarity index 97% rename from apps/files_external/lib/Service/UserLegacyStoragesService.php rename to lib/private/Files/External/Service/UserLegacyStoragesService.php index 75fec5a73ea6..81d0640d7763 100644 --- a/apps/files_external/lib/Service/UserLegacyStoragesService.php +++ b/lib/private/Files/External/Service/UserLegacyStoragesService.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use OCP\IUserSession; use OCP\Files\External\IStoragesBackendService; diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/lib/private/Files/External/Service/UserStoragesService.php similarity index 96% rename from apps/files_external/lib/Service/UserStoragesService.php rename to lib/private/Files/External/Service/UserStoragesService.php index 2aa8c572e267..349d9d6c53c1 100644 --- a/apps/files_external/lib/Service/UserStoragesService.php +++ b/lib/private/Files/External/Service/UserStoragesService.php @@ -23,16 +23,17 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; + +use OC\Files\Filesystem; +use OC\Files\External\Service\UserTrait; use OCP\Files\Config\IUserMountCache; use OCP\IUserSession; -use OC\Files\Filesystem; use OCP\Files\External\IStorageConfig; -use OCA\Files_External\NotFoundException; +use OCP\Files\External\NotFoundException; use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Service\UserTrait; /** * Service class to manage user external storages @@ -77,7 +78,7 @@ protected function triggerHooks(IStorageConfig $storage, $signal) { $this->triggerApplicableHooks( $signal, $storage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, [$user] ); } diff --git a/apps/files_external/lib/Service/UserTrait.php b/lib/private/Files/External/Service/UserTrait.php similarity index 97% rename from apps/files_external/lib/Service/UserTrait.php rename to lib/private/Files/External/Service/UserTrait.php index 536c0f67e1f8..31502bd2f603 100644 --- a/apps/files_external/lib/Service/UserTrait.php +++ b/lib/private/Files/External/Service/UserTrait.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_External\Service; +namespace OC\Files\External\Service; use \OCP\IUserSession; use \OCP\IUser; diff --git a/lib/private/Server.php b/lib/private/Server.php index fa586dcaaa87..a8caeb1be0f1 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -84,6 +84,9 @@ use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use OC\Files\External\StoragesBackendService; +use OC\Files\External\Service\UserStoragesService; +use OC\Files\External\Service\UserGlobalStoragesService; +use OC\Files\External\Service\GlobalStoragesService; /** * Class Server @@ -662,6 +665,15 @@ public function __construct($webRoot, \OC\Config $config) { $this->registerService('StoragesBackendService', function (Server $c) { return new StoragesBackendService($c->query('AllConfig')); }); + $this->registerService('GlobalStoragesService', function (Server $c) { + return new GlobalStoragesService($c->query('AllConfig')); + }); + $this->registerService('UserGlobalStoragesService', function (Server $c) { + return new UserGlobalStoragesService($c->query('AllConfig')); + }); + $this->registerService('UserStoragesService', function (Server $c) { + return new UserStoragesService($c->query('AllConfig')); + }); $this->registerService('ShareManager', function(Server $c) { $config = $c->getConfig(); $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory'); @@ -1335,7 +1347,7 @@ public function getStoragesBackendService() { * @return \OCA\Files_External\Service\GlobalStoragesService */ public function getGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService'); + return $this->query('GlobalStoragesService'); } /** @@ -1344,7 +1356,7 @@ public function getGlobalStoragesService() { * @return \OCA\Files_External\Service\UserGlobalStoragesService */ public function getUserGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); + return $this->query('UserGlobalStoragesService'); } /** @@ -1353,7 +1365,7 @@ public function getUserGlobalStoragesService() { * @return \OCA\Files_External\Service\UserStoragesService */ public function getUserStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService'); + return $this->query('UserStoragesService'); } /** diff --git a/lib/public/Files/External/IStorageConfig.php b/lib/public/Files/External/IStorageConfig.php index 1b98352bec31..18650a288f3c 100644 --- a/lib/public/Files/External/IStorageConfig.php +++ b/lib/public/Files/External/IStorageConfig.php @@ -39,6 +39,11 @@ interface IStorageConfig extends \JsonSerializable { const MOUNT_TYPE_ADMIN = 1; const MOUNT_TYPE_PERSONAl = 2; + const MOUNT_TYPE_GLOBAL = 'global'; + const MOUNT_TYPE_GROUP = 'group'; + const MOUNT_TYPE_USER = 'user'; + const MOUNT_TYPE_PERSONAL = 'personal'; + /** * Returns the configuration id * diff --git a/apps/files_external/lib/NotFoundException.php b/lib/public/Files/External/NotFoundException.php similarity index 94% rename from apps/files_external/lib/NotFoundException.php rename to lib/public/Files/External/NotFoundException.php index 607c3c7618ac..bd5485732e2a 100644 --- a/apps/files_external/lib/NotFoundException.php +++ b/lib/public/Files/External/NotFoundException.php @@ -20,10 +20,12 @@ * */ -namespace OCA\Files_External; +namespace OCP\Files\External; /** * Storage is not found + * + * @since 9.2 */ class NotFoundException extends \Exception { } diff --git a/tests/lib/Files/External/Service/CleaningDBConfig.php b/tests/lib/Files/External/Service/CleaningDBConfig.php new file mode 100644 index 000000000000..e447e9327115 --- /dev/null +++ b/tests/lib/Files/External/Service/CleaningDBConfig.php @@ -0,0 +1,39 @@ + + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ +namespace Test\Files\External\Service; + +use OC\Files\External\Service\DBConfigService; + +class CleaningDBConfig extends DBConfigService { + private $mountIds = []; + + public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) { + $id = parent::addMount($mountPoint, $storageBackend, $authBackend, $priority, $type); // TODO: Change the autogenerated stub + $this->mountIds[] = $id; + return $id; + } + + public function clean() { + foreach ($this->mountIds as $id) { + $this->removeMount($id); + } + } +} diff --git a/apps/files_external/tests/Service/DBConfigServiceTest.php b/tests/lib/Files/External/Service/DBConfigServiceTest.php similarity index 99% rename from apps/files_external/tests/Service/DBConfigServiceTest.php rename to tests/lib/Files/External/Service/DBConfigServiceTest.php index 3cfa33f0bc87..9d6deeb0d482 100644 --- a/apps/files_external/tests/Service/DBConfigServiceTest.php +++ b/tests/lib/Files/External/Service/DBConfigServiceTest.php @@ -20,10 +20,10 @@ * */ -namespace OCA\Files_External\Tests\Service; +namespace Test\Files\External\Service; -use OCA\Files_External\Service\DBConfigService; +use OC\Files\External\Service\DBConfigService; use OCP\IDBConnection; use Test\TestCase; diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/tests/lib/Files/External/Service/GlobalStoragesServiceTest.php similarity index 89% rename from apps/files_external/tests/Service/GlobalStoragesServiceTest.php rename to tests/lib/Files/External/Service/GlobalStoragesServiceTest.php index 81cb02c52368..8633bf930a72 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/tests/lib/Files/External/Service/GlobalStoragesServiceTest.php @@ -21,11 +21,11 @@ * along with this program. If not, see * */ -namespace OCA\Files_External\Tests\Service; +namespace Test\Files\External\Service; use \OC\Files\Filesystem; - -use \OCA\Files_External\Service\GlobalStoragesService; +use \OC\Files\External\Service\GlobalStoragesService; +use OCP\Files\External\IStorageConfig; /** * @group DB @@ -198,7 +198,7 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'all' ], ], @@ -211,7 +211,7 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], ], @@ -224,7 +224,7 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1', ], ], @@ -236,12 +236,12 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], ], @@ -254,12 +254,12 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1' ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -272,22 +272,22 @@ function hooksAddStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1' ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -330,27 +330,27 @@ function hooksUpdateStorageDataProvider() { // delete the "all entry" [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'all', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1' ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -365,12 +365,12 @@ function hooksUpdateStorageDataProvider() { [ [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -385,12 +385,12 @@ function hooksUpdateStorageDataProvider() { [ [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -405,18 +405,18 @@ function hooksUpdateStorageDataProvider() { [ [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1' ], // create the "all" entry [ Filesystem::signal_create_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'all' ], ], @@ -489,50 +489,50 @@ public function testHooksRenameMountPoint() { [ Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1', ], [ Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2', ], // creates new one [ Filesystem::signal_create_mount, '/renamedMountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_create_mount, '/renamedMountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_create_mount, '/renamedMountpoint', - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1', ], [ Filesystem::signal_create_mount, '/renamedMountpoint', - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2', ], ]; @@ -559,22 +559,22 @@ function hooksDeleteStorageDataProvider() { [ [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user1', ], [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'user2', ], [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group1' ], [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_GROUP, + IStorageConfig::MOUNT_TYPE_GROUP, 'group2' ], ], @@ -586,7 +586,7 @@ function hooksDeleteStorageDataProvider() { [ [ Filesystem::signal_delete_mount, - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, 'all', ], ], diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/tests/lib/Files/External/Service/StoragesServiceTest.php similarity index 95% rename from apps/files_external/tests/Service/StoragesServiceTest.php rename to tests/lib/Files/External/Service/StoragesServiceTest.php index 1bc1d8a2bf3e..85d2fa2c9ca9 100644 --- a/apps/files_external/tests/Service/StoragesServiceTest.php +++ b/tests/lib/Files/External/Service/StoragesServiceTest.php @@ -21,31 +21,15 @@ * along with this program. If not, see * */ -namespace OCA\Files_External\Tests\Service; +namespace Test\Files\External\Service; -use \OC\Files\Filesystem; - -use OCA\Files_External\NotFoundException; +use OC\Files\Filesystem; use OC\Files\External\StorageConfig; -use OCP\Files\External\IStoragesBackendService; -use OCA\Files_External\Service\DBConfigService; -use OCA\Files_External\Service\StoragesService; - -class CleaningDBConfig extends DBConfigService { - private $mountIds = []; - - public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) { - $id = parent::addMount($mountPoint, $storageBackend, $authBackend, $priority, $type); // TODO: Change the autogenerated stub - $this->mountIds[] = $id; - return $id; - } +use OC\Files\External\Service\DBConfigService; +use OC\Files\External\Service\StoragesService; - public function clean() { - foreach ($this->mountIds as $id) { - $this->removeMount($id); - } - } -} +use OCP\Files\External\NotFoundException; +use OCP\Files\External\IStoragesBackendService; /** * @group DB @@ -242,7 +226,7 @@ protected function makeStorageConfig($data) { /** - * @expectedException \OCA\Files_External\NotFoundException + * @expectedException \OCP\Files\External\NotFoundException */ public function testNonExistingStorage() { $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB'); @@ -325,7 +309,7 @@ public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCou } /** - * @expectedException \OCA\Files_External\NotFoundException + * @expectedException \OCP\Files\External\NotFoundException */ public function testDeleteUnexistingStorage() { $this->service->removeStorage(255); diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/tests/lib/Files/External/Service/UserGlobalStoragesServiceTest.php similarity index 97% rename from apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php rename to tests/lib/Files/External/Service/UserGlobalStoragesServiceTest.php index 93a0dae8ae6a..233cfc792299 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/tests/lib/Files/External/Service/UserGlobalStoragesServiceTest.php @@ -21,13 +21,15 @@ * along with this program. If not, see * */ -namespace OCA\Files_External\Tests\Service; +namespace Test\Files\External\Service; -use OCA\Files_External\Lib\StorageConfig; -use OCA\Files_External\NotFoundException; -use OCA\Files_External\Service\StoragesService; -use OCA\Files_External\Service\UserGlobalStoragesService; +use OC\Files\External\StorageConfig; +use OC\Files\External\Service\StoragesService; +use OC\Files\External\Service\UserGlobalStoragesService; + +use OCP\Files\External\NotFoundException; use OCP\IUser; + use Test\Traits\UserTrait; /** diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/tests/lib/Files/External/Service/UserStoragesServiceTest.php similarity index 90% rename from apps/files_external/tests/Service/UserStoragesServiceTest.php rename to tests/lib/Files/External/Service/UserStoragesServiceTest.php index 7e754e420404..912c1a1d2502 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/tests/lib/Files/External/Service/UserStoragesServiceTest.php @@ -21,15 +21,16 @@ * along with this program. If not, see * */ -namespace OCA\Files_External\Tests\Service; +namespace Test\Files\External\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; -use OCA\Files_External\Service\GlobalStoragesService; -use OCA\Files_External\Service\StoragesService; -use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\Lib\StorageConfig; +use OC\Files\External\Service\GlobalStoragesService; +use OC\Files\External\Service\StoragesService; +use OC\Files\External\Service\UserStoragesService; +use OC\Files\External\StorageConfig; use Test\Traits\UserTrait; +use OCP\Files\External\IStorageConfig; /** * @group DB @@ -101,7 +102,7 @@ public function testAddStorage() { current(self::$hookCalls), Filesystem::signal_create_mount, $storage->getMountPoint(), - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $this->userId ); @@ -152,7 +153,7 @@ public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCou self::$hookCalls[1], Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $this->userId ); } @@ -173,20 +174,20 @@ public function testHooksRenameMountPoint() { self::$hookCalls[0], Filesystem::signal_delete_mount, '/mountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $this->userId ); $this->assertHookCall( self::$hookCalls[1], Filesystem::signal_create_mount, '/renamedMountpoint', - \OC_Mount_Config::MOUNT_TYPE_USER, + IStorageConfig::MOUNT_TYPE_USER, $this->userId ); } /** - * @expectedException \OCA\Files_External\NotFoundException + * @expectedException \OCP\Files\External\NotFoundException */ public function testGetAdminStorage() { $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB'); @@ -201,7 +202,7 @@ public function testGetAdminStorage() { $newStorage = $this->globalStoragesService->addStorage($storage); - $this->assertInstanceOf('\OCA\Files_External\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId())); + $this->assertInstanceOf('\OC\Files\External\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId())); $this->service->getStorage($newStorage->getId()); }