mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do proper DI 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-04-05 22:35:59 +02:00
parent 3bc72f7224
commit 53bca14a27
No known key found for this signature in database
GPG Key ID: F941078878347C0C
17 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/federatedfilesharing/lib/AppInfo/Application.php
View File

@ -51,7 +51,7 @@ class Application extends App {
$notification = new Notifications(
$addressHandler,
$server->getHTTPClientService(),
$server->getOCSDiscoveryService(),
$server->query(\OCP\OCS\IDiscoveryService::class),
\OC::$server->getJobList()
);
return new RequestHandlerController(
@ -99,7 +99,7 @@ class Application extends App {
$notifications = new \OCA\FederatedFileSharing\Notifications(
$addressHandler,
\OC::$server->getHTTPClientService(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
\OC::$server->getJobList()
);
$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(

2
apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php
View File

@ -70,7 +70,7 @@ class RetryJob extends Job {
$this->notifications = new Notifications(
$addressHandler,
\OC::$server->getHTTPClientService(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
\OC::$server->getJobList()
);
}

2
apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View File

@ -254,7 +254,7 @@ class MountPublicLinkController extends Controller {
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
\OC::$server->getUserSession()->getUser()->getUID()
);

2
apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
View File

@ -158,7 +158,7 @@ class RequestHandlerController extends OCSController {
\OC\Files\Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
$shareWith
);

2
apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
View File

@ -276,7 +276,7 @@ class RequestHandlerControllerTest extends TestCase {
Filesystem::getLoader(),
$httpClientService,
\OC::$server->getNotificationManager(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
$toDelete
);

2
apps/federation/lib/AppInfo/Application.php
View File

@ -135,7 +135,7 @@ class Application extends \OCP\AppFramework\App {
public function getSyncService() {
$syncService = \OC::$server->query('CardDAVSyncService');
$dbHandler = $this->getContainer()->query('DbHandler');
$discoveryService = \OC::$server->getOCSDiscoveryService();
$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
return new SyncFederationAddressBooks($dbHandler, $syncService, $discoveryService);
}

2
apps/federation/lib/BackgroundJob/GetSharedSecret.php
View File

@ -101,7 +101,7 @@ class GetSharedSecret extends Job{
$this->jobList = $jobList ? $jobList : \OC::$server->getJobList();
$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->getOCSDiscoveryService();
$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
if ($trustedServers) {
$this->trustedServers = $trustedServers;
} else {

2
apps/federation/lib/BackgroundJob/RequestSharedSecret.php
View File

@ -99,7 +99,7 @@ class RequestSharedSecret extends Job {
$this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator();
$this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation'));
$this->logger = \OC::$server->getLogger();
$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->getOCSDiscoveryService();
$this->ocsDiscoveryService = $ocsDiscoveryService ? $ocsDiscoveryService : \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
if ($trustedServers) {
$this->trustedServers = $trustedServers;
} else {

2
apps/files_sharing/lib/AppInfo/Application.php
View File

@ -98,7 +98,7 @@ class Application extends App {
\OC\Files\Filesystem::getLoader(),
$server->getHTTPClientService(),
$server->getNotificationManager(),
$server->getOCSDiscoveryService(),
$server->query(\OCP\OCS\IDiscoveryService::class),
$uid
);
});

2
apps/files_sharing/lib/External/Storage.php vendored
View File

@ -65,7 +65,7 @@ class Storage extends DAV implements ISharedStorage {
$this->manager = $options['manager'];
$this->cloudId = $options['cloudId'];
$discoveryService = \OC::$server->getOCSDiscoveryService();
$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
list($protocol, $remote) = explode('://', $this->cloudId->getRemote());
if (strpos($remote, '/')) {

2
apps/files_sharing/lib/Hooks.php
View File

@ -38,7 +38,7 @@ class Hooks {
\OC\Files\Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
$params['uid']);
$manager->removeUserShares($params['uid']);

2
apps/files_sharing/tests/External/ManagerTest.php vendored
View File

@ -77,7 +77,7 @@ class ManagerTest extends TestCase {
new StorageFactory(),
$this->clientService,
\OC::$server->getNotificationManager(),
\OC::$server->getOCSDiscoveryService(),
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
$this->uid
);
$this->testMountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() {

9
lib/private/AppFramework/DependencyInjection/DIContainer.php
View File

@ -56,8 +56,6 @@ use OCP\IL10N;
use OCP\IRequest;
use OCP\IServerContainer;
use OCP\IUserSession;
use OCP\Files\Mount\IMountManager;
use OCP\OCS\IDiscoveryService;
use OCP\RichObjectStrings\IValidator;
use OCP\Util;
@ -139,13 +137,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c;
});
$this->registerService(IMountManager::class, function () {
return $this->getServer()->getMountManager();
});
$this->registerService(IDiscoveryService::class, function($c) {
return $this->getServer()->getOCSDiscoveryService();
});
// commonly used attributes
$this->registerService('UserId', function ($c) {
return $c->query('OCP\\IUserSession')->getSession()->get('user_id');

10
lib/private/Server.php
View File

@ -937,7 +937,7 @@ class Server extends ServerContainer implements IServerContainer {
});
});
$this->registerService('OCSDiscoveryService', function (Server $c) {
$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
});
@ -1001,14 +1001,6 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('EncryptionKeyStorage');
}
/**
* @return \OC\OCS\DiscoveryService
*/
public function getOCSDiscoveryService() {
return $this->query('OCSDiscoveryService');
}
/**
* The current request object holding all information about the request
* currently being processed is returned from this method.

2
lib/private/Share/Share.php
View File

@ -2742,7 +2742,7 @@ class Share extends Constants {
'result' => '',
];
$try = 0;
$discoveryService = \OC::$server->getOCSDiscoveryService();
$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
while ($result['success'] === false && $try < 2) {
$federationEndpoints = $discoveryService->discover($protocol . $remoteDomain, 'FEDERATED_SHARING');
$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';

2
lib/private/Share20/ProviderFactory.php
View File

@ -107,7 +107,7 @@ class ProviderFactory implements IProviderFactory {
$notifications = new Notifications(
$addressHandler,
$this->serverContainer->getHTTPClientService(),
$this->serverContainer->getOCSDiscoveryService(),
$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
$this->serverContainer->getJobList()
);
$tokenHandler = new TokenHandler(

6
lib/public/IServerContainer.php
View File

@ -531,10 +531,4 @@ interface IServerContainer extends IContainer {
* @since 12.0.0
*/
public function getCloudIdManager();
/**
* @return \OC\OCS\DiscoveryService
* @since 12.0.0
*/
public function getOCSDiscoveryService();
}