diff --git a/appinfo/autoload.php b/appinfo/autoload.php deleted file mode 100644 index 93a5e81f..00000000 --- a/appinfo/autoload.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @copyright Sander Brand 2016 - */ - -namespace OCA\Passman\AppInfo; - - diff --git a/appinfo/routes.php b/appinfo/routes.php index f3d3db75..b0e56b99 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -19,88 +19,88 @@ */ return [ 'routes' => [ - ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], - ['name' => 'page#bookmarklet', 'url' => '/bookmarklet', 'verb' => 'GET'], - ['name' => 'page#publicSharePage', 'url' => '/share/public', 'verb' => 'GET'], + ['name' => 'Page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'Page#bookmarklet', 'url' => '/bookmarklet', 'verb' => 'GET'], + ['name' => 'Page#publicSharePage', 'url' => '/share/public', 'verb' => 'GET'], //Vault - ['name' => 'vault#listVaults', 'url' => '/api/v2/vaults', 'verb' => 'GET'], - ['name' => 'vault#create', 'url' => '/api/v2/vaults', 'verb' => 'POST'], - ['name' => 'vault#get', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'GET'], - ['name' => 'vault#update', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'PATCH'], - ['name' => 'vault#delete', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'DELETE'], + ['name' => 'Vault#listVaults', 'url' => '/api/v2/vaults', 'verb' => 'GET'], + ['name' => 'Vault#create', 'url' => '/api/v2/vaults', 'verb' => 'POST'], + ['name' => 'Vault#get', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'GET'], + ['name' => 'Vault#update', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'PATCH'], + ['name' => 'Vault#delete', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'DELETE'], //@TODO make frontend use PATCH - ['name' => 'vault#updateSharingKeys', 'url' => '/api/v2/vaults/{vault_guid}/sharing-keys', 'verb' => 'POST'], + ['name' => 'Vault#updateSharingKeys', 'url' => '/api/v2/vaults/{vault_guid}/sharing-keys', 'verb' => 'POST'], //Credential - ['name' => 'credential#createCredential', 'url' => '/api/v2/credentials', 'verb' => 'POST'], - ['name' => 'credential#getCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'GET'], - ['name' => 'credential#updateCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'PATCH'], - ['name' => 'credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'DELETE'], + ['name' => 'Credential#createCredential', 'url' => '/api/v2/credentials', 'verb' => 'POST'], + ['name' => 'Credential#getCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'GET'], + ['name' => 'Credential#updateCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'PATCH'], + ['name' => 'Credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'DELETE'], //Revisions - ['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'], - ['name' => 'credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'DELETE'], - ['name' => 'credential#updateRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'PATCH'], + ['name' => 'Credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'], + ['name' => 'Credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'DELETE'], + ['name' => 'Credential#updateRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'PATCH'], //File stuff - ['name' => 'file#uploadFile', 'url' => '/api/v2/file', 'verb' => 'POST'], - ['name' => 'file#getFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'GET'], - ['name' => 'file#deleteFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'DELETE'], - ['name' => 'file#deleteFiles', 'url' => '/api/v2/files/delete', 'verb' => 'POST'], - ['name' => 'file#updateFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'PATCH'], + ['name' => 'File#uploadFile', 'url' => '/api/v2/file', 'verb' => 'POST'], + ['name' => 'File#getFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'GET'], + ['name' => 'File#deleteFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'DELETE'], + ['name' => 'File#deleteFiles', 'url' => '/api/v2/files/delete', 'verb' => 'POST'], + ['name' => 'File#updateFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'PATCH'], //Sharing stuff - ['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], - ['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], - ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], - ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], - ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], - ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], - ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], - ['name' => 'share#getVaultAclEntries', 'url' => '/api/v2/sharing/vault/{vault_guid}/acl', 'verb' => 'GET'], - ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], - ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], - ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], - ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], - ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], - ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], - ['name' => 'share#uploadFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file', 'verb' => 'POST'], - ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], - ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], - ['name' => 'share#updateSharedCredentialACLSharedKey', 'url' => '/api/v2/sharing/credential/{item_guid}/acl/shared_key', 'verb' => 'PATCH'], - ['name' => 'internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'], + ['name' => 'Share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], + ['name' => 'Share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], + ['name' => 'Share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], + ['name' => 'Share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], + ['name' => 'Share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], + ['name' => 'Share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], + ['name' => 'Share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], + ['name' => 'Share#getVaultAclEntries', 'url' => '/api/v2/sharing/vault/{vault_guid}/acl', 'verb' => 'GET'], + ['name' => 'Share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], + ['name' => 'Share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], + ['name' => 'Share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], + ['name' => 'Share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], + ['name' => 'Share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], + ['name' => 'Share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], + ['name' => 'Share#uploadFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file', 'verb' => 'POST'], + ['name' => 'Share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], + ['name' => 'Share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], + ['name' => 'Share#updateSharedCredentialACLSharedKey', 'url' => '/api/v2/sharing/credential/{item_guid}/acl/shared_key', 'verb' => 'PATCH'], + ['name' => 'Internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'], //Settings - ['name' => 'settings#getSettings', 'url' => '/api/v2/settings', 'verb' => 'GET'], - ['name' => 'settings#saveUserSetting', 'url' => '/api/v2/settings/{key}/{value}', 'verb' => 'POST'], - ['name' => 'settings#saveAdminSetting', 'url' => '/api/v2/settings/{key}/{value}/admin1/admin2', 'verb' => 'POST'], + ['name' => 'Settings#getSettings', 'url' => '/api/v2/settings', 'verb' => 'GET'], + ['name' => 'Settings#saveUserSetting', 'url' => '/api/v2/settings/{key}/{value}', 'verb' => 'POST'], + ['name' => 'Settings#saveAdminSetting', 'url' => '/api/v2/settings/{key}/{value}/admin1/admin2', 'verb' => 'POST'], //Translations - ['name' => 'translation#getLanguageStrings', 'url' => '/api/v2/language', 'verb' => 'GET'], + ['name' => 'Translation#getLanguageStrings', 'url' => '/api/v2/language', 'verb' => 'GET'], #Icons - ['name' => 'icon#getSingleIcon', 'url' => '/api/v2/geticon/{base64Url}', 'verb' => 'GET'], - ['name' => 'icon#getIcon', 'url' => '/api/v2/icon/{base64Url}', 'verb' => 'GET'], - ['name' => 'icon#getIcon', 'url' => '/api/v2/icon/{base64Url}/{credentialId}', 'verb' => 'GET'], - ['name' => 'icon#getLocalIconList', 'url' => '/api/v2/icon/list', 'verb' => 'GET'], + ['name' => 'Icon#getSingleIcon', 'url' => '/api/v2/geticon/{base64Url}', 'verb' => 'GET'], + ['name' => 'Icon#getIcon', 'url' => '/api/v2/icon/{base64Url}', 'verb' => 'GET'], + ['name' => 'Icon#getIcon', 'url' => '/api/v2/icon/{base64Url}/{credentialId}', 'verb' => 'GET'], + ['name' => 'Icon#getLocalIconList', 'url' => '/api/v2/icon/list', 'verb' => 'GET'], // - ['name' => 'vault#preflighted_cors', 'url' => '/api/v2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')], + ['name' => 'Vault#preflighted_cors', 'url' => '/api/v2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')], //Internal API - ['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'], - ['name' => 'internal#read', 'url' => '/api/internal/notifications/read/{credential_id}', 'verb' => 'DELETE'], - ['name' => 'internal#getAppVersion', 'url' => '/api/internal/version', 'verb' => 'GET'], - ['name' => 'internal#generatePerson', 'url' => '/api/internal/generate_person', 'verb' => 'GET'], + ['name' => 'Internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'], + ['name' => 'Internal#read', 'url' => '/api/internal/notifications/read/{credential_id}', 'verb' => 'DELETE'], + ['name' => 'Internal#getAppVersion', 'url' => '/api/internal/version', 'verb' => 'GET'], + ['name' => 'Internal#generatePerson', 'url' => '/api/internal/generate_person', 'verb' => 'GET'], //Admin routes - ['name' => 'admin#searchUser', 'url' => '/admin/search', 'verb' => 'GET'], - ['name' => 'admin#moveCredentials', 'url' => '/admin/move', 'verb' => 'POST'], - ['name' => 'admin#requestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'POST'], - ['name' => 'admin#deleteRequestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'DELETE'], - ['name' => 'admin#listRequests', 'url' => '/admin/delete-requests', 'verb' => 'GET'], - ['name' => 'admin#acceptRequestDeletion', 'url' => '/admin/accept-delete-request', 'verb' => 'POST'], + ['name' => 'Admin#searchUser', 'url' => '/admin/search', 'verb' => 'GET'], + ['name' => 'Admin#moveCredentials', 'url' => '/admin/move', 'verb' => 'POST'], + ['name' => 'Admin#requestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'POST'], + ['name' => 'Admin#deleteRequestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'DELETE'], + ['name' => 'Admin#listRequests', 'url' => '/admin/delete-requests', 'verb' => 'GET'], + ['name' => 'Admin#acceptRequestDeletion', 'url' => '/admin/accept-delete-request', 'verb' => 'POST'], ] ]; diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index c97f78e5..02e2ab62 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -25,7 +25,7 @@ namespace OCA\Passman\AppInfo; use OC\Files\View; use OC\ServerContainer; -use OCA\Passman\Controller\ShareController; +use OCA\Passman\controller\ShareController; use OCA\Passman\Middleware\APIMiddleware; use OCA\Passman\Middleware\ShareMiddleware; use OCA\Passman\Notifier; @@ -149,7 +149,7 @@ class Application extends App implements IBootstrap { 'id' => $c->getAppName(), 'order' => 10, 'name' => $c->get(IL10N::class)->t('Passwords'), - 'href' => $urlGenerator->linkToRoute('passman.page.index'), + 'href' => $urlGenerator->linkToRoute('passman.Page.index'), 'icon' => $urlGenerator->imagePath($c->getAppName(), 'app.svg'), ]; }; diff --git a/controller/AdminController.php b/lib/Controller/AdminController.php similarity index 99% rename from controller/AdminController.php rename to lib/Controller/AdminController.php index 2593fbf0..8376408d 100644 --- a/controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -9,21 +9,21 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Db\Credential; use OCA\Passman\Db\CredentialRevision; use OCA\Passman\Db\DeleteVaultRequest; use OCA\Passman\Service\CredentialRevisionService; +use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\DeleteVaultRequestService; use OCA\Passman\Service\FileService; use OCA\Passman\Service\VaultService; use OCA\Passman\Utility\Utils; +use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; use OCP\IConfig; use OCP\IRequest; -use OCP\AppFramework\Http\JSONResponse; -use OCP\AppFramework\ApiController; -use OCA\Passman\Service\CredentialService; use OCP\IUserManager; diff --git a/controller/CredentialController.php b/lib/Controller/CredentialController.php similarity index 99% rename from controller/CredentialController.php rename to lib/Controller/CredentialController.php index 87c029c6..bb81937f 100644 --- a/controller/CredentialController.php +++ b/lib/Controller/CredentialController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Activity; use OCA\Passman\Db\Credential; diff --git a/controller/FileController.php b/lib/Controller/FileController.php similarity index 97% rename from controller/FileController.php rename to lib/Controller/FileController.php index af9b2911..9ffc469a 100644 --- a/controller/FileController.php +++ b/lib/Controller/FileController.php @@ -9,11 +9,10 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Service\FileService; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; use Psr\Log\LoggerInterface; diff --git a/controller/IconController.php b/lib/Controller/IconController.php similarity index 99% rename from controller/IconController.php rename to lib/Controller/IconController.php index 0bf9d221..66f0f786 100644 --- a/controller/IconController.php +++ b/lib/Controller/IconController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use Doctrine\DBAL\Exception\DriverException; use OC\App\AppManager; diff --git a/controller/InternalController.php b/lib/Controller/InternalController.php similarity index 99% rename from controller/InternalController.php rename to lib/Controller/InternalController.php index 79c9cf26..110772e2 100644 --- a/controller/InternalController.php +++ b/lib/Controller/InternalController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Service\CredentialService; use OCP\App\IAppManager; diff --git a/controller/PageController.php b/lib/Controller/PageController.php similarity index 84% rename from controller/PageController.php rename to lib/Controller/PageController.php index 47d35a41..79eb9474 100644 --- a/controller/PageController.php +++ b/lib/Controller/PageController.php @@ -9,21 +9,16 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IRequest; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IRequest; class PageController extends Controller { - - private $userId; - - public function __construct($AppName, IRequest $request, $UserId){ + public function __construct(string $AppName, IRequest $request, private string $userId) { parent::__construct($AppName, $request); - $this->userId = $UserId; } /** @@ -46,7 +41,7 @@ class PageController extends Controller { * @NoAdminRequired * @NoCSRFRequired */ - public function bookmarklet($url='',$title='') { + public function bookmarklet($url='', $title='') { $params = array('url' => $url, 'title' => $title); return new TemplateResponse('passman', 'bookmarklet', $params); } @@ -60,4 +55,4 @@ class PageController extends Controller { return new TemplateResponse('passman', 'public_share'); } -} \ No newline at end of file +} diff --git a/controller/SettingsController.php b/lib/Controller/SettingsController.php similarity index 96% rename from controller/SettingsController.php rename to lib/Controller/SettingsController.php index 578fd512..eb4aa2b8 100644 --- a/controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -9,15 +9,14 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IL10N; -use OCP\Settings\ISettings; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\JSONResponse; -use OCP\AppFramework\ApiController; -use OCP\IRequest; use OCA\Passman\Service\SettingsService; +use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IL10N; +use OCP\IRequest; class SettingsController extends ApiController { private $userId; @@ -98,4 +97,4 @@ class SettingsController extends ApiController { return new JSONResponse('OK'); } -} \ No newline at end of file +} diff --git a/controller/ShareController.php b/lib/Controller/ShareController.php similarity index 99% rename from controller/ShareController.php rename to lib/Controller/ShareController.php index a8a97401..813847ad 100644 --- a/controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Activity; use OCA\Passman\Db\File; diff --git a/controller/TranslationController.php b/lib/Controller/TranslationController.php similarity index 99% rename from controller/TranslationController.php rename to lib/Controller/TranslationController.php index 47a4fa4d..5791cfb8 100644 --- a/controller/TranslationController.php +++ b/lib/Controller/TranslationController.php @@ -9,12 +9,12 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IRequest; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; use OCP\IL10N; +use OCP\IRequest; class TranslationController extends ApiController { private $trans; diff --git a/controller/VaultController.php b/lib/Controller/VaultController.php similarity index 98% rename from controller/VaultController.php rename to lib/Controller/VaultController.php index 1455efa0..681de8a8 100644 --- a/controller/VaultController.php +++ b/lib/Controller/VaultController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Db\Credential; use OCA\Passman\Service\CredentialService; @@ -19,7 +19,6 @@ use OCA\Passman\Service\SettingsService; use OCA\Passman\Service\VaultService; use OCA\Passman\Utility\NotFoundJSONResponse; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; use Psr\Log\LoggerInterface; diff --git a/middleware/ShareMiddleware.php b/middleware/ShareMiddleware.php index 35553316..1235a00e 100644 --- a/middleware/ShareMiddleware.php +++ b/middleware/ShareMiddleware.php @@ -2,11 +2,11 @@ namespace OCA\Passman\Middleware; -use OCA\Passman\Controller\ShareController; +use OCA\Passman\controller\ShareController; use OCA\Passman\Service\SettingsService; -use OCP\AppFramework\Http\JSONResponse; -use \OCP\AppFramework\Middleware; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Middleware; class ShareMiddleware extends Middleware { diff --git a/tests/unit/controller/FileControllerTest.php b/tests/unit/controller/FileControllerTest.php index 105d9faa..68ea0005 100644 --- a/tests/unit/controller/FileControllerTest.php +++ b/tests/unit/controller/FileControllerTest.php @@ -23,25 +23,15 @@ namespace OCA\Passman\Controller; -use OCA\Comments\Activity\Setting; -use OCA\Passman\Service\ActivityService; -use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\FileService; -use OCA\Passman\Service\NotificationService; -use OCA\Passman\Service\SettingsService; -use OCA\Passman\Service\ShareService; -use OCA\Passman\Service\VaultService; -use OCP\IGroupManager; -use OCP\IUserManager; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class FileControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\FileController + * @coversDefaultClass \OCA\Passman\controller\FileController */ class FileControllerTest extends PHPUnit_Framework_TestCase { @@ -96,4 +86,4 @@ class FileControllerTest extends PHPUnit_Framework_TestCase { $this->controller->updateFile('6AD30804-BFFC-4EFC-97F8-20A126FA1709', '0' , '0.jpg'); $this->assertTrue(true); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/InternalControllerTest.php b/tests/unit/controller/InternalControllerTest.php index eeeb13ab..025f0603 100644 --- a/tests/unit/controller/InternalControllerTest.php +++ b/tests/unit/controller/InternalControllerTest.php @@ -23,15 +23,14 @@ namespace OCA\Passman\Controller; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class InternalControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\InternalController + * @coversDefaultClass \OCA\Passman\controller\InternalController */ class InternalControllerTest extends PHPUnit_Framework_TestCase { @@ -97,4 +96,4 @@ class InternalControllerTest extends PHPUnit_Framework_TestCase { $this->assertTrue(true); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index abda25e3..0e441d6a 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -23,15 +23,14 @@ namespace OCA\Passman\Controller; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\TemplateResponse; +use PHPUnit_Framework_TestCase; /** * Class PageControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\PageController + * @coversDefaultClass \OCA\Passman\controller\PageController */ class PageControllerTest extends PHPUnit_Framework_TestCase { @@ -74,4 +73,4 @@ class PageControllerTest extends PHPUnit_Framework_TestCase { $this->assertEquals('public_share', $result->getTemplateName()); $this->assertTrue($result instanceof TemplateResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/SettingsControllerTest.php b/tests/unit/controller/SettingsControllerTest.php index 0b280e83..88f3c6c1 100644 --- a/tests/unit/controller/SettingsControllerTest.php +++ b/tests/unit/controller/SettingsControllerTest.php @@ -23,17 +23,16 @@ namespace OCA\Passman\Controller; +use OCA\Passman\Service\SettingsService; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; use PHPUnit_Framework_TestCase; -use OCA\Passman\Service\SettingsService; /** * Class SettingsControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\SettingsController + * @coversDefaultClass \OCA\Passman\controller\SettingsController */ class SettingsControllerTest extends PHPUnit_Framework_TestCase { @@ -97,4 +96,4 @@ class SettingsControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->saveAdminSetting('admin', 'value'); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/TranslationControllerTest.php b/tests/unit/controller/TranslationControllerTest.php index 4a575266..1e6f5884 100644 --- a/tests/unit/controller/TranslationControllerTest.php +++ b/tests/unit/controller/TranslationControllerTest.php @@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase; * Class TranslationControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\TranslationController + * @coversDefaultClass \OCA\Passman\controller\TranslationController */ class TranslationControllerTest extends PHPUnit_Framework_TestCase { @@ -53,4 +53,4 @@ class TranslationControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->getLanguageStrings(null); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/VaultControllerTest.php b/tests/unit/controller/VaultControllerTest.php index 69a60a23..24e6e406 100644 --- a/tests/unit/controller/VaultControllerTest.php +++ b/tests/unit/controller/VaultControllerTest.php @@ -27,15 +27,14 @@ use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\DeleteVaultRequestService; use OCA\Passman\Service\SettingsService; use OCA\Passman\Service\VaultService; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class VaultControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\VaultController + * @coversDefaultClass \OCA\Passman\controller\VaultController */ class VaultControllerTest extends PHPUnit_Framework_TestCase { @@ -110,4 +109,4 @@ class VaultControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->delete(''); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +}