Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Move remaining classes to PSR-4

remotes/origin/pre902-webupdate-encryption-repair
Joas Schilling 10 years ago
parent
4576891f10
commit
f14dff680d
No known key found for this signature in database GPG Key ID: 70A0B324C41C0946
47 changed files with 47 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      apps/files_external/lib/Command/Applicable.php
  2. 4
      apps/files_external/lib/Command/Config.php
  3. 2
      apps/files_external/lib/Command/Create.php
  4. 2
      apps/files_external/lib/Command/Delete.php
  5. 2
      apps/files_external/lib/Command/Import.php
  6. 2
      apps/files_external/lib/Command/ListCommand.php
  7. 2
      apps/files_external/lib/Command/Option.php
  8. 4
      apps/files_external/lib/Command/Verify.php
  9. 2
      apps/files_external/lib/Controller/GlobalStoragesController.php
  10. 4
      apps/files_external/lib/Controller/StoragesController.php
  11. 4
      apps/files_external/lib/Controller/UserGlobalStoragesController.php
  12. 4
      apps/files_external/lib/Controller/UserStoragesController.php
  13. 0
      apps/files_external/lib/Lib/Api.php
  14. 2
      apps/files_external/lib/Lib/Auth/Builtin.php
  15. 1
      apps/files_external/lib/Lib/Auth/NullMechanism.php
  16. 0
      apps/files_external/lib/Lib/DefinitionParameter.php
  17. 0
      apps/files_external/lib/Lib/DependencyTrait.php
  18. 0
      apps/files_external/lib/Lib/FrontendDefinitionTrait.php
  19. 0
      apps/files_external/lib/Lib/IdentifierTrait.php
  20. 0
      apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
  21. 0
      apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
  22. 0
      apps/files_external/lib/Lib/MissingDependency.php
  23. 0
      apps/files_external/lib/Lib/PersonalMount.php
  24. 0
      apps/files_external/lib/Lib/PriorityTrait.php
  25. 0
      apps/files_external/lib/Lib/SessionStorageWrapper.php
  26. 2
      apps/files_external/lib/Lib/StorageConfig.php
  27. 0
      apps/files_external/lib/Lib/StorageModifierTrait.php
  28. 0
      apps/files_external/lib/Lib/VisibilityTrait.php
  29. 2
      apps/files_external/lib/NotFoundException.php
  30. 6
      apps/files_external/lib/Service/GlobalStoragesService.php
  31. 2
      apps/files_external/lib/Service/LegacyStoragesService.php
  32. 4
      apps/files_external/lib/Service/StoragesService.php
  33. 4
      apps/files_external/lib/Service/UserStoragesService.php
  34. 4
      apps/files_external/lib/config.php
  35. 2
      apps/files_external/tests/AmazonS3MigrationTest.php
  36. 4
      apps/files_external/tests/Command/CommandTest.php
  37. 2
      apps/files_external/tests/Command/ListCommandTest.php
  38. 4
      apps/files_external/tests/Controller/StoragesControllerTest.php
  39. 0
      apps/files_external/tests/DefinitionParameterTest.php
  40. 0
      apps/files_external/tests/FrontendDefinitionTraitTest.php
  41. 0
      apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
  42. 2
      apps/files_external/tests/OwnCloudFunctionsTest.php
  43. 2
      apps/files_external/tests/PersonalMountTest.php
  44. 8
      apps/files_external/tests/Service/StoragesServiceTest.php
  45. 2
      apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
  46. 6
      apps/files_external/tests/Service/UserStoragesServiceTest.php
  47. 4
      apps/files_external/tests/StorageConfigTest.php

4
apps/files_external/lib/Command/Applicable.php
View File

@ -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;

4
apps/files_external/lib/Command/Config.php
View File

@ -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;

2
apps/files_external/lib/Command/Create.php
View File

@ -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;

2
apps/files_external/lib/Command/Delete.php
View File

@ -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;

2
apps/files_external/lib/Command/Import.php
View File

@ -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;

2
apps/files_external/lib/Command/ListCommand.php
View File

@ -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;

2
apps/files_external/lib/Command/Option.php
View File

@ -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;

4
apps/files_external/lib/Command/Verify.php
View File

@ -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;

2
apps/files_external/lib/Controller/GlobalStoragesController.php
View File

