Skip to content

Migrate files to the PSR container #21861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2020
Merged

Migrate files to the PSR container #21861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07fcf14
Migrate files to the PSR container
ChristophWurst Jul 16, 2020
f406f5d
Fix TagService DI name
MorrisJobke Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions apps/files/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,24 @@
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';
Expand All @@ -70,33 +77,33 @@ public function register(IRegistrationContext $context): void {
/**
* 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()
);
});

/**
* 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()
);
Expand Down