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

Migrate DAV to the PSR container 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-07-16 10:24:12 +02:00
parent b12d3691c3
commit 5005510d82
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dav/lib/AppInfo/Application.php
View File

@ -62,11 +62,11 @@ use OCP\AppFramework\IAppContainer;
use OCP\Calendar\IManager as ICalendarManager; use OCP\Calendar\IManager as ICalendarManager;
use OCP\Contacts\IManager as IContactsManager; use OCP\Contacts\IManager as IContactsManager;
use OCP\IConfig; use OCP\IConfig;
use OCP\IContainer;
use OCP\ILogger; use OCP\ILogger;
use OCP\IServerContainer; use OCP\IServerContainer;
use OCP\IUser; use OCP\IUser;
use OCP\Notification\IManager as INotificationManager; use OCP\Notification\IManager as INotificationManager;
use Psr\Container\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent; use Symfony\Component\EventDispatcher\GenericEvent;
use Throwable; use Throwable;
@ -76,22 +76,19 @@ use function strpos;
class Application extends App implements IBootstrap { class Application extends App implements IBootstrap {
public const APP_ID = 'dav'; public const APP_ID = 'dav';
/**
* Application constructor.
*/
public function __construct() { public function __construct() {
parent::__construct(self::APP_ID); parent::__construct(self::APP_ID);
} }
public function register(IRegistrationContext $context): void { public function register(IRegistrationContext $context): void {
$context->registerServiceAlias('CardDAVSyncService', SyncService::class); $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
$context->registerService(PhotoCache::class, function (IContainer $c) { $context->registerService(PhotoCache::class, function (ContainerInterface $c) {
/** @var IServerContainer $server */ /** @var IServerContainer $server */
$server = $c->query(IServerContainer::class); $server = $c->get(IServerContainer::class);
return new PhotoCache( return new PhotoCache(
$server->getAppDataDir('dav-photocache'), $server->getAppDataDir('dav-photocache'),
$server->getLogger() $c->get(ILogger::class)
); );
}); });