@ -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

4
apps/files_external/lib/Controller/StoragesController.php
View File

@ -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;

4
apps/files_external/lib/Controller/UserGlobalStoragesController.php
View File

@ -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;

4
apps/files_external/lib/Controller/UserStoragesController.php
View File

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

0
apps/files_external/lib/api.php → apps/files_external/lib/Lib/Api.php
View File

2
apps/files_external/lib/Lib/Auth/Builtin.php
View File

@ -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

1
apps/files_external/lib/Lib/Auth/NullMechanism.php
View File

@ -22,7 +22,6 @@
namespace OCA\Files_External\Lib\Auth;
use \OCP\IL10N;
use \OCA\Files_external\Lib\StorageConfig;
/**
* Null authentication mechanism

0
apps/files_external/lib/definitionparameter.php → apps/files_external/lib/Lib/DefinitionParameter.php
View File

0
apps/files_external/lib/dependencytrait.php → apps/files_external/lib/Lib/DependencyTrait.php
View File

0
apps/files_external/lib/frontenddefinitiontrait.php → apps/files_external/lib/Lib/FrontendDefinitionTrait.php
View File

0
apps/files_external/lib/identifiertrait.php → apps/files_external/lib/Lib/IdentifierTrait.php
View File

0
apps/files_external/lib/insufficientdataformeaningfulanswerexception.php → apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
View File

0
apps/files_external/lib/legacydependencycheckpolyfill.php → apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
View File

0
apps/files_external/lib/missingdependency.php → apps/files_external/lib/Lib/MissingDependency.php
View File

0
apps/files_external/lib/personalmount.php → apps/files_external/lib/Lib/PersonalMount.php
View File

0
apps/files_external/lib/prioritytrait.php → apps/files_external/lib/Lib/PriorityTrait.php
View File

0
apps/files_external/lib/sessionstoragewrapper.php → apps/files_external/lib/Lib/SessionStorageWrapper.php
View File

2
apps/files_external/lib/storageconfig.php → apps/files_external/lib/Lib/StorageConfig.php
View File

@ -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;

0
apps/files_external/lib/storagemodifiertrait.php → apps/files_external/lib/Lib/StorageModifierTrait.php
View File

0
apps/files_external/lib/visibilitytrait.php → apps/files_external/lib/Lib/VisibilityTrait.php
View File

2
apps/files_external/lib/notfoundexception.php → apps/files_external/lib/NotFoundException.php
View File

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

6
apps/files_external/lib/Service/GlobalStoragesService.php
View File

@ -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

2
apps/files_external/lib/Service/LegacyStoragesService.php
View File

@ -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

4
apps/files_external/lib/Service/StoragesService.php
View File

@ -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;

4
apps/files_external/lib/Service/UserStoragesService.php
View File

@ -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;

4
apps/files_external/lib/config.php
View File

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

2
apps/files_external/tests/amazons3migration.php → apps/files_external/tests/AmazonS3MigrationTest.php
View File

@ -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

4
apps/files_external/tests/Command/CommandTest.php
View File

@ -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;

2
apps/files_external/tests/Command/ListCommandTest.php
View File

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

4
apps/files_external/tests/Controller/StoragesControllerTest.php
View File

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

0
apps/files_external/tests/definitionparameterttest.php → apps/files_external/tests/DefinitionParameterTest.php
View File

0
apps/files_external/tests/frontenddefinitiontraittest.php → apps/files_external/tests/FrontendDefinitionTraitTest.php
View File

0
apps/files_external/tests/legacydependencycheckpolyfilltest.php → apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
View File

2
apps/files_external/tests/owncloudfunctions.php → apps/files_external/tests/OwnCloudFunctionsTest.php
View File

@ -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(

2
apps/files_external/tests/personalmounttest.php → apps/files_external/tests/PersonalMountTest.php
View File

@ -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;

8
apps/files_external/tests/Service/StoragesServiceTest.php
View File

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

2
apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
View File

@ -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;

6
apps/files_external/tests/Service/UserStoragesServiceTest.php
View File

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

4
apps/files_external/tests/storageconfigtest.php → apps/files_external/tests/StorageConfigTest.php
View File

@ -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 {
Write Preview
Loading…
Cancel
Save