32 files changed, 45 insertions, 56 deletions
diff --git a/apps/files_external/tests/amazons3migration.php b/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/auth/authmechanismtest.php b/apps/files_external/tests/Auth/AuthMechanismTest.php
index 789d1f62478..789d1f62478 100644
--- a/apps/files_external/tests/auth/authmechanismtest.php
+++ b/apps/files_external/tests/Auth/AuthMechanismTest.php
diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/Backend/BackendTest.php
index 50f6d975bf0..50f6d975bf0 100644
--- a/apps/files_external/tests/backend/backendtest.php
+++ b/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
index 465b79a6be6..465b79a6be6 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/Backend/LegacyBackendTest.php
diff --git a/apps/files_external/tests/command/applicabletest.php b/apps/files_external/tests/Command/ApplicableTest.php
index 64d41f6f245..64d41f6f245 100644
--- a/apps/files_external/tests/command/applicabletest.php
+++ b/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
index 9a0afbd3681..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;
@@ -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
index 3098906bcc6..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 {
@@ -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
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 <http://www.gnu.org/licenses/>
  *
  */
-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
index 4c3c62d5d6f..4c3bd73fe4b 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-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\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use \OCA\Files_External\Controller\GlobalStoragesController;
+use \OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 
 abstract class StoragesControllerTest extends \Test\TestCase {
 
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/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 <http://www.gnu.org/licenses/>
  *
  */
-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/definitionparameterttest.php b/apps/files_external/tests/DefinitionParameterTest.php
index 2f4069af0bd..2f4069af0bd 100644
--- a/apps/files_external/tests/definitionparameterttest.php
+++ b/apps/files_external/tests/DefinitionParameterTest.php
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php
index b3846fa1510..b3846fa1510 100644
--- a/apps/files_external/tests/frontenddefinitiontraittest.php
+++ b/apps/files_external/tests/FrontendDefinitionTraitTest.php
diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
index 4b1351a809d..4b1351a809d 100644
--- a/apps/files_external/tests/legacydependencycheckpolyfilltest.php
+++ b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
diff --git a/apps/files_external/tests/owncloudfunctions.php b/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
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/backendservicetest.php b/apps/files_external/tests/Service/BackendServiceTest.php
index ba9a1f533f2..ba9a1f533f2 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/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
index b088a7078d1..b088a7078d1 100644
--- a/apps/files_external/tests/service/dbconfigservicetest.php
+++ b/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
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 <http://www.gnu.org/licenses/>
  *
  */
-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
index f93c0134814..5d1094271e5 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/Service/StoragesServiceTest.php
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Service;
+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;
+use OCA\Files_External\Service\StoragesService;
 
 class CleaningDBConfig extends DBConfigService {
 	private $mountIds = [];
@@ -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 baecf143c66..4a03b6194e9 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -22,12 +22,9 @@
  */
 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\NotFoundException;
+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
index 37423cb8d74..6ae888d8274 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php
@@ -20,15 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-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\Lib\StorageConfig;
+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;
 
 /**
@@ -186,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');
@@ -201,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/storage/amazons3test.php b/apps/files_external/tests/Storage/AmazonS3Test.php
index eb0e410764c..eb0e410764c 100644
--- a/apps/files_external/tests/storage/amazons3test.php
+++ b/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
index d466d4b1b44..d466d4b1b44 100644
--- a/apps/files_external/tests/storage/dropboxtest.php
+++ b/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
index 9af9ccff012..9af9ccff012 100644
--- a/apps/files_external/tests/storage/ftptest.php
+++ b/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
index 46aa4555b12..46aa4555b12 100644
--- a/apps/files_external/tests/storage/googletest.php
+++ b/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
index cbc25e46fa0..cbc25e46fa0 100644
--- a/apps/files_external/tests/storage/owncloudtest.php
+++ b/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
index 329e93819fc..329e93819fc 100644
--- a/apps/files_external/tests/storage/sftptest.php
+++ b/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
index b974f88555f..b974f88555f 100644
--- a/apps/files_external/tests/storage/sftp_keytest.php
+++ b/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
index fc2795702c6..fc2795702c6 100644
--- a/apps/files_external/tests/storage/smbtest.php
+++ b/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
index 1bcbb815067..1bcbb815067 100644
--- a/apps/files_external/tests/storage/swifttest.php
+++ b/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
index f8c5b19e04f..f8c5b19e04f 100644
--- a/apps/files_external/tests/storage/webdavtest.php
+++ b/apps/files_external/tests/Storage/WebDAVTest.php
diff --git a/apps/files_external/tests/storageconfigtest.php b/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 {