Merge pull request #24619 from owncloud/files_external-psr4

Move files_external to PSR-4

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();

apps/files_external/appinfo/info.xml

@@ -19,6 +19,8 @@
 	</types>
 	<ocsid>166048</ocsid>
 
+	<namespace>Files_External</namespace>
+
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>

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');
+$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService');
-$userStorageService = $app->getContainer()->query('\OCA\Files_external\Service\UserStoragesService');
+$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService');
-$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_external\Service\ImportLegacyStoragesService');
+$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService');
 $backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService');
 
 /** @var Symfony\Component\Console\Application $application */

apps/files_external/appinfo/routes.php

@@ -26,8 +26,6 @@
  *
  */
 
-namespace OCA\Files_External\AppInfo;
-
 /**
  * @var $this \OCP\Route\IRouter
  **/

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();
 }

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 {
 

apps/files_external/lib/Command/Applicable.php

@@ -22,14 +22,11 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+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;

apps/files_external/lib/Command/Config.php

@@ -22,9 +22,9 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+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;

apps/files_external/lib/Command/Create.php

@@ -27,21 +27,16 @@ 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\GlobalStoragesService;
-use OCA\Files_external\Service\ImportLegacyStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
-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 {

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\NotFoundException;
+use OCA\Files_External\Service\GlobalStoragesService;
-use OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
-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;

apps/files_external/lib/Command/Import.php

@@ -23,21 +23,17 @@ 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\GlobalStoragesService;
-use OCA\Files_external\Service\ImportLegacyStoragesService;
+use OCA\Files_External\Service\ImportLegacyStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+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 {

apps/files_external/lib/Command/ListCommand.php

@@ -23,12 +23,11 @@ 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\GlobalStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+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;

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\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 {

apps/files_external/lib/Command/Verify.php

@@ -25,13 +25,10 @@ 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\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+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;

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;

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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_External\Service\BackendService;
 
 /**
  * Global storages controller

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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+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

apps/files_external/lib/Controller/UserGlobalStoragesController.php

@@ -30,9 +30,9 @@ 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 use OCP\IUserSession;
 

apps/files_external/lib/Controller/UserStoragesController.php

@@ -25,19 +25,15 @@ 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\UserStoragesService;
-use \OCA\Files_External\Service\BackendService;
+use OCA\Files_External\NotFoundException;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 
 /**

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

apps/files_external/lib/Lib/Auth/NullMechanism.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;
 
 /**
  * Null authentication mechanism

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;

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;

apps/files_external/lib/Migration/StorageMigrator.php

@@ -20,22 +20,21 @@
  *
  */
 
-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\GlobalLegacyStoragesService;
-use OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
-use OCA\Files_external\Service\LegacyStoragesService;
+use OCA\Files_External\Service\LegacyStoragesService;
-use OCA\Files_external\Service\StoragesService;
+use OCA\Files_External\Service\StoragesService;
-use OCA\Files_external\Service\UserLegacyStoragesService;
+use OCA\Files_External\Service\UserLegacyStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 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

apps/files_external/lib/NotFoundException.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external;
+namespace OCA\Files_External;
 
 /**
  * Storage is not found

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

apps/files_external/lib/Service/GlobalStoragesService.php

@@ -22,13 +22,11 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
+
 
-use \OCP\IUserSession;
 use \OC\Files\Filesystem;
-
+use OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
 
 /**
  * Service class to manage global external storages

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;

apps/files_external/lib/Service/LegacyStoragesService.php

@@ -19,9 +19,9 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Read mount config from legacy mount.json

apps/files_external/lib/Service/StoragesService.php

@@ -23,11 +23,11 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use \OC\Files\Filesystem;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCP\Files\Config\IUserMountCache;

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;
 
 /**

apps/files_external/lib/Service/UserLegacyStoragesService.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use OCP\IUserSession;
 

apps/files_external/lib/Service/UserStoragesService.php

@@ -21,14 +21,14 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use OCP\Files\Config\IUserMountCache;
 use \OCP\IUserSession;
 use \OC\Files\Filesystem;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Service\UserTrait;
 

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) {

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());

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');

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

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\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+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();
 

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 */
+		/** @var \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject $globalService */
-		$globalService = $this->getMock('\OCA\Files_external\Service\GlobalStoragesService', null, [], '', false);
+		$globalService = $this->getMock('\OCA\Files_External\Service\GlobalStoragesService', null, [], '', false);
-		/** @var \OCA\Files_external\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */
+		/** @var \OCA\Files_External\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */
-		$userService = $this->getMock('\OCA\Files_external\Service\UserStoragesService', null, [], '', false);
+		$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 */

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\Controller\GlobalStoragesController;
-use \OCA\Files_external\Service\GlobalStoragesService;
 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();
 

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\Controller\GlobalStoragesController;
-use \OCA\Files_external\Service\GlobalStoragesService;
+use \OCA\Files_External\Service\GlobalStoragesService;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 
 abstract class StoragesControllerTest extends \Test\TestCase {
 

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\Controller\UserStoragesController;
-use \OCA\Files_external\Service\UserStoragesService;
 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();