From f14dff680d5e1e0fe10065ed25c524d9b5078cae Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 13 May 2016 11:56:47 +0200 Subject: [PATCH] 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 902e76cb4c..4e178edbba 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 873fece86d..909b130f17 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 17ad7ef1a1..e5fd095d6f 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 a3aef7f330..64228b2033 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 55528b6647..4f881acb50 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 cbe1913ccf..c1fb18b3bc 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 109ca26c31..4f7733b25d 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 6ff871a609..dfc536530b 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 2471ac861d..0ae9e1fd5e 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 da26f24b6b..a368169944 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 c420d9ad59..ee4cd64001 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 e20a41e0cc..1850d0087b 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 8b43cb459c..c5c3a19e54 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 c0a8f4f119..671a5ff66c 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 590a5f5324..2a22b324ea 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 dd3dd1907a..80333c103c 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 6032a82773..592283444d 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 40f57e4550..365181d746 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 0999c0a7ad..4fb0f65e76 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 b64f289b3e..a527acbba3 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 70f8550f39..d581deab19 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 614d6ca33d..132d907ab1 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 73a1ea8315..2283cf97ac 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 1475249ae4..fee53c9f14 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 81625fbbcb..4c3bd73fe4 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 25aaa90d17..41ae0421eb 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 d82773ad74..8e8a299714 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 7cc0d8fad9..5d1094271e 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 812c12392f..4a03b6194e 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 21696878a0..6ae888d827 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 278c86d2cb..a46ab14d84 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 {