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

Merge pull request #21859 from nextcloud/techdebt/dav-psr-container 

Migrate DAV to the PSR container
This commit is contained in:
Roeland Jago Douma 2020-07-17 08:21:48 +02:00 committed by GitHub
parent 2c79083f27 5005510d82
commit 79c677e26d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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\Contacts\IManager as IContactsManager;
use OCP\IConfig;
use OCP\IContainer;
use OCP\ILogger;
use OCP\IServerContainer;
use OCP\IUser;
use OCP\Notification\IManager as INotificationManager;
use Psr\Container\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
use Throwable;
@ -76,22 +76,19 @@ use function strpos;
class Application extends App implements IBootstrap {
public const APP_ID = 'dav';
/**
* Application constructor.
*/
public function __construct() {
parent::__construct(self::APP_ID);
}
public function register(IRegistrationContext $context): void {
$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
$context->registerService(PhotoCache::class, function (IContainer $c) {
$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
/** @var IServerContainer $server */
$server = $c->query(IServerContainer::class);
$server = $c->get(IServerContainer::class);
return new PhotoCache(
$server->getAppDataDir('dav-photocache'),
$server->getLogger()
$c->get(ILogger::class)
);
});