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

Merge pull request #21861 from nextcloud/techdebt/files-psr-container 

Migrate files to the PSR container
This commit is contained in:
Morris Jobke 2020-08-17 17:58:41 +02:00 committed by GitHub
parent 00cb8e6c54 f406f5dc73
commit 7b8adb1817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/files/lib/AppInfo/Application.php
View File

@ -47,17 +47,24 @@ use OCA\Files\Listener\LoadSidebarListener;
use OCA\Files\Notification\Notifier;
use OCA\Files\Search\FilesSearchProvider;
use OCA\Files\Service\TagService;
use OCP\Activity\IManager as IActivityManager;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Collaboration\Resources\IProviderManager;
use OCP\IContainer;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IPreview;
use OCP\ISearch;
use OCP\IRequest;
use OCP\IServerContainer;
use OCP\ITagManager;
use OCP\IUserSession;
use OCP\Notification\IManager;
use OCP\Share\IManager as IShareManager;
use OCP\Util;
use Psr\Container\ContainerInterface;
class Application extends App implements IBootstrap {
public const APP_ID = 'files';
@ -70,18 +77,18 @@ class Application extends App implements IBootstrap {
/**
* Controllers
*/
$context->registerService('APIController', function (IContainer $c) {
$context->registerService('APIController', function (ContainerInterface $c) {
/** @var IServerContainer $server */
$server = $c->query(IServerContainer::class);
$server = $c->get(IServerContainer::class);
return new ApiController(
$c->query('AppName'),
$c->query('Request'),
$server->getUserSession(),
$c->query('TagService'),
$server->getPreviewManager(),
$server->getShareManager(),
$server->getConfig(),
$c->get('AppName'),
$c->get(IRequest::class),
$c->get(IUserSession::class),
$c->get(TagService::class),
$c->get(IPreview::class),
$c->get(IShareManager::class),
$c->get(IConfig::class),
$server->getUserFolder()
);
});
@ -89,14 +96,14 @@ class Application extends App implements IBootstrap {
/**
* Services
*/
$context->registerService('TagService', function (IContainer $c) {
$context->registerService(TagService::class, function (ContainerInterface $c) {
/** @var IServerContainer $server */
$server = $c->query(IServerContainer::class);
$server = $c->get(IServerContainer::class);
return new TagService(
$server->getUserSession(),
$server->getActivityManager(),
$server->getTagManager()->load(self::APP_ID),
$c->get(IUserSession::class),
$c->get(IActivityManager::class),
$c->get(ITagManager::class)->load(self::APP_ID),
$server->getUserFolder(),
$server->getEventDispatcher()
);