From 328b3c47d7fdf61b6de3c2d9129d392d3a9f5a87 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:22:28 +0200 Subject: [PATCH 1/7] Move stuff from outside lib/ to PSR-4 --- apps/files_external/appinfo/app.php | 2 +- apps/files_external/appinfo/info.xml | 2 ++ apps/files_external/appinfo/register_command.php | 6 +++--- apps/files_external/appinfo/routes.php | 2 -- apps/files_external/appinfo/update.php | 4 ++-- .../application.php => lib/AppInfo/Application.php} | 2 +- .../applicable.php => lib/Command/Applicable.php} | 5 +---- .../backends.php => lib/Command/Backends.php} | 0 .../{command/config.php => lib/Command/Config.php} | 2 +- .../{command/create.php => lib/Command/Create.php} | 9 ++------- .../{command/delete.php => lib/Command/Delete.php} | 8 ++------ .../{command/export.php => lib/Command/Export.php} | 0 .../{command/import.php => lib/Command/Import.php} | 10 +++------- .../listcommand.php => lib/Command/ListCommand.php} | 5 ++--- .../{command/option.php => lib/Command/Option.php} | 10 ---------- .../{command/verify.php => lib/Command/Verify.php} | 5 +---- .../Controller/AjaxController.php} | 0 .../Controller/GlobalStoragesController.php} | 7 +------ .../Controller/StoragesController.php} | 6 +----- .../Controller/UserGlobalStoragesController.php} | 2 +- .../Controller/UserStoragesController.php} | 6 +----- .../Migration/DummyUserSession.php} | 2 +- .../Migration/StorageMigrator.php} | 12 ++++-------- .../Service/BackendService.php} | 0 .../Service/DBConfigService.php} | 0 .../Service/GlobalLegacyStoragesService.php} | 2 +- .../Service/GlobalStoragesService.php} | 2 +- .../Service/ImportLegacyStoragesService.php} | 2 +- .../Service/LegacyStoragesService.php} | 2 +- .../Service/StoragesService.php} | 2 +- .../Service/UserGlobalStoragesService.php} | 3 --- .../Service/UserLegacyStoragesService.php} | 2 +- .../Service/UserStoragesService.php} | 2 +- .../usertrait.php => lib/Service/UserTrait.php} | 0 apps/files_external/lib/config/configadapter.php | 4 ++-- apps/files_external/personal.php | 2 +- apps/files_external/settings.php | 2 +- .../ApplicableTest.php} | 0 .../commandtest.php => Command/CommandTest.php} | 4 ++-- .../ListCommandTest.php} | 8 ++++---- .../GlobalStoragesControllerTest.php} | 8 +++----- .../StoragesControllerTest.php} | 6 +++--- .../UserStoragesControllerTest.php} | 9 +++------ .../BackendServiceTest.php} | 0 .../DBConfigServiceTest.php} | 0 .../GlobalStoragesServiceTest.php} | 10 ++++------ .../StoragesServiceTest.php} | 4 ++-- .../UserGlobalStoragesServiceTest.php} | 7 ++----- .../UserStoragesServiceTest.php} | 9 ++++----- 49 files changed, 68 insertions(+), 129 deletions(-) rename apps/files_external/{appinfo/application.php => lib/AppInfo/Application.php} (99%) rename apps/files_external/{command/applicable.php => lib/Command/Applicable.php} (96%) rename apps/files_external/{command/backends.php => lib/Command/Backends.php} (100%) rename apps/files_external/{command/config.php => lib/Command/Config.php} (98%) rename apps/files_external/{command/create.php => lib/Command/Create.php} (95%) rename apps/files_external/{command/delete.php => lib/Command/Delete.php} (91%) rename apps/files_external/{command/export.php => lib/Command/Export.php} (100%) rename apps/files_external/{command/import.php => lib/Command/Import.php} (95%) rename apps/files_external/{command/listcommand.php => lib/Command/ListCommand.php} (97%) rename apps/files_external/{command/option.php => lib/Command/Option.php} (84%) rename apps/files_external/{command/verify.php => lib/Command/Verify.php} (95%) rename apps/files_external/{controller/ajaxcontroller.php => lib/Controller/AjaxController.php} (100%) rename apps/files_external/{controller/globalstoragescontroller.php => lib/Controller/GlobalStoragesController.php} (95%) rename apps/files_external/{controller/storagescontroller.php => lib/Controller/StoragesController.php} (98%) rename apps/files_external/{controller/userglobalstoragescontroller.php => lib/Controller/UserGlobalStoragesController.php} (98%) rename apps/files_external/{controller/userstoragescontroller.php => lib/Controller/UserStoragesController.php} (96%) rename apps/files_external/{migration/dummyusersession.php => lib/Migration/DummyUserSession.php} (96%) rename apps/files_external/{migration/storagemigrator.php => lib/Migration/StorageMigrator.php} (90%) rename apps/files_external/{service/backendservice.php => lib/Service/BackendService.php} (100%) rename apps/files_external/{service/dbconfigservice.php => lib/Service/DBConfigService.php} (100%) rename apps/files_external/{service/globallegacystoragesservice.php => lib/Service/GlobalLegacyStoragesService.php} (97%) rename apps/files_external/{service/globalstoragesservice.php => lib/Service/GlobalStoragesService.php} (99%) rename apps/files_external/{service/importlegacystoragesservice.php => lib/Service/ImportLegacyStoragesService.php} (96%) rename apps/files_external/{service/legacystoragesservice.php => lib/Service/LegacyStoragesService.php} (99%) rename apps/files_external/{service/storagesservice.php => lib/Service/StoragesService.php} (99%) rename apps/files_external/{service/userglobalstoragesservice.php => lib/Service/UserGlobalStoragesService.php} (97%) rename apps/files_external/{service/userlegacystoragesservice.php => lib/Service/UserLegacyStoragesService.php} (97%) rename apps/files_external/{service/userstoragesservice.php => lib/Service/UserStoragesService.php} (99%) rename apps/files_external/{service/usertrait.php => lib/Service/UserTrait.php} (100%) rename apps/files_external/tests/{command/applicabletest.php => Command/ApplicableTest.php} (100%) rename apps/files_external/tests/{command/commandtest.php => Command/CommandTest.php} (96%) rename apps/files_external/tests/{command/listcommandtest.php => Command/ListCommandTest.php} (91%) rename apps/files_external/tests/{controller/globalstoragescontrollertest.php => Controller/GlobalStoragesControllerTest.php} (84%) rename apps/files_external/tests/{controller/storagescontrollertest.php => Controller/StoragesControllerTest.php} (98%) rename apps/files_external/tests/{controller/userstoragescontrollertest.php => Controller/UserStoragesControllerTest.php} (89%) rename apps/files_external/tests/{service/backendservicetest.php => Service/BackendServiceTest.php} (100%) rename apps/files_external/tests/{service/dbconfigservicetest.php => Service/DBConfigServiceTest.php} (100%) rename apps/files_external/tests/{service/globalstoragesservicetest.php => Service/GlobalStoragesServiceTest.php} (97%) rename apps/files_external/tests/{service/storagesservicetest.php => Service/StoragesServiceTest.php} (99%) rename apps/files_external/tests/{service/userglobalstoragesservicetest.php => Service/UserGlobalStoragesServiceTest.php} (98%) rename apps/files_external/tests/{service/userstoragesservicetest.php => Service/UserStoragesServiceTest.php} (96%) diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 18f8b2551fa..26358886c0b 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -31,7 +31,7 @@ OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; require_once __DIR__ . '/../3rdparty/autoload.php'; // register Application object singleton -\OC_Mount_Config::$app = new \OCA\Files_external\Appinfo\Application(); +\OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application(); $appContainer = \OC_Mount_Config::$app->getContainer(); \OC_Mount_Config::$app->registerSettings(); diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index 2b192c94aa4..25df58c6368 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -19,6 +19,8 @@ 166048 + Files_External + diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php index 927ce9869f9..65ac2286fa0 100644 --- a/apps/files_external/appinfo/register_command.php +++ b/apps/files_external/appinfo/register_command.php @@ -37,9 +37,9 @@ $groupManager = OC::$server->getGroupManager(); $app = \OC_Mount_Config::$app; -$globalStorageService = $app->getContainer()->query('\OCA\Files_external\Service\GlobalStoragesService'); -$userStorageService = $app->getContainer()->query('\OCA\Files_external\Service\UserStoragesService'); -$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_external\Service\ImportLegacyStoragesService'); +$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService'); +$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService'); +$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService'); $backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService'); /** @var Symfony\Component\Console\Application $application */ diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php index e2f55e652a8..703b2cd265f 100644 --- a/apps/files_external/appinfo/routes.php +++ b/apps/files_external/appinfo/routes.php @@ -26,8 +26,6 @@ * */ -namespace OCA\Files_External\AppInfo; - /** * @var $this \OCP\Route\IRouter **/ diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php index 8cc2422c7ff..62dfbadc936 100644 --- a/apps/files_external/appinfo/update.php +++ b/apps/files_external/appinfo/update.php @@ -21,10 +21,10 @@ $installedVersion = \OC::$server->getConfig()->getAppValue('files_external', 'installed_version'); -$app = new \OCA\Files_external\Appinfo\Application(); +$app = new \OCA\Files_External\AppInfo\Application(); // Migration to db config if (version_compare($installedVersion, '0.5.0', '<')) { - $migrator = $app->getContainer()->query('OCA\Files_external\Migration\StorageMigrator'); + $migrator = $app->getContainer()->query('OCA\Files_External\Migration\StorageMigrator'); $migrator->migrateGlobal(); } diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/lib/AppInfo/Application.php similarity index 99% rename from apps/files_external/appinfo/application.php rename to apps/files_external/lib/AppInfo/Application.php index 5d490c6091f..d7c650526b3 100644 --- a/apps/files_external/appinfo/application.php +++ b/apps/files_external/lib/AppInfo/Application.php @@ -34,7 +34,7 @@ use \OCA\Files_External\Lib\Config\IBackendProvider; use \OCA\Files_External\Lib\Config\IAuthMechanismProvider; /** - * @package OCA\Files_External\Appinfo + * @package OCA\Files_External\AppInfo */ class Application extends App implements IBackendProvider, IAuthMechanismProvider { diff --git a/apps/files_external/command/applicable.php b/apps/files_external/lib/Command/Applicable.php similarity index 96% rename from apps/files_external/command/applicable.php rename to apps/files_external/lib/Command/Applicable.php index 7e6c99d2915..902e76cb4cb 100644 --- a/apps/files_external/command/applicable.php +++ b/apps/files_external/lib/Command/Applicable.php @@ -24,12 +24,9 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; use OCA\Files_external\Lib\StorageConfig; use OCA\Files_external\NotFoundException; -use OCA\Files_external\Service\GlobalStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; use OCP\IGroupManager; use OCP\IUserManager; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/apps/files_external/command/backends.php b/apps/files_external/lib/Command/Backends.php similarity index 100% rename from apps/files_external/command/backends.php rename to apps/files_external/lib/Command/Backends.php diff --git a/apps/files_external/command/config.php b/apps/files_external/lib/Command/Config.php similarity index 98% rename from apps/files_external/command/config.php rename to apps/files_external/lib/Command/Config.php index 1403c24b345..873fece86d7 100644 --- a/apps/files_external/command/config.php +++ b/apps/files_external/lib/Command/Config.php @@ -24,7 +24,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; use OCA\Files_external\Lib\StorageConfig; use OCA\Files_external\NotFoundException; -use OCA\Files_external\Service\GlobalStoragesService; +use OCA\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/command/create.php b/apps/files_external/lib/Command/Create.php similarity index 95% rename from apps/files_external/command/create.php rename to apps/files_external/lib/Command/Create.php index 315b23f9d3c..17ad7ef1a16 100644 --- a/apps/files_external/command/create.php +++ b/apps/files_external/lib/Command/Create.php @@ -29,19 +29,14 @@ use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\DefinitionParameter; use OCA\Files_external\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; -use OCA\Files_external\Service\GlobalStoragesService; -use OCA\Files_external\Service\ImportLegacyStoragesService; -use OCA\Files_external\Service\UserStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\Input; use Symfony\Component\Console\Output\OutputInterface; class Create extends Base { diff --git a/apps/files_external/command/delete.php b/apps/files_external/lib/Command/Delete.php similarity index 91% rename from apps/files_external/command/delete.php rename to apps/files_external/lib/Command/Delete.php index bdbfcf8bb55..a3aef7f3303 100644 --- a/apps/files_external/command/delete.php +++ b/apps/files_external/lib/Command/Delete.php @@ -22,15 +22,11 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_external\Lib\StorageConfig; use OCA\Files_external\NotFoundException; -use OCA\Files_external\Service\GlobalStoragesService; -use OCA\Files_external\Service\UserStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; diff --git a/apps/files_external/command/export.php b/apps/files_external/lib/Command/Export.php similarity index 100% rename from apps/files_external/command/export.php rename to apps/files_external/lib/Command/Export.php diff --git a/apps/files_external/command/import.php b/apps/files_external/lib/Command/Import.php similarity index 95% rename from apps/files_external/command/import.php rename to apps/files_external/lib/Command/Import.php index 97bb9a937f0..55528b66472 100644 --- a/apps/files_external/command/import.php +++ b/apps/files_external/lib/Command/Import.php @@ -25,19 +25,15 @@ use OC\Core\Command\Base; use OC\User\NoUserException; use OCA\Files_external\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; -use OCA\Files_external\Service\GlobalStoragesService; -use OCA\Files_external\Service\ImportLegacyStoragesService; -use OCA\Files_external\Service\UserStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\ImportLegacyStoragesService; +use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\Input; use Symfony\Component\Console\Output\OutputInterface; class Import extends Base { diff --git a/apps/files_external/command/listcommand.php b/apps/files_external/lib/Command/ListCommand.php similarity index 97% rename from apps/files_external/command/listcommand.php rename to apps/files_external/lib/Command/ListCommand.php index 5a0794be4c5..cbe1913ccfc 100644 --- a/apps/files_external/command/listcommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -24,11 +24,10 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; use OC\User\NoUserException; use OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\Service\GlobalStoragesService; -use OCA\Files_external\Service\UserStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; use OCP\IUserSession; -use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; diff --git a/apps/files_external/command/option.php b/apps/files_external/lib/Command/Option.php similarity index 84% rename from apps/files_external/command/option.php rename to apps/files_external/lib/Command/Option.php index 292005134cb..109ca26c31f 100644 --- a/apps/files_external/command/option.php +++ b/apps/files_external/lib/Command/Option.php @@ -21,18 +21,8 @@ namespace OCA\Files_External\Command; -use OC\Core\Command\Base; use OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\Service\GlobalStoragesService; -use OCA\Files_external\Service\UserStoragesService; -use OCP\IUserManager; -use OCP\IUserSession; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Option extends Config { diff --git a/apps/files_external/command/verify.php b/apps/files_external/lib/Command/Verify.php similarity index 95% rename from apps/files_external/command/verify.php rename to apps/files_external/lib/Command/Verify.php index f985cb401af..6ff871a6094 100644 --- a/apps/files_external/command/verify.php +++ b/apps/files_external/lib/Command/Verify.php @@ -27,11 +27,8 @@ use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_external\Lib\StorageConfig; use OCA\Files_external\NotFoundException; -use OCA\Files_external\Service\GlobalStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; use OCP\Files\StorageNotAvailableException; -use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Helper\TableHelper; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/lib/Controller/AjaxController.php similarity index 100% rename from apps/files_external/controller/ajaxcontroller.php rename to apps/files_external/lib/Controller/AjaxController.php diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/lib/Controller/GlobalStoragesController.php similarity index 95% rename from apps/files_external/controller/globalstoragescontroller.php rename to apps/files_external/lib/Controller/GlobalStoragesController.php index b443cf4ea8f..2471ac861de 100644 --- a/apps/files_external/controller/globalstoragescontroller.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -24,18 +24,13 @@ namespace OCA\Files_External\Controller; -use \OCP\IConfig; use OCP\ILogger; -use \OCP\IUserSession; use \OCP\IRequest; use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; -use \OCA\Files_external\Service\GlobalStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; -use \OCA\Files_External\Service\BackendService; /** * Global storages controller diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/lib/Controller/StoragesController.php similarity index 98% rename from apps/files_external/controller/storagescontroller.php rename to apps/files_external/lib/Controller/StoragesController.php index 09b83104700..da26f24b6b8 100644 --- a/apps/files_external/controller/storagescontroller.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -25,23 +25,19 @@ namespace OCA\Files_External\Controller; -use \OCP\IConfig; use OCP\ILogger; -use OCP\IUser; -use \OCP\IUserSession; use \OCP\IRequest; use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; -use \OCA\Files_external\Service\StoragesService; +use OCA\Files_External\Service\StoragesService; use \OCA\Files_external\NotFoundException; use \OCA\Files_external\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; use \OCA\Files_External\Lib\Auth\AuthMechanism; use \OCP\Files\StorageNotAvailableException; use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; -use \OCA\Files_External\Service\BackendService; /** * Base class for storages controllers diff --git a/apps/files_external/controller/userglobalstoragescontroller.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php similarity index 98% rename from apps/files_external/controller/userglobalstoragescontroller.php rename to apps/files_external/lib/Controller/UserGlobalStoragesController.php index 36c3740eed3..c420d9ad59f 100644 --- a/apps/files_external/controller/userglobalstoragescontroller.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -30,7 +30,7 @@ use \OCP\IRequest; use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http; -use \OCA\Files_external\Service\UserGlobalStoragesService; +use OCA\Files_External\Service\UserGlobalStoragesService; use \OCA\Files_external\NotFoundException; use \OCA\Files_external\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/lib/Controller/UserStoragesController.php similarity index 96% rename from apps/files_external/controller/userstoragescontroller.php rename to apps/files_external/lib/Controller/UserStoragesController.php index e53ea21f005..e20a41e0cc4 100644 --- a/apps/files_external/controller/userstoragescontroller.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -25,17 +25,13 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCP\IConfig; use OCP\ILogger; -use OCP\IUser; use \OCP\IUserSession; use \OCP\IRequest; use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; -use \OCA\Files_external\Service\UserStoragesService; -use \OCA\Files_External\Service\BackendService; +use OCA\Files_External\Service\UserStoragesService; use \OCA\Files_external\NotFoundException; use \OCA\Files_external\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; diff --git a/apps/files_external/migration/dummyusersession.php b/apps/files_external/lib/Migration/DummyUserSession.php similarity index 96% rename from apps/files_external/migration/dummyusersession.php rename to apps/files_external/lib/Migration/DummyUserSession.php index bb4ef19dace..b2157aafebb 100644 --- a/apps/files_external/migration/dummyusersession.php +++ b/apps/files_external/lib/Migration/DummyUserSession.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Migration; +namespace OCA\Files_External\Migration; use OCP\IUser; use OCP\IUserSession; diff --git a/apps/files_external/migration/storagemigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php similarity index 90% rename from apps/files_external/migration/storagemigrator.php rename to apps/files_external/lib/Migration/StorageMigrator.php index 48ab52768e2..a8b0461e7de 100644 --- a/apps/files_external/migration/storagemigrator.php +++ b/apps/files_external/lib/Migration/StorageMigrator.php @@ -20,22 +20,18 @@ * */ -namespace OCA\Files_external\Migration; +namespace OCA\Files_External\Migration; use OCA\Files_External\Service\BackendService; 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 OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\LegacyStoragesService; +use OCA\Files_External\Service\StoragesService; use OCP\Files\Config\IUserMountCache; use OCP\IConfig; use OCP\IDBConnection; use OCP\ILogger; use OCP\IUser; -use OCP\IUserSession; /** * Migrate mount config from mount.json to the database diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/lib/Service/BackendService.php similarity index 100% rename from apps/files_external/service/backendservice.php rename to apps/files_external/lib/Service/BackendService.php diff --git a/apps/files_external/service/dbconfigservice.php b/apps/files_external/lib/Service/DBConfigService.php similarity index 100% rename from apps/files_external/service/dbconfigservice.php rename to apps/files_external/lib/Service/DBConfigService.php diff --git a/apps/files_external/service/globallegacystoragesservice.php b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php similarity index 97% rename from apps/files_external/service/globallegacystoragesservice.php rename to apps/files_external/lib/Service/GlobalLegacyStoragesService.php index ed9b1bcf075..4c44881051a 100644 --- a/apps/files_external/service/globallegacystoragesservice.php +++ b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; /** * Read admin defined mounts from the legacy mount.json diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/lib/Service/GlobalStoragesService.php similarity index 99% rename from apps/files_external/service/globalstoragesservice.php rename to apps/files_external/lib/Service/GlobalStoragesService.php index 62da314c5fa..6032a827735 100644 --- a/apps/files_external/service/globalstoragesservice.php +++ b/apps/files_external/lib/Service/GlobalStoragesService.php @@ -22,7 +22,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; use \OCP\IUserSession; use \OC\Files\Filesystem; diff --git a/apps/files_external/service/importlegacystoragesservice.php b/apps/files_external/lib/Service/ImportLegacyStoragesService.php similarity index 96% rename from apps/files_external/service/importlegacystoragesservice.php rename to apps/files_external/lib/Service/ImportLegacyStoragesService.php index 8a790c5de9b..cb020fb495c 100644 --- a/apps/files_external/service/importlegacystoragesservice.php +++ b/apps/files_external/lib/Service/ImportLegacyStoragesService.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; class ImportLegacyStoragesService extends LegacyStoragesService { private $data; diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/lib/Service/LegacyStoragesService.php similarity index 99% rename from apps/files_external/service/legacystoragesservice.php rename to apps/files_external/lib/Service/LegacyStoragesService.php index 158fc2b5137..40f57e45506 100644 --- a/apps/files_external/service/legacystoragesservice.php +++ b/apps/files_external/lib/Service/LegacyStoragesService.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; use \OCA\Files_external\Lib\StorageConfig; diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/lib/Service/StoragesService.php similarity index 99% rename from apps/files_external/service/storagesservice.php rename to apps/files_external/lib/Service/StoragesService.php index 6542be146d6..0999c0a7adf 100644 --- a/apps/files_external/service/storagesservice.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -23,7 +23,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; use \OC\Files\Filesystem; use \OCA\Files_external\Lib\StorageConfig; diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/lib/Service/UserGlobalStoragesService.php similarity index 97% rename from apps/files_external/service/userglobalstoragesservice.php rename to apps/files_external/lib/Service/UserGlobalStoragesService.php index 111d4586924..b5e2d13c712 100644 --- a/apps/files_external/service/userglobalstoragesservice.php +++ b/apps/files_external/lib/Service/UserGlobalStoragesService.php @@ -22,12 +22,9 @@ namespace OCA\Files_External\Service; -use \OCA\Files_external\Service\GlobalStoragesService; -use \OCA\Files_External\Service\BackendService; use OCP\Files\Config\IUserMountCache; use \OCP\IUserSession; use \OCP\IGroupManager; -use \OCA\Files_External\Service\UserTrait; use \OCA\Files_External\Lib\StorageConfig; /** diff --git a/apps/files_external/service/userlegacystoragesservice.php b/apps/files_external/lib/Service/UserLegacyStoragesService.php similarity index 97% rename from apps/files_external/service/userlegacystoragesservice.php rename to apps/files_external/lib/Service/UserLegacyStoragesService.php index 2f14857c633..c64520c8b02 100644 --- a/apps/files_external/service/userlegacystoragesservice.php +++ b/apps/files_external/lib/Service/UserLegacyStoragesService.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; use OCP\IUserSession; diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/lib/Service/UserStoragesService.php similarity index 99% rename from apps/files_external/service/userstoragesservice.php rename to apps/files_external/lib/Service/UserStoragesService.php index c46846e76d6..b64f289b3ee 100644 --- a/apps/files_external/service/userstoragesservice.php +++ b/apps/files_external/lib/Service/UserStoragesService.php @@ -21,7 +21,7 @@ * */ -namespace OCA\Files_external\Service; +namespace OCA\Files_External\Service; use OCP\Files\Config\IUserMountCache; use \OCP\IUserSession; diff --git a/apps/files_external/service/usertrait.php b/apps/files_external/lib/Service/UserTrait.php similarity index 100% rename from apps/files_external/service/usertrait.php rename to apps/files_external/lib/Service/UserTrait.php diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php index a19a111d3d9..a05ff555f72 100644 --- a/apps/files_external/lib/config/configadapter.php +++ b/apps/files_external/lib/config/configadapter.php @@ -24,14 +24,14 @@ namespace OCA\Files_External\Config; use OC\Files\Storage\Wrapper\Availability; -use OCA\Files_external\Migration\StorageMigrator; +use OCA\Files_External\Migration\StorageMigrator; use OCP\Files\Storage; use OC\Files\Mount\MountPoint; use OCP\Files\Storage\IStorageFactory; 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\UserStoragesService; use OCA\Files_External\Service\UserGlobalStoragesService; use OCA\Files_External\Lib\StorageConfig; use OC\Files\Storage\FailedStorage; diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php index 5c568f45b7d..195b826a4c2 100644 --- a/apps/files_external/personal.php +++ b/apps/files_external/personal.php @@ -29,7 +29,7 @@ use \OCA\Files_External\Service\BackendService; // we must use the same container $appContainer = \OC_Mount_Config::$app->getContainer(); $backendService = $appContainer->query('OCA\Files_External\Service\BackendService'); -$userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStoragesService'); +$userStoragesService = $appContainer->query('OCA\Files_External\Service\UserStoragesService'); $tmpl = new OCP\Template('files_external', 'settings'); $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled()); diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php index 0d83d26ff97..8f44c170ce6 100644 --- a/apps/files_external/settings.php +++ b/apps/files_external/settings.php @@ -31,7 +31,7 @@ use \OCA\Files_External\Service\BackendService; // we must use the same container $appContainer = \OC_Mount_Config::$app->getContainer(); $backendService = $appContainer->query('OCA\Files_External\Service\BackendService'); -$globalStoragesService = $appContainer->query('OCA\Files_external\Service\GlobalStoragesService'); +$globalStoragesService = $appContainer->query('OCA\Files_External\Service\GlobalStoragesService'); \OC_Util::addVendorScript('select2/select2'); \OC_Util::addVendorStyle('select2/select2'); diff --git a/apps/files_external/tests/command/applicabletest.php b/apps/files_external/tests/Command/ApplicableTest.php similarity index 100% rename from apps/files_external/tests/command/applicabletest.php rename to apps/files_external/tests/Command/ApplicableTest.php diff --git a/apps/files_external/tests/command/commandtest.php b/apps/files_external/tests/Command/CommandTest.php similarity index 96% rename from apps/files_external/tests/command/commandtest.php rename to apps/files_external/tests/Command/CommandTest.php index 9a0afbd3681..73a1ea8315c 100644 --- a/apps/files_external/tests/command/commandtest.php +++ b/apps/files_external/tests/Command/CommandTest.php @@ -32,10 +32,10 @@ use Test\TestCase; abstract class CommandTest extends TestCase { /** * @param StorageConfig[] $mounts - * @return \OCA\Files_external\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject + * @return \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject */ protected function getGlobalStorageService(array $mounts = []) { - $mock = $this->getMockBuilder('OCA\Files_external\Service\GlobalStoragesService') + $mock = $this->getMockBuilder('OCA\Files_External\Service\GlobalStoragesService') ->disableOriginalConstructor() ->getMock(); diff --git a/apps/files_external/tests/command/listcommandtest.php b/apps/files_external/tests/Command/ListCommandTest.php similarity index 91% rename from apps/files_external/tests/command/listcommandtest.php rename to apps/files_external/tests/Command/ListCommandTest.php index 3098906bcc6..1475249ae43 100644 --- a/apps/files_external/tests/command/listcommandtest.php +++ b/apps/files_external/tests/Command/ListCommandTest.php @@ -34,10 +34,10 @@ class ListCommandTest extends CommandTest { * @return \OCA\Files_External\Command\ListCommand|\PHPUnit_Framework_MockObject_MockObject */ private function getInstance() { - /** @var \OCA\Files_external\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject $globalService */ - $globalService = $this->getMock('\OCA\Files_external\Service\GlobalStoragesService', null, [], '', false); - /** @var \OCA\Files_external\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */ - $userService = $this->getMock('\OCA\Files_external\Service\UserStoragesService', null, [], '', false); + /** @var \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject $globalService */ + $globalService = $this->getMock('\OCA\Files_External\Service\GlobalStoragesService', null, [], '', false); + /** @var \OCA\Files_External\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */ + $userService = $this->getMock('\OCA\Files_External\Service\UserStoragesService', null, [], '', false); /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject $userManager */ $userManager = $this->getMock('\OCP\IUserManager'); /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */ diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php similarity index 84% rename from apps/files_external/tests/controller/globalstoragescontrollertest.php rename to apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index 1021300399a..9761a4e23f9 100644 --- a/apps/files_external/tests/controller/globalstoragescontrollertest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -20,18 +20,16 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Controller; +namespace OCA\Files_External\Tests\Controller; -use \OCA\Files_external\Controller\GlobalStoragesController; -use \OCA\Files_external\Service\GlobalStoragesService; +use OCA\Files_External\Controller\GlobalStoragesController; use \OCP\AppFramework\Http; -use \OCA\Files_external\NotFoundException; use \OCA\Files_External\Service\BackendService; class GlobalStoragesControllerTest extends StoragesControllerTest { public function setUp() { parent::setUp(); - $this->service = $this->getMockBuilder('\OCA\Files_external\Service\GlobalStoragesService') + $this->service = $this->getMockBuilder('\OCA\Files_External\Service\GlobalStoragesService') ->disableOriginalConstructor() ->getMock(); diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php similarity index 98% rename from apps/files_external/tests/controller/storagescontrollertest.php rename to apps/files_external/tests/Controller/StoragesControllerTest.php index 4c3c62d5d6f..81625fbbcb9 100644 --- a/apps/files_external/tests/controller/storagescontrollertest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -19,12 +19,12 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Controller; +namespace OCA\Files_External\Tests\Controller; use \OCP\AppFramework\Http; -use \OCA\Files_external\Controller\GlobalStoragesController; -use \OCA\Files_external\Service\GlobalStoragesService; +use \OCA\Files_External\Controller\GlobalStoragesController; +use \OCA\Files_External\Service\GlobalStoragesService; use \OCA\Files_external\Lib\StorageConfig; use \OCA\Files_external\NotFoundException; diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php similarity index 89% rename from apps/files_external/tests/controller/userstoragescontrollertest.php rename to apps/files_external/tests/Controller/UserStoragesControllerTest.php index 804b752b6af..ac8d4663740 100644 --- a/apps/files_external/tests/controller/userstoragescontrollertest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -20,13 +20,10 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Controller; +namespace OCA\Files_External\Tests\Controller; -use \OCA\Files_external\Controller\UserStoragesController; -use \OCA\Files_external\Service\UserStoragesService; +use \OCA\Files_External\Controller\UserStoragesController; use \OCP\AppFramework\Http; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Service\BackendService; class UserStoragesControllerTest extends StoragesControllerTest { @@ -38,7 +35,7 @@ class UserStoragesControllerTest extends StoragesControllerTest { public function setUp() { parent::setUp(); - $this->service = $this->getMockBuilder('\OCA\Files_external\Service\UserStoragesService') + $this->service = $this->getMockBuilder('\OCA\Files_External\Service\UserStoragesService') ->disableOriginalConstructor() ->getMock(); diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/Service/BackendServiceTest.php similarity index 100% rename from apps/files_external/tests/service/backendservicetest.php rename to apps/files_external/tests/Service/BackendServiceTest.php diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/Service/DBConfigServiceTest.php similarity index 100% rename from apps/files_external/tests/service/dbconfigservicetest.php rename to apps/files_external/tests/Service/DBConfigServiceTest.php diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php similarity index 97% rename from apps/files_external/tests/service/globalstoragesservicetest.php rename to apps/files_external/tests/Service/GlobalStoragesServiceTest.php index 6cdfbef82d4..b2cc7f59ed4 100644 --- a/apps/files_external/tests/service/globalstoragesservicetest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -20,13 +20,11 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Service; +namespace OCA\Files_External\Tests\Service; use \OC\Files\Filesystem; -use \OCA\Files_external\Service\GlobalStoragesService; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; +use \OCA\Files_External\Service\GlobalStoragesService; /** * @group DB @@ -449,8 +447,8 @@ class GlobalStoragesServiceTest extends StoragesServiceTest { $storage->setApplicableGroups($sourceApplicableGroups); $storage = $this->service->addStorage($storage); - $storage->setapplicableUsers($updatedApplicableUsers); - $storage->setapplicableGroups($updatedApplicableGroups); + $storage->setApplicableUsers($updatedApplicableUsers); + $storage->setApplicableGroups($updatedApplicableGroups); // reset calls self::$hookCalls = []; diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/Service/StoragesServiceTest.php similarity index 99% rename from apps/files_external/tests/service/storagesservicetest.php rename to apps/files_external/tests/Service/StoragesServiceTest.php index f93c0134814..7cc0d8fad93 100644 --- a/apps/files_external/tests/service/storagesservicetest.php +++ b/apps/files_external/tests/Service/StoragesServiceTest.php @@ -20,7 +20,7 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Service; +namespace OCA\Files_External\Tests\Service; use \OC\Files\Filesystem; @@ -28,7 +28,7 @@ use \OCA\Files_external\NotFoundException; use \OCA\Files_external\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\DBConfigService; -use OCA\Files_external\Service\StoragesService; +use OCA\Files_External\Service\StoragesService; class CleaningDBConfig extends DBConfigService { private $mountIds = []; diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php similarity index 98% rename from apps/files_external/tests/service/userglobalstoragesservicetest.php rename to apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index baecf143c66..812c12392fc 100644 --- a/apps/files_external/tests/service/userglobalstoragesservicetest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -23,11 +23,8 @@ namespace OCA\Files_External\Tests\Service; use OCA\Files_external\NotFoundException; -use OCA\Files_external\Service\StoragesService; -use \OCA\Files_External\Service\UserGlobalStoragesService; -use \OCP\IGroupManager; - -use \OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\Service\StoragesService; +use OCA\Files_External\Service\UserGlobalStoragesService; use OCP\IUser; use Test\Traits\UserTrait; diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php similarity index 96% rename from apps/files_external/tests/service/userstoragesservicetest.php rename to apps/files_external/tests/Service/UserStoragesServiceTest.php index 37423cb8d74..21696878a01 100644 --- a/apps/files_external/tests/service/userstoragesservicetest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -20,14 +20,13 @@ * along with this program. If not, see * */ -namespace OCA\Files_external\Tests\Service; +namespace OCA\Files_External\Tests\Service; 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\NotFoundException; +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 Test\Traits\UserTrait; From 6d7a1b9bd42637bd3cd1b1307082f010ab8b11ba Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:38:52 +0200 Subject: [PATCH 2/7] Move Lib\Auth to PSR-4 --- .../amazons3/accesskey.php => Lib/Auth/AmazonS3/AccessKey.php} | 0 .../lib/{auth/authmechanism.php => Lib/Auth/AuthMechanism.php} | 0 .../lib/{auth/builtin.php => Lib/Auth/Builtin.php} | 0 .../lib/{auth/iuserprovided.php => Lib/Auth/IUserProvided.php} | 0 .../lib/{auth/nullmechanism.php => Lib/Auth/NullMechanism.php} | 1 - .../lib/{auth/oauth1/oauth1.php => Lib/Auth/OAuth1/OAuth1.php} | 0 .../lib/{auth/oauth2/oauth2.php => Lib/Auth/OAuth2/OAuth2.php} | 0 .../openstack/openstack.php => Lib/Auth/OpenStack/OpenStack.php} | 0 .../openstack/rackspace.php => Lib/Auth/OpenStack/Rackspace.php} | 0 .../password/password.php => Lib/Auth/Password/Password.php} | 0 .../Auth/Password/SessionCredentials.php} | 0 .../lib/{auth/publickey/rsa.php => Lib/Auth/PublicKey/RSA.php} | 0 .../{auth/authmechanismtest.php => Auth/AuthMechanismTest.php} | 0 13 files changed, 1 deletion(-) rename apps/files_external/lib/{auth/amazons3/accesskey.php => Lib/Auth/AmazonS3/AccessKey.php} (100%) rename apps/files_external/lib/{auth/authmechanism.php => Lib/Auth/AuthMechanism.php} (100%) rename apps/files_external/lib/{auth/builtin.php => Lib/Auth/Builtin.php} (100%) rename apps/files_external/lib/{auth/iuserprovided.php => Lib/Auth/IUserProvided.php} (100%) rename apps/files_external/lib/{auth/nullmechanism.php => Lib/Auth/NullMechanism.php} (95%) rename apps/files_external/lib/{auth/oauth1/oauth1.php => Lib/Auth/OAuth1/OAuth1.php} (100%) rename apps/files_external/lib/{auth/oauth2/oauth2.php => Lib/Auth/OAuth2/OAuth2.php} (100%) rename apps/files_external/lib/{auth/openstack/openstack.php => Lib/Auth/OpenStack/OpenStack.php} (100%) rename apps/files_external/lib/{auth/openstack/rackspace.php => Lib/Auth/OpenStack/Rackspace.php} (100%) rename apps/files_external/lib/{auth/password/password.php => Lib/Auth/Password/Password.php} (100%) rename apps/files_external/lib/{auth/password/sessioncredentials.php => Lib/Auth/Password/SessionCredentials.php} (100%) rename apps/files_external/lib/{auth/publickey/rsa.php => Lib/Auth/PublicKey/RSA.php} (100%) rename apps/files_external/tests/{auth/authmechanismtest.php => Auth/AuthMechanismTest.php} (100%) diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php similarity index 100% rename from apps/files_external/lib/auth/amazons3/accesskey.php rename to apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php similarity index 100% rename from apps/files_external/lib/auth/authmechanism.php rename to apps/files_external/lib/Lib/Auth/AuthMechanism.php diff --git a/apps/files_external/lib/auth/builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php similarity index 100% rename from apps/files_external/lib/auth/builtin.php rename to apps/files_external/lib/Lib/Auth/Builtin.php diff --git a/apps/files_external/lib/auth/iuserprovided.php b/apps/files_external/lib/Lib/Auth/IUserProvided.php similarity index 100% rename from apps/files_external/lib/auth/iuserprovided.php rename to apps/files_external/lib/Lib/Auth/IUserProvided.php diff --git a/apps/files_external/lib/auth/nullmechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php similarity index 95% rename from apps/files_external/lib/auth/nullmechanism.php rename to apps/files_external/lib/Lib/Auth/NullMechanism.php index 06083729e59..c0a8f4f119b 100644 --- a/apps/files_external/lib/auth/nullmechanism.php +++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php @@ -22,7 +22,6 @@ namespace OCA\Files_External\Lib\Auth; use \OCP\IL10N; -use \OCA\Files_External\Lib\Auth\AuthMechanism; use \OCA\Files_external\Lib\StorageConfig; /** diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php similarity index 100% rename from apps/files_external/lib/auth/oauth1/oauth1.php rename to apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php similarity index 100% rename from apps/files_external/lib/auth/oauth2/oauth2.php rename to apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php similarity index 100% rename from apps/files_external/lib/auth/openstack/openstack.php rename to apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php similarity index 100% rename from apps/files_external/lib/auth/openstack/rackspace.php rename to apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php diff --git a/apps/files_external/lib/auth/password/password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php similarity index 100% rename from apps/files_external/lib/auth/password/password.php rename to apps/files_external/lib/Lib/Auth/Password/Password.php diff --git a/apps/files_external/lib/auth/password/sessioncredentials.php b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php similarity index 100% rename from apps/files_external/lib/auth/password/sessioncredentials.php rename to apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php similarity index 100% rename from apps/files_external/lib/auth/publickey/rsa.php rename to apps/files_external/lib/Lib/Auth/PublicKey/RSA.php diff --git a/apps/files_external/tests/auth/authmechanismtest.php b/apps/files_external/tests/Auth/AuthMechanismTest.php similarity index 100% rename from apps/files_external/tests/auth/authmechanismtest.php rename to apps/files_external/tests/Auth/AuthMechanismTest.php From 6ea54e73e82fb02bb6bfa3a189a861f90c00d105 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:42:01 +0200 Subject: [PATCH 3/7] Move Lib\Backend to PSR-4 --- .../lib/{backend/amazons3.php => Lib/Backend/AmazonS3.php} | 0 .../lib/{backend/backend.php => Lib/Backend/Backend.php} | 0 apps/files_external/lib/{backend/dav.php => Lib/Backend/DAV.php} | 0 .../lib/{backend/dropbox.php => Lib/Backend/Dropbox.php} | 0 apps/files_external/lib/{backend/ftp.php => Lib/Backend/FTP.php} | 0 .../lib/{backend/google.php => Lib/Backend/Google.php} | 0 .../{backend/legacybackend.php => Lib/Backend/LegacyBackend.php} | 0 .../lib/{backend/local.php => Lib/Backend/Local.php} | 0 .../lib/{backend/owncloud.php => Lib/Backend/OwnCloud.php} | 0 .../files_external/lib/{backend/sftp.php => Lib/Backend/SFTP.php} | 0 .../lib/{backend/sftp_key.php => Lib/Backend/SFTP_Key.php} | 0 apps/files_external/lib/{backend/smb.php => Lib/Backend/SMB.php} | 0 .../lib/{backend/smb_oc.php => Lib/Backend/SMB_OC.php} | 0 .../lib/{backend/swift.php => Lib/Backend/Swift.php} | 0 .../tests/{backend/backendtest.php => Backend/BackendTest.php} | 0 .../legacybackendtest.php => Backend/LegacyBackendTest.php} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename apps/files_external/lib/{backend/amazons3.php => Lib/Backend/AmazonS3.php} (100%) rename apps/files_external/lib/{backend/backend.php => Lib/Backend/Backend.php} (100%) rename apps/files_external/lib/{backend/dav.php => Lib/Backend/DAV.php} (100%) rename apps/files_external/lib/{backend/dropbox.php => Lib/Backend/Dropbox.php} (100%) rename apps/files_external/lib/{backend/ftp.php => Lib/Backend/FTP.php} (100%) rename apps/files_external/lib/{backend/google.php => Lib/Backend/Google.php} (100%) rename apps/files_external/lib/{backend/legacybackend.php => Lib/Backend/LegacyBackend.php} (100%) rename apps/files_external/lib/{backend/local.php => Lib/Backend/Local.php} (100%) rename apps/files_external/lib/{backend/owncloud.php => Lib/Backend/OwnCloud.php} (100%) rename apps/files_external/lib/{backend/sftp.php => Lib/Backend/SFTP.php} (100%) rename apps/files_external/lib/{backend/sftp_key.php => Lib/Backend/SFTP_Key.php} (100%) rename apps/files_external/lib/{backend/smb.php => Lib/Backend/SMB.php} (100%) rename apps/files_external/lib/{backend/smb_oc.php => Lib/Backend/SMB_OC.php} (100%) rename apps/files_external/lib/{backend/swift.php => Lib/Backend/Swift.php} (100%) rename apps/files_external/tests/{backend/backendtest.php => Backend/BackendTest.php} (100%) rename apps/files_external/tests/{backend/legacybackendtest.php => Backend/LegacyBackendTest.php} (100%) diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php similarity index 100% rename from apps/files_external/lib/backend/amazons3.php rename to apps/files_external/lib/Lib/Backend/AmazonS3.php diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/Lib/Backend/Backend.php similarity index 100% rename from apps/files_external/lib/backend/backend.php rename to apps/files_external/lib/Lib/Backend/Backend.php diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/Lib/Backend/DAV.php similarity index 100% rename from apps/files_external/lib/backend/dav.php rename to apps/files_external/lib/Lib/Backend/DAV.php diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/Lib/Backend/Dropbox.php similarity index 100% rename from apps/files_external/lib/backend/dropbox.php rename to apps/files_external/lib/Lib/Backend/Dropbox.php diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/Lib/Backend/FTP.php similarity index 100% rename from apps/files_external/lib/backend/ftp.php rename to apps/files_external/lib/Lib/Backend/FTP.php diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/Lib/Backend/Google.php similarity index 100% rename from apps/files_external/lib/backend/google.php rename to apps/files_external/lib/Lib/Backend/Google.php diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/Lib/Backend/LegacyBackend.php similarity index 100% rename from apps/files_external/lib/backend/legacybackend.php rename to apps/files_external/lib/Lib/Backend/LegacyBackend.php diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/Lib/Backend/Local.php similarity index 100% rename from apps/files_external/lib/backend/local.php rename to apps/files_external/lib/Lib/Backend/Local.php diff --git a/apps/files_external/lib/backend/owncloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php similarity index 100% rename from apps/files_external/lib/backend/owncloud.php rename to apps/files_external/lib/Lib/Backend/OwnCloud.php diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/Lib/Backend/SFTP.php similarity index 100% rename from apps/files_external/lib/backend/sftp.php rename to apps/files_external/lib/Lib/Backend/SFTP.php diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/Lib/Backend/SFTP_Key.php similarity index 100% rename from apps/files_external/lib/backend/sftp_key.php rename to apps/files_external/lib/Lib/Backend/SFTP_Key.php diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/Lib/Backend/SMB.php similarity index 100% rename from apps/files_external/lib/backend/smb.php rename to apps/files_external/lib/Lib/Backend/SMB.php diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php similarity index 100% rename from apps/files_external/lib/backend/smb_oc.php rename to apps/files_external/lib/Lib/Backend/SMB_OC.php diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/Lib/Backend/Swift.php similarity index 100% rename from apps/files_external/lib/backend/swift.php rename to apps/files_external/lib/Lib/Backend/Swift.php diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/Backend/BackendTest.php similarity index 100% rename from apps/files_external/tests/backend/backendtest.php rename to apps/files_external/tests/Backend/BackendTest.php diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/Backend/LegacyBackendTest.php similarity index 100% rename from apps/files_external/tests/backend/legacybackendtest.php rename to apps/files_external/tests/Backend/LegacyBackendTest.php From b9fd7d4cc7834fd0fff01c1c6aa478a62a905bb1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:43:28 +0200 Subject: [PATCH 4/7] Move Config to PSR-4 --- .../lib/{config/configadapter.php => Config/ConfigAdapter.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename apps/files_external/lib/{config/configadapter.php => Config/ConfigAdapter.php} (100%) diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/Config/ConfigAdapter.php similarity index 100% rename from apps/files_external/lib/config/configadapter.php rename to apps/files_external/lib/Config/ConfigAdapter.php From 4576891f10aa41cc146dc6ed421384269eca283a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:46:36 +0200 Subject: [PATCH 5/7] Move Lib\Storage to PSR-4 --- .../lib/{storage/amazons3.php => Lib/Storage/AmazonS3.php} | 0 .../lib/{storage/dropbox.php => Lib/Storage/Dropbox.php} | 0 apps/files_external/lib/{storage/ftp.php => Lib/Storage/FTP.php} | 0 .../lib/{storage/google.php => Lib/Storage/Google.php} | 0 .../lib/{storage/owncloud.php => Lib/Storage/OwnCloud.php} | 0 .../files_external/lib/{storage/sftp.php => Lib/Storage/SFTP.php} | 0 apps/files_external/lib/{storage/smb.php => Lib/Storage/SMB.php} | 0 .../{storage/streamwrapper.php => Lib/Storage/StreamWrapper.php} | 0 .../lib/{storage/swift.php => Lib/Storage/Swift.php} | 0 .../tests/{storage/amazons3test.php => Storage/AmazonS3Test.php} | 0 .../tests/{storage/dropboxtest.php => Storage/DropboxTest.php} | 0 .../tests/{storage/ftptest.php => Storage/FTPTest.php} | 0 .../tests/{storage/googletest.php => Storage/GoogleTest.php} | 0 .../tests/{storage/owncloudtest.php => Storage/OwnCloudTest.php} | 0 .../tests/{storage/sftptest.php => Storage/SFTPTest.php} | 0 .../tests/{storage/sftp_keytest.php => Storage/SFTP_KeyTest.php} | 0 .../tests/{storage/smbtest.php => Storage/SMBTest.php} | 0 .../tests/{storage/swifttest.php => Storage/SwiftTest.php} | 0 .../tests/{storage/webdavtest.php => Storage/WebDAVTest.php} | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename apps/files_external/lib/{storage/amazons3.php => Lib/Storage/AmazonS3.php} (100%) rename apps/files_external/lib/{storage/dropbox.php => Lib/Storage/Dropbox.php} (100%) rename apps/files_external/lib/{storage/ftp.php => Lib/Storage/FTP.php} (100%) rename apps/files_external/lib/{storage/google.php => Lib/Storage/Google.php} (100%) rename apps/files_external/lib/{storage/owncloud.php => Lib/Storage/OwnCloud.php} (100%) rename apps/files_external/lib/{storage/sftp.php => Lib/Storage/SFTP.php} (100%) rename apps/files_external/lib/{storage/smb.php => Lib/Storage/SMB.php} (100%) rename apps/files_external/lib/{storage/streamwrapper.php => Lib/Storage/StreamWrapper.php} (100%) rename apps/files_external/lib/{storage/swift.php => Lib/Storage/Swift.php} (100%) rename apps/files_external/tests/{storage/amazons3test.php => Storage/AmazonS3Test.php} (100%) rename apps/files_external/tests/{storage/dropboxtest.php => Storage/DropboxTest.php} (100%) rename apps/files_external/tests/{storage/ftptest.php => Storage/FTPTest.php} (100%) rename apps/files_external/tests/{storage/googletest.php => Storage/GoogleTest.php} (100%) rename apps/files_external/tests/{storage/owncloudtest.php => Storage/OwnCloudTest.php} (100%) rename apps/files_external/tests/{storage/sftptest.php => Storage/SFTPTest.php} (100%) rename apps/files_external/tests/{storage/sftp_keytest.php => Storage/SFTP_KeyTest.php} (100%) rename apps/files_external/tests/{storage/smbtest.php => Storage/SMBTest.php} (100%) rename apps/files_external/tests/{storage/swifttest.php => Storage/SwiftTest.php} (100%) rename apps/files_external/tests/{storage/webdavtest.php => Storage/WebDAVTest.php} (100%) diff --git a/apps/files_external/lib/storage/amazons3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php similarity index 100% rename from apps/files_external/lib/storage/amazons3.php rename to apps/files_external/lib/Lib/Storage/AmazonS3.php diff --git a/apps/files_external/lib/storage/dropbox.php b/apps/files_external/lib/Lib/Storage/Dropbox.php similarity index 100% rename from apps/files_external/lib/storage/dropbox.php rename to apps/files_external/lib/Lib/Storage/Dropbox.php diff --git a/apps/files_external/lib/storage/ftp.php b/apps/files_external/lib/Lib/Storage/FTP.php similarity index 100% rename from apps/files_external/lib/storage/ftp.php rename to apps/files_external/lib/Lib/Storage/FTP.php diff --git a/apps/files_external/lib/storage/google.php b/apps/files_external/lib/Lib/Storage/Google.php similarity index 100% rename from apps/files_external/lib/storage/google.php rename to apps/files_external/lib/Lib/Storage/Google.php diff --git a/apps/files_external/lib/storage/owncloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php similarity index 100% rename from apps/files_external/lib/storage/owncloud.php rename to apps/files_external/lib/Lib/Storage/OwnCloud.php diff --git a/apps/files_external/lib/storage/sftp.php b/apps/files_external/lib/Lib/Storage/SFTP.php similarity index 100% rename from apps/files_external/lib/storage/sftp.php rename to apps/files_external/lib/Lib/Storage/SFTP.php diff --git a/apps/files_external/lib/storage/smb.php b/apps/files_external/lib/Lib/Storage/SMB.php similarity index 100% rename from apps/files_external/lib/storage/smb.php rename to apps/files_external/lib/Lib/Storage/SMB.php diff --git a/apps/files_external/lib/storage/streamwrapper.php b/apps/files_external/lib/Lib/Storage/StreamWrapper.php similarity index 100% rename from apps/files_external/lib/storage/streamwrapper.php rename to apps/files_external/lib/Lib/Storage/StreamWrapper.php diff --git a/apps/files_external/lib/storage/swift.php b/apps/files_external/lib/Lib/Storage/Swift.php similarity index 100% rename from apps/files_external/lib/storage/swift.php rename to apps/files_external/lib/Lib/Storage/Swift.php diff --git a/apps/files_external/tests/storage/amazons3test.php b/apps/files_external/tests/Storage/AmazonS3Test.php similarity index 100% rename from apps/files_external/tests/storage/amazons3test.php rename to apps/files_external/tests/Storage/AmazonS3Test.php diff --git a/apps/files_external/tests/storage/dropboxtest.php b/apps/files_external/tests/Storage/DropboxTest.php similarity index 100% rename from apps/files_external/tests/storage/dropboxtest.php rename to apps/files_external/tests/Storage/DropboxTest.php diff --git a/apps/files_external/tests/storage/ftptest.php b/apps/files_external/tests/Storage/FTPTest.php similarity index 100% rename from apps/files_external/tests/storage/ftptest.php rename to apps/files_external/tests/Storage/FTPTest.php diff --git a/apps/files_external/tests/storage/googletest.php b/apps/files_external/tests/Storage/GoogleTest.php similarity index 100% rename from apps/files_external/tests/storage/googletest.php rename to apps/files_external/tests/Storage/GoogleTest.php diff --git a/apps/files_external/tests/storage/owncloudtest.php b/apps/files_external/tests/Storage/OwnCloudTest.php similarity index 100% rename from apps/files_external/tests/storage/owncloudtest.php rename to apps/files_external/tests/Storage/OwnCloudTest.php diff --git a/apps/files_external/tests/storage/sftptest.php b/apps/files_external/tests/Storage/SFTPTest.php similarity index 100% rename from apps/files_external/tests/storage/sftptest.php rename to apps/files_external/tests/Storage/SFTPTest.php diff --git a/apps/files_external/tests/storage/sftp_keytest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php similarity index 100% rename from apps/files_external/tests/storage/sftp_keytest.php rename to apps/files_external/tests/Storage/SFTP_KeyTest.php diff --git a/apps/files_external/tests/storage/smbtest.php b/apps/files_external/tests/Storage/SMBTest.php similarity index 100% rename from apps/files_external/tests/storage/smbtest.php rename to apps/files_external/tests/Storage/SMBTest.php diff --git a/apps/files_external/tests/storage/swifttest.php b/apps/files_external/tests/Storage/SwiftTest.php similarity index 100% rename from apps/files_external/tests/storage/swifttest.php rename to apps/files_external/tests/Storage/SwiftTest.php diff --git a/apps/files_external/tests/storage/webdavtest.php b/apps/files_external/tests/Storage/WebDAVTest.php similarity index 100% rename from apps/files_external/tests/storage/webdavtest.php rename to apps/files_external/tests/Storage/WebDAVTest.php From f14dff680d5e1e0fe10065ed25c524d9b5078cae Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:56:47 +0200 Subject: [PATCH 6/7] Move remaining classes to PSR-4 --- apps/files_external/lib/Command/Applicable.php | 4 ++-- apps/files_external/lib/Command/Config.php | 4 ++-- apps/files_external/lib/Command/Create.php | 2 +- apps/files_external/lib/Command/Delete.php | 2 +- apps/files_external/lib/Command/Import.php | 2 +- apps/files_external/lib/Command/ListCommand.php | 2 +- apps/files_external/lib/Command/Option.php | 2 +- apps/files_external/lib/Command/Verify.php | 4 ++-- .../lib/Controller/GlobalStoragesController.php | 2 +- apps/files_external/lib/Controller/StoragesController.php | 4 ++-- .../lib/Controller/UserGlobalStoragesController.php | 4 ++-- .../lib/Controller/UserStoragesController.php | 4 ++-- apps/files_external/lib/{api.php => Lib/Api.php} | 0 apps/files_external/lib/Lib/Auth/Builtin.php | 2 -- apps/files_external/lib/Lib/Auth/NullMechanism.php | 1 - .../DefinitionParameter.php} | 0 .../lib/{dependencytrait.php => Lib/DependencyTrait.php} | 0 .../FrontendDefinitionTrait.php} | 0 .../lib/{identifiertrait.php => Lib/IdentifierTrait.php} | 0 .../InsufficientDataForMeaningfulAnswerException.php} | 0 .../LegacyDependencyCheckPolyfill.php} | 0 .../{missingdependency.php => Lib/MissingDependency.php} | 0 .../lib/{personalmount.php => Lib/PersonalMount.php} | 0 .../lib/{prioritytrait.php => Lib/PriorityTrait.php} | 0 .../SessionStorageWrapper.php} | 0 .../lib/{storageconfig.php => Lib/StorageConfig.php} | 2 +- .../StorageModifierTrait.php} | 0 .../lib/{visibilitytrait.php => Lib/VisibilityTrait.php} | 0 .../lib/{notfoundexception.php => NotFoundException.php} | 2 +- apps/files_external/lib/Service/GlobalStoragesService.php | 6 ++---- apps/files_external/lib/Service/LegacyStoragesService.php | 2 +- apps/files_external/lib/Service/StoragesService.php | 4 ++-- apps/files_external/lib/Service/UserStoragesService.php | 4 ++-- apps/files_external/lib/config.php | 4 ++-- .../{amazons3migration.php => AmazonS3MigrationTest.php} | 2 +- apps/files_external/tests/Command/CommandTest.php | 4 ++-- apps/files_external/tests/Command/ListCommandTest.php | 2 +- .../tests/Controller/StoragesControllerTest.php | 4 ++-- ...tionparameterttest.php => DefinitionParameterTest.php} | 0 ...itiontraittest.php => FrontendDefinitionTraitTest.php} | 0 ...filltest.php => LegacyDependencyCheckPolyfillTest.php} | 0 .../{owncloudfunctions.php => OwnCloudFunctionsTest.php} | 2 +- .../{personalmounttest.php => PersonalMountTest.php} | 2 +- apps/files_external/tests/Service/StoragesServiceTest.php | 8 ++++---- .../tests/Service/UserGlobalStoragesServiceTest.php | 2 +- .../tests/Service/UserStoragesServiceTest.php | 6 +++--- .../{storageconfigtest.php => StorageConfigTest.php} | 4 ++-- 47 files changed, 47 insertions(+), 52 deletions(-) rename apps/files_external/lib/{api.php => Lib/Api.php} (100%) rename apps/files_external/lib/{definitionparameter.php => Lib/DefinitionParameter.php} (100%) rename apps/files_external/lib/{dependencytrait.php => Lib/DependencyTrait.php} (100%) rename apps/files_external/lib/{frontenddefinitiontrait.php => Lib/FrontendDefinitionTrait.php} (100%) rename apps/files_external/lib/{identifiertrait.php => Lib/IdentifierTrait.php} (100%) rename apps/files_external/lib/{insufficientdataformeaningfulanswerexception.php => Lib/InsufficientDataForMeaningfulAnswerException.php} (100%) rename apps/files_external/lib/{legacydependencycheckpolyfill.php => Lib/LegacyDependencyCheckPolyfill.php} (100%) rename apps/files_external/lib/{missingdependency.php => Lib/MissingDependency.php} (100%) rename apps/files_external/lib/{personalmount.php => Lib/PersonalMount.php} (100%) rename apps/files_external/lib/{prioritytrait.php => Lib/PriorityTrait.php} (100%) rename apps/files_external/lib/{sessionstoragewrapper.php => Lib/SessionStorageWrapper.php} (100%) rename apps/files_external/lib/{storageconfig.php => Lib/StorageConfig.php} (99%) rename apps/files_external/lib/{storagemodifiertrait.php => Lib/StorageModifierTrait.php} (100%) rename apps/files_external/lib/{visibilitytrait.php => Lib/VisibilityTrait.php} (100%) rename apps/files_external/lib/{notfoundexception.php => NotFoundException.php} (96%) rename apps/files_external/tests/{amazons3migration.php => AmazonS3MigrationTest.php} (98%) rename apps/files_external/tests/{definitionparameterttest.php => DefinitionParameterTest.php} (100%) rename apps/files_external/tests/{frontenddefinitiontraittest.php => FrontendDefinitionTraitTest.php} (100%) rename apps/files_external/tests/{legacydependencycheckpolyfilltest.php => LegacyDependencyCheckPolyfillTest.php} (100%) rename apps/files_external/tests/{owncloudfunctions.php => OwnCloudFunctionsTest.php} (98%) rename apps/files_external/tests/{personalmounttest.php => PersonalMountTest.php} (97%) rename apps/files_external/tests/{storageconfigtest.php => StorageConfigTest.php} (97%) diff --git a/apps/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php index 902e76cb4cb..4e178edbbae 100644 --- a/apps/files_external/lib/Command/Applicable.php +++ b/apps/files_external/lib/Command/Applicable.php @@ -22,8 +22,8 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use OCP\IGroupManager; use OCP\IUserManager; diff --git a/apps/files_external/lib/Command/Config.php b/apps/files_external/lib/Command/Config.php index 873fece86d7..909b130f17b 100644 --- a/apps/files_external/lib/Command/Config.php +++ b/apps/files_external/lib/Command/Config.php @@ -22,8 +22,8 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php index 17ad7ef1a16..e5fd095d6f2 100644 --- a/apps/files_external/lib/Command/Create.php +++ b/apps/files_external/lib/Command/Create.php @@ -27,7 +27,7 @@ use OC\User\NoUserException; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\DefinitionParameter; -use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; diff --git a/apps/files_external/lib/Command/Delete.php b/apps/files_external/lib/Command/Delete.php index a3aef7f3303..64228b2033b 100644 --- a/apps/files_external/lib/Command/Delete.php +++ b/apps/files_external/lib/Command/Delete.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php index 55528b66472..4f881acb500 100644 --- a/apps/files_external/lib/Command/Import.php +++ b/apps/files_external/lib/Command/Import.php @@ -23,7 +23,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; use OC\User\NoUserException; -use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\ImportLegacyStoragesService; diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index cbe1913ccfc..c1fb18b3bc2 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -23,7 +23,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; use OC\User\NoUserException; -use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; use OCP\IUserManager; diff --git a/apps/files_external/lib/Command/Option.php b/apps/files_external/lib/Command/Option.php index 109ca26c31f..4f7733b25d8 100644 --- a/apps/files_external/lib/Command/Option.php +++ b/apps/files_external/lib/Command/Option.php @@ -21,7 +21,7 @@ namespace OCA\Files_External\Command; -use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; diff --git a/apps/files_external/lib/Command/Verify.php b/apps/files_external/lib/Command/Verify.php index 6ff871a6094..dfc536530bb 100644 --- a/apps/files_external/lib/Command/Verify.php +++ b/apps/files_external/lib/Command/Verify.php @@ -25,8 +25,8 @@ 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 OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use OCP\Files\StorageNotAvailableException; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 2471ac861de..0ae9e1fd5e0 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -30,7 +30,7 @@ use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http; use OCA\Files_External\Service\GlobalStoragesService; -use \OCA\Files_external\NotFoundException; +use OCA\Files_External\NotFoundException; /** * Global storages controller diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index da26f24b6b8..a368169944e 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -32,8 +32,8 @@ use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; use OCA\Files_External\Service\StoragesService; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; use \OCA\Files_External\Lib\Auth\AuthMechanism; use \OCP\Files\StorageNotAvailableException; diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index c420d9ad59f..ee4cd640018 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -31,8 +31,8 @@ use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http; use OCA\Files_External\Service\UserGlobalStoragesService; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; use OCP\IUserSession; diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index e20a41e0cc4..1850d0087b3 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -32,8 +32,8 @@ use \OCP\IL10N; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http; use OCA\Files_External\Service\UserStoragesService; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; /** diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/Lib/Api.php similarity index 100% rename from apps/files_external/lib/api.php rename to apps/files_external/lib/Lib/Api.php diff --git a/apps/files_external/lib/Lib/Auth/Builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php index 8b43cb459cc..c5c3a19e54f 100644 --- a/apps/files_external/lib/Lib/Auth/Builtin.php +++ b/apps/files_external/lib/Lib/Auth/Builtin.php @@ -22,8 +22,6 @@ namespace OCA\Files_External\Lib\Auth; use \OCP\IL10N; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_external\Lib\StorageConfig; /** * Builtin authentication mechanism, for legacy backends diff --git a/apps/files_external/lib/Lib/Auth/NullMechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php index c0a8f4f119b..671a5ff66c5 100644 --- a/apps/files_external/lib/Lib/Auth/NullMechanism.php +++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php @@ -22,7 +22,6 @@ namespace OCA\Files_External\Lib\Auth; use \OCP\IL10N; -use \OCA\Files_external\Lib\StorageConfig; /** * Null authentication mechanism diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php similarity index 100% rename from apps/files_external/lib/definitionparameter.php rename to apps/files_external/lib/Lib/DefinitionParameter.php diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/Lib/DependencyTrait.php similarity index 100% rename from apps/files_external/lib/dependencytrait.php rename to apps/files_external/lib/Lib/DependencyTrait.php diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php similarity index 100% rename from apps/files_external/lib/frontenddefinitiontrait.php rename to apps/files_external/lib/Lib/FrontendDefinitionTrait.php diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/Lib/IdentifierTrait.php similarity index 100% rename from apps/files_external/lib/identifiertrait.php rename to apps/files_external/lib/Lib/IdentifierTrait.php diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php similarity index 100% rename from apps/files_external/lib/insufficientdataformeaningfulanswerexception.php rename to apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php similarity index 100% rename from apps/files_external/lib/legacydependencycheckpolyfill.php rename to apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/Lib/MissingDependency.php similarity index 100% rename from apps/files_external/lib/missingdependency.php rename to apps/files_external/lib/Lib/MissingDependency.php diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/Lib/PersonalMount.php similarity index 100% rename from apps/files_external/lib/personalmount.php rename to apps/files_external/lib/Lib/PersonalMount.php diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/Lib/PriorityTrait.php similarity index 100% rename from apps/files_external/lib/prioritytrait.php rename to apps/files_external/lib/Lib/PriorityTrait.php diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php similarity index 100% rename from apps/files_external/lib/sessionstoragewrapper.php rename to apps/files_external/lib/Lib/SessionStorageWrapper.php diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/Lib/StorageConfig.php similarity index 99% rename from apps/files_external/lib/storageconfig.php rename to apps/files_external/lib/Lib/StorageConfig.php index 590a5f53249..2a22b324ead 100644 --- a/apps/files_external/lib/storageconfig.php +++ b/apps/files_external/lib/Lib/StorageConfig.php @@ -23,7 +23,7 @@ * */ -namespace OCA\Files_external\Lib; +namespace OCA\Files_External\Lib; use OCA\Files_External\Lib\Auth\IUserProvided; use \OCA\Files_External\Lib\Backend\Backend; diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php similarity index 100% rename from apps/files_external/lib/storagemodifiertrait.php rename to apps/files_external/lib/Lib/StorageModifierTrait.php diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/Lib/VisibilityTrait.php similarity index 100% rename from apps/files_external/lib/visibilitytrait.php rename to apps/files_external/lib/Lib/VisibilityTrait.php diff --git a/apps/files_external/lib/notfoundexception.php b/apps/files_external/lib/NotFoundException.php similarity index 96% rename from apps/files_external/lib/notfoundexception.php rename to apps/files_external/lib/NotFoundException.php index dd3dd1907a5..80333c103ca 100644 --- a/apps/files_external/lib/notfoundexception.php +++ b/apps/files_external/lib/NotFoundException.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external; +namespace OCA\Files_External; /** * Storage is not found diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php index 6032a827735..592283444d1 100644 --- a/apps/files_external/lib/Service/GlobalStoragesService.php +++ b/apps/files_external/lib/Service/GlobalStoragesService.php @@ -24,11 +24,9 @@ namespace OCA\Files_External\Service; -use \OCP\IUserSession; -use \OC\Files\Filesystem; -use \OCA\Files_external\Lib\StorageConfig; -use \OCA\Files_external\NotFoundException; +use \OC\Files\Filesystem; +use OCA\Files_External\Lib\StorageConfig; /** * Service class to manage global external storages diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/apps/files_external/lib/Service/LegacyStoragesService.php index 40f57e45506..365181d746c 100644 --- a/apps/files_external/lib/Service/LegacyStoragesService.php +++ b/apps/files_external/lib/Service/LegacyStoragesService.php @@ -21,7 +21,7 @@ namespace OCA\Files_External\Service; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; /** * Read mount config from legacy mount.json diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php index 0999c0a7adf..4fb0f65e760 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -26,8 +26,8 @@ namespace OCA\Files_External\Service; use \OC\Files\Filesystem; -use \OCA\Files_external\Lib\StorageConfig; -use \OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use \OCA\Files_External\Lib\Backend\Backend; use \OCA\Files_External\Lib\Auth\AuthMechanism; use OCP\Files\Config\IUserMountCache; diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php index b64f289b3ee..a527acbba3a 100644 --- a/apps/files_external/lib/Service/UserStoragesService.php +++ b/apps/files_external/lib/Service/UserStoragesService.php @@ -27,8 +27,8 @@ use OCP\Files\Config\IUserMountCache; use \OCP\IUserSession; use \OC\Files\Filesystem; -use \OCA\Files_external\Lib\StorageConfig; -use \OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use \OCA\Files_External\Service\BackendService; use \OCA\Files_External\Service\UserTrait; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 70f8550f39b..d581deab190 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -33,7 +33,7 @@ */ use phpseclib\Crypt\AES; -use \OCA\Files_External\Appinfo\Application; +use \OCA\Files_External\AppInfo\Application; use \OCA\Files_External\Lib\Backend\LegacyBackend; use \OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Lib\Backend\Backend; @@ -91,7 +91,7 @@ class OC_Mount_Config { $userStoragesService->setUser($user); foreach ($userGlobalStoragesService->getStorages() as $storage) { - /** @var \OCA\Files_external\Lib\StorageConfig $storage */ + /** @var \OCA\Files_External\Lib\StorageConfig $storage */ $mountPoint = '/'.$uid.'/files'.$storage->getMountPoint(); $mountEntry = self::prepareMountPointEntry($storage, false); foreach ($mountEntry['options'] as &$option) { diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/AmazonS3MigrationTest.php similarity index 98% rename from apps/files_external/tests/amazons3migration.php rename to apps/files_external/tests/AmazonS3MigrationTest.php index 614d6ca33df..132d907ab14 100644 --- a/apps/files_external/tests/amazons3migration.php +++ b/apps/files_external/tests/AmazonS3MigrationTest.php @@ -35,7 +35,7 @@ use OCA\Files_External\Lib\Storage\AmazonS3; * * @package OCA\Files_External\Tests */ -class AmazonS3Migration extends \Test\TestCase { +class AmazonS3MigrationTest extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage instance diff --git a/apps/files_external/tests/Command/CommandTest.php b/apps/files_external/tests/Command/CommandTest.php index 73a1ea8315c..2283cf97ace 100644 --- a/apps/files_external/tests/Command/CommandTest.php +++ b/apps/files_external/tests/Command/CommandTest.php @@ -21,8 +21,8 @@ namespace OCA\Files_External\Tests\Command; -use OCA\Files_external\Lib\StorageConfig; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\Input; diff --git a/apps/files_external/tests/Command/ListCommandTest.php b/apps/files_external/tests/Command/ListCommandTest.php index 1475249ae43..fee53c9f143 100644 --- a/apps/files_external/tests/Command/ListCommandTest.php +++ b/apps/files_external/tests/Command/ListCommandTest.php @@ -26,7 +26,7 @@ use OCA\Files_External\Lib\Auth\NullMechanism; use OCA\Files_External\Lib\Auth\Password\Password; use OCA\Files_External\Lib\Auth\Password\SessionCredentials; use OCA\Files_External\Lib\Backend\Local; -use OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; use Symfony\Component\Console\Output\BufferedOutput; class ListCommandTest extends CommandTest { diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index 81625fbbcb9..4c3bd73fe4b 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -25,8 +25,8 @@ use \OCP\AppFramework\Http; use \OCA\Files_External\Controller\GlobalStoragesController; use \OCA\Files_External\Service\GlobalStoragesService; -use \OCA\Files_external\Lib\StorageConfig; -use \OCA\Files_external\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; abstract class StoragesControllerTest extends \Test\TestCase { diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/DefinitionParameterTest.php similarity index 100% rename from apps/files_external/tests/definitionparameterttest.php rename to apps/files_external/tests/DefinitionParameterTest.php diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php similarity index 100% rename from apps/files_external/tests/frontenddefinitiontraittest.php rename to apps/files_external/tests/FrontendDefinitionTraitTest.php diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php similarity index 100% rename from apps/files_external/tests/legacydependencycheckpolyfilltest.php rename to apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/OwnCloudFunctionsTest.php similarity index 98% rename from apps/files_external/tests/owncloudfunctions.php rename to apps/files_external/tests/OwnCloudFunctionsTest.php index 25aaa90d178..41ae0421ebf 100644 --- a/apps/files_external/tests/owncloudfunctions.php +++ b/apps/files_external/tests/OwnCloudFunctionsTest.php @@ -32,7 +32,7 @@ namespace OCA\Files_External\Tests; * * @package OCA\Files_External\Tests */ -class OwnCloudFunctions extends \Test\TestCase { +class OwnCloudFunctionsTest extends \Test\TestCase { function configUrlProvider() { return array( diff --git a/apps/files_external/tests/personalmounttest.php b/apps/files_external/tests/PersonalMountTest.php similarity index 97% rename from apps/files_external/tests/personalmounttest.php rename to apps/files_external/tests/PersonalMountTest.php index d82773ad749..8e8a299714f 100644 --- a/apps/files_external/tests/personalmounttest.php +++ b/apps/files_external/tests/PersonalMountTest.php @@ -19,7 +19,7 @@ * */ -namespace OCA\Files_external\Tests; +namespace OCA\Files_External\Tests; use OC\Files\Mount\Manager; use OCA\Files_External\Lib\PersonalMount; diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php index 7cc0d8fad93..5d1094271e5 100644 --- a/apps/files_external/tests/Service/StoragesServiceTest.php +++ b/apps/files_external/tests/Service/StoragesServiceTest.php @@ -24,8 +24,8 @@ namespace OCA\Files_External\Tests\Service; use \OC\Files\Filesystem; -use \OCA\Files_external\NotFoundException; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\DBConfigService; use OCA\Files_External\Service\StoragesService; @@ -241,7 +241,7 @@ abstract class StoragesServiceTest extends \Test\TestCase { /** - * @expectedException \OCA\Files_external\NotFoundException + * @expectedException \OCA\Files_External\NotFoundException */ public function testNonExistingStorage() { $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB'); @@ -324,7 +324,7 @@ abstract class StoragesServiceTest extends \Test\TestCase { } /** - * @expectedException \OCA\Files_external\NotFoundException + * @expectedException \OCA\Files_External\NotFoundException */ public function testDeleteUnexistingStorage() { $this->service->removeStorage(255); diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index 812c12392fc..4a03b6194e9 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -22,7 +22,7 @@ */ namespace OCA\Files_External\Tests\Service; -use OCA\Files_external\NotFoundException; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\StoragesService; use OCA\Files_External\Service\UserGlobalStoragesService; use OCP\IUser; diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php index 21696878a01..6ae888d8274 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -27,7 +27,7 @@ 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 OCA\Files_External\Lib\StorageConfig; use Test\Traits\UserTrait; /** @@ -185,7 +185,7 @@ class UserStoragesServiceTest extends StoragesServiceTest { } /** - * @expectedException \OCA\Files_external\NotFoundException + * @expectedException \OCA\Files_External\NotFoundException */ public function testGetAdminStorage() { $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB'); @@ -200,7 +200,7 @@ class UserStoragesServiceTest extends StoragesServiceTest { $newStorage = $this->globalStoragesService->addStorage($storage); - $this->assertInstanceOf('\OCA\Files_external\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId())); + $this->assertInstanceOf('\OCA\Files_External\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId())); $this->service->getStorage($newStorage->getId()); } diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/StorageConfigTest.php similarity index 97% rename from apps/files_external/tests/storageconfigtest.php rename to apps/files_external/tests/StorageConfigTest.php index 278c86d2cbe..a46ab14d84b 100644 --- a/apps/files_external/tests/storageconfigtest.php +++ b/apps/files_external/tests/StorageConfigTest.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Files_external\Tests; +namespace OCA\Files_External\Tests; -use \OCA\Files_external\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageConfig; class StorageConfigTest extends \Test\TestCase { From 64538740ec3bc24501145140314cf110cf77b364 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 17 May 2016 16:02:40 +0200 Subject: [PATCH 7/7] Fix missing imports --- apps/files_external/lib/Migration/StorageMigrator.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/files_external/lib/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php index a8b0461e7de..3cd7be3f953 100644 --- a/apps/files_external/lib/Migration/StorageMigrator.php +++ b/apps/files_external/lib/Migration/StorageMigrator.php @@ -24,9 +24,12 @@ namespace OCA\Files_External\Migration; use OCA\Files_External\Service\BackendService; 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 OCP\Files\Config\IUserMountCache; use OCP\IConfig; use OCP\IDBConnection